fix: stop event if no use ables daybrush#724

daybrush · daybrush · commit 2a90842e4ff9 · 2022-08-19T03:08:05.000+09:00
diff --git a/packages/react-moveable/src/react-moveable/gesto/getAbleGesto.ts b/packages/react-moveable/src/react-moveable/gesto/getAbleGesto.ts
@@ -51,7 +51,7 @@ export function triggerAble(
             ables.push(...moveable.props.ables!.filter(able => able.name === requestAble));
         }
     }
-    if (!ables.length) {
+    if (!ables.length || ables.every(able => able.dragRelation)) {
         return false;
     }
     const eventAbles: Able[] = [BeforeRenderable, ...ables, Renderable].filter((able: any) => able[eventName]);
@@ -115,17 +115,14 @@ export function triggerAble(
 
             if (nextDatas.isEventStart) {
                 if (able.dragRelation === "strong") {
-                    // cancel drag
-                    nextDatas.isEventStart = false;
-
                     return false;
                 }
                 // start drag
                 return true;
             }
             // cancel event
             return false;
-        }).length === 0;
+        }).length as any;
     }
     if (isEnd || isForceEnd) {
         moveable.state.gestos = {};
diff --git a/packages/react-moveable/src/react-moveable/types.ts b/packages/react-moveable/src/react-moveable/types.ts
@@ -422,6 +422,9 @@ export interface Able<Props extends IObject<any> = IObject<any>, Events extends
     updateRect?: boolean;
     canPinch?: boolean;
     css?: string[];
+    /**
+     * Check how related to drag
+     */
     dragRelation?: "strong" | "weak" | undefined | null | false,
     /**
      * Fired when the event is cleared

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export function triggerAble(`
`51`	`51`	`ables.push(...moveable.props.ables!.filter(able => able.name === requestAble));`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- if (!ables.length) {`
	`54`	`+ if (!ables.length \|\| ables.every(able => able.dragRelation)) {`
`55`	`55`	`return false;`
`56`	`56`	`}`
`57`	`57`	`const eventAbles: Able[] = [BeforeRenderable, ...ables, Renderable].filter((able: any) => able[eventName]);`
`@@ -115,17 +115,14 @@ export function triggerAble(`
`115`	`115`
`116`	`116`	`if (nextDatas.isEventStart) {`
`117`	`117`	`if (able.dragRelation === "strong") {`
`118`		`- // cancel drag`
`119`		`- nextDatas.isEventStart = false;`
`120`		`-`
`121`	`118`	`return false;`
`122`	`119`	`}`
`123`	`120`	`// start drag`
`124`	`121`	`return true;`
`125`	`122`	`}`
`126`	`123`	`// cancel event`
`127`	`124`	`return false;`
`128`		`- }).length === 0;`
	`125`	`+ }).length as any;`
`129`	`126`	`}`
`130`	`127`	`if (isEnd \|\| isForceEnd) {`
`131`	`128`	`moveable.state.gestos = {};`