fix: fix throttleDrag #789

daybrush · Nov 11, 2022 · 8f4659e · 8f4659e
1 parent 9ebfae5
commit 8f4659e
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/packages/react-moveable/src/react-moveable/ables/Draggable.tsx b/packages/react-moveable/src/react-moveable/ables/Draggable.tsx
@@ -152,8 +152,11 @@ export default {
         const throttleDrag = parentEvent ? 0 : (props.throttleDrag || 0);
         const throttleDragRotate = parentEvent ? 0 : (props.throttleDragRotate || 0);
 
-        let isSnap = false;
         let dragRotateRad = 0;
+        let isVerticalSnap = false;
+        let isVerticalBound = false;
+        let isHorizontalSnap = false;
+        let isHorizontalBound = false;
 
         if (!parentEvent && throttleDragRotate > 0 && (distX || distY)) {
             const startDragRotate = props.startDragRotate || 0;
@@ -173,18 +176,13 @@ export default {
             const [verticalInfo, horizontalInfo] = checkSnapBoundsDrag(
                 moveable, distX, distY, throttleDragRotate, isRequest || deltaOffset, datas,
             );
-            const {
-                isSnap: isVerticalSnap,
-                isBound: isVerticalBound,
-                offset: verticalOffset,
-            } = verticalInfo;
-            const {
-                isSnap: isHorizontalSnap,
-                isBound: isHorizontalBound,
-                offset: horizontalOffset,
-            } = horizontalInfo;
-
-            isSnap = isVerticalSnap || isHorizontalSnap || isVerticalBound || isHorizontalBound;
+            isVerticalSnap = verticalInfo.isSnap;
+            isVerticalBound = verticalInfo.isBound;
+            isHorizontalSnap = horizontalInfo.isSnap;
+            isHorizontalBound = horizontalInfo.isBound;
+
+            const verticalOffset = verticalInfo.offset;
+            const horizontalOffset = horizontalInfo.offset;
 
             distX += verticalOffset;
             distY += horizontalOffset;
@@ -193,13 +191,21 @@ export default {
         const beforeTranslate = plus(getBeforeDragDist({ datas, distX, distY }), startValue);
         const translate = plus(getTransformDist({ datas, distX, distY }), startValue);
 
-        if (!throttleDragRotate && !isSnap) {
-            throttleArray(translate, throttleDrag);
-            throttleArray(beforeTranslate, throttleDrag);
-        }
         throttleArray(translate, TINY_NUM);
         throttleArray(beforeTranslate, TINY_NUM);
 
+        if (!throttleDragRotate) {
+            if (!isVerticalSnap && !isVerticalBound) {
+                translate[0] = throttle(translate[0], throttleDrag);
+                beforeTranslate[0] = throttle(beforeTranslate[0], throttleDrag);
+            }
+            if (!isHorizontalSnap && !isHorizontalBound) {
+                translate[1] = throttle(translate[1], throttleDrag);
+                beforeTranslate[1] = throttle(beforeTranslate[1], throttleDrag);
+            }
+        }
+
+
         const beforeDist = minus(beforeTranslate, startValue);
         const dist = minus(translate, startValue);
         const delta = minus(dist, prevDist);