Merge pull request '[se] Fix bug 71982' (#587) from fix/bug-71982 int…

…o release/v8.3.0 Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/sdkjs/pulls/587
ONLYOFFICE · Jan 30, 2025 · a3e2afc · a3e2afc
2 parents 5ea4cad + a3a63be
commit a3e2afc
Showing 1 changed file with 9 additions and 34 deletions.
diff --git a/cell/view/EventsController.js b/cell/view/EventsController.js
@@ -2650,36 +2650,18 @@
 			var self = this;
 			var deltaX = 0, deltaY = 0;
 
+			//TODO!!! while only check direction. need refactor, and replace up code on checkMouseWhell function
+			let values = AscCommon.checkMouseWhell(event, {
+				isSupportBidirectional : false,
+				isAllowHorizontal : true,
+				isUseMaximumDelta : true
+			});
+
 			const wb = window["Asc"]["editor"].wb;
 			//TODO for mac touchpads. need review
 			if (wb.smoothScroll && AscCommon.AscBrowser.isMacOs) {
-				var delta  = 0;
-
-				if (undefined != event.wheelDelta && event.wheelDelta != 0) {
-					delta = -45 * event.wheelDelta / 120;
-				}
-				{
-					delta = 45 * event.detail / 3;
-				}
-
-				// New school multidimensional scroll (touchpads) deltas
-				deltaY = delta;
-
-
-				// Webkit
-				if (undefined !== event.wheelDeltaY && 0 !== event.wheelDeltaY) {
-					deltaY = -45 * event.wheelDeltaY / 120;
-				}
-				if (undefined !== event.wheelDeltaX && 0 !== event.wheelDeltaX) {
-					deltaX = -45 * event.wheelDeltaX / 120;
-				}
-
-
-				deltaX >>= 0;
-				deltaY >>= 0;
-
-				deltaX = (deltaX / wb.getWorksheet().getHScrollStep()) * AscCommon.AscBrowser.retinaPixelRatio;
-				deltaY = (deltaY / wb.getWorksheet().getVScrollStep()) * AscCommon.AscBrowser.retinaPixelRatio;
+				deltaX = (values.x / wb.getWorksheet().getHScrollStep()) * AscCommon.AscBrowser.retinaPixelRatio;
+				deltaY = (values.y / wb.getWorksheet().getVScrollStep()) * AscCommon.AscBrowser.retinaPixelRatio;
 			} else {
 				if (undefined !== event.wheelDelta && 0 !== event.wheelDelta) {
 					deltaY = -1 * event.wheelDelta / 40;
@@ -2715,13 +2697,6 @@
 				}
 			}
 
-			//TODO!!! while only check direction. need refactor, and replace up code on checkMouseWhell function
-			let values = AscCommon.checkMouseWhell(event, {
-				isSupportBidirectional : false,
-				isAllowHorizontal : true,
-				isUseMaximumDelta : true
-			});
-
 			if (values.x === 0) {
 				deltaX = 0;
 			}