fix: skip beforeEvent set to lastEvent #654

daybrush · May 1, 2022 · 5ab31c7 · 5ab31c7
1 parent a8bcb54
commit 5ab31c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/packages/react-moveable/src/react-moveable/ables/Resizable.ts b/packages/react-moveable/src/react-moveable/ables/Resizable.ts
@@ -295,7 +295,7 @@ export default {
             setSize(size: number[]) {
                 [boundingWidth, boundingHeight] = size;
             },
-        }));
+        }, true));
 
         let fixedPosition = dragClient;
 
@@ -537,7 +537,7 @@ export default {
             triggerEvent(moveable, "onBeforeResizeGroup", fillParams<OnBeforeResizeGroup>(moveable, e, {
                 ...parentEvent,
                 targets: moveable.props.targets!,
-            }));
+            }, true));
         });
 
 

diff --git a/packages/react-moveable/src/react-moveable/ables/Rotatable.tsx b/packages/react-moveable/src/react-moveable/ables/Rotatable.tsx
@@ -448,7 +448,7 @@ export default {
                 beforeDist = dist;
                 absoluteDist = dist;
             },
-        }));
+        }, true));
         [
             beforeDelta,
             beforeDist,
@@ -592,7 +592,7 @@ export default {
             triggerEvent(moveable, "onBeforeRotateGroup", fillParams<OnBeforeRotateGroup>(moveable, e, {
                 ...parentEvent,
                 targets: moveable.props.targets!,
-            }));
+            }, true));
         });
         const params = this.dragControl(moveable, e);
 

diff --git a/packages/react-moveable/src/react-moveable/ables/Scalable.ts b/packages/react-moveable/src/react-moveable/ables/Scalable.ts
@@ -243,7 +243,7 @@ export default {
             setScale(nextScale: number[]) {
                 scale = nextScale;
             },
-        }));
+        }, true));
 
         const dist = [scale[0] / startValue[0], scale[1] / startValue[1]];
         let fixedPosition = dragClient;
@@ -442,7 +442,7 @@ export default {
             triggerEvent(moveable, "onBeforeScaleGroup", fillParams<OnBeforeScaleGroup>(moveable, e, {
                 ...parentEvent,
                 targets: moveable.props.targets!,
-            }));
+            }, true));
         });
 
         const params = this.dragControl(moveable, e);

diff --git a/packages/react-moveable/src/react-moveable/utils.tsx b/packages/react-moveable/src/react-moveable/utils.tsx
@@ -1152,6 +1152,7 @@ export function fillParams<T extends IObject<any>>(
     moveable: any,
     e: any,
     params: ExcludeParams<T>,
+    isBeforeEvent?: boolean,
 ): T {
     const datas = e.datas;
 
@@ -1169,10 +1170,10 @@ export function fillParams<T extends IObject<any>>(
         datas: datas.datas,
     } as any;
 
-    if (datas.isStartEvent) {
-        datas.lastEvent = nextParams;
-    } else {
+    if (!datas.isStartEvent) {
         datas.isStartEvent = true;
+    } else if (!isBeforeEvent) {
+        datas.lastEvent = nextParams;
     }
     return nextParams;
 }