feat: add roundPadding, isDisplayShadowRoundControls #761 #762

daybrush · Oct 17, 2022 · 68be2e8 · 68be2e8
1 parent f1ad4af
commit 68be2e8
Show file tree

Hide file tree

Showing 7 changed files with 292 additions and 61 deletions.
diff --git a/packages/react-moveable/src/react-moveable/ables/BeforeRenderable.ts b/packages/react-moveable/src/react-moveable/ables/BeforeRenderable.ts
@@ -67,14 +67,12 @@ export default {
     },
     dragStart(moveable: MoveableManagerInterface<BeforeRenderableProps>, e: any) {
         this.setTransform(moveable, e);
+        this.resetStyle(e);
 
         triggerEvent(moveable, `onBeforeRenderStart`, this.fillDragStartParams(moveable, e));
     },
     drag(moveable: MoveableManagerInterface<BeforeRenderableProps>, e: any) {
         this.resetStyle(e);
-        const datas = e.datas;
-
-        datas.nextStyle = {};
         triggerEvent(moveable, `onBeforeRender`, fillParams<OnBeforeRender>(moveable, e, {
             isPinch: !!e.isPinch,
         }));
@@ -94,6 +92,8 @@ export default {
             const childMoveable = moveables[i];
 
             this.setTransform(childMoveable, childEvent);
+            this.resetStyle(childEvent);
+
             return this.fillDragStartParams(childMoveable, childEvent);
         });
         triggerEvent(moveable, `onBeforeRenderGroupStart`, fillParams<OnBeforeRenderGroupStart>(moveable, e, {
@@ -112,9 +112,6 @@ export default {
             const childMoveable = moveables[i];
 
             this.resetStyle(childEvent);
-            const datas = e.datas;
-
-            datas.nextStyle = {};
             return this.fillDragParams(childMoveable, childEvent);
         });
         triggerEvent(moveable, `onBeforeRenderGroup`, fillParams<OnBeforeRenderGroup>(moveable, e, {

diff --git a/packages/react-moveable/src/react-moveable/ables/Clippable.tsx b/packages/react-moveable/src/react-moveable/ables/Clippable.tsx
@@ -86,8 +86,12 @@ function getClipStyles(
             const [subWidth, subHeight] = minus(poses[4], poses[0]);
 
             clipStyles.push("round", ...getRadiusStyles(
-                poses.slice(8),
-                clipPoses.slice(8),
+                clipPoses.slice(8).map((info, i) => {
+                    return {
+                        ...info,
+                        pos: poses[i],
+                    };
+                }),
                 clipRelative!,
                 subWidth,
                 subHeight,

diff --git a/packages/react-moveable/src/react-moveable/ables/Renderable.ts b/packages/react-moveable/src/react-moveable/ables/Renderable.ts
@@ -73,6 +73,8 @@ export default {
             isDrag: e.isDrag,
             targets: moveable.props.targets,
             events: params,
+            transform: getNextTransformText(e),
+            ...fillCSSObject(getNextStyle(e)),
         }));
     },
     dragControlStart(moveable: MoveableManagerInterface<RenderableProps>, e: any) {
@@ -107,6 +109,8 @@ export default {
         return fillParams<OnRenderEnd>(moveable, e, {
             isPinch: !!e.isPinch,
             isDrag: e.isDrag,
+            transform: getNextTransformText(e),
+            ...fillCSSObject(getNextStyle(e)),
         });
     },
 } as const;