fix: prevent click when drag & click control #713

daybrush · Aug 5, 2022 · 2071c0d · 2071c0d
1 parent 1d951c6
commit 2071c0d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
         "@scena/matrix": "^1.1.1",
         "css-to-mat": "^1.0.3",
         "framework-utils": "^1.1.0",
-        "gesto": "^1.11.2",
+        "gesto": "^1.12.0",
         "overlap-area": "^1.1.0",
         "react-compat-css-styled": "^1.0.8",
         "react-css-styled": "^1.0.3"
@@ -114,7 +114,7 @@
         "@scena/matrix": "^1.1.1",
         "css-to-mat": "^1.0.3",
         "framework-utils": "^1.1.0",
-        "gesto": "^1.11.2",
+        "gesto": "^1.12.0",
         "overlap-area": "^1.1.0",
         "react-compat-css-styled": "^1.0.8",
         "react-css-styled": "^1.0.3"

diff --git a/packages/react-compat-moveable/package.json b/packages/react-compat-moveable/package.json
@@ -75,7 +75,7 @@
         "@scena/matrix": "^1.1.1",
         "css-to-mat": "^1.0.3",
         "framework-utils": "^1.1.0",
-        "gesto": "^1.11.2",
+        "gesto": "^1.12.0",
         "overlap-area": "^1.1.0",
         "react-compat-css-styled": "^1.0.8",
         "react-css-styled": "^1.0.3",

diff --git a/packages/react-moveable/package.json b/packages/react-moveable/package.json
@@ -105,7 +105,7 @@
         "@scena/react-guides": "^0.17.1",
         "css-to-mat": "^1.0.3",
         "framework-utils": "^1.1.0",
-        "gesto": "^1.11.2",
+        "gesto": "^1.12.0",
         "overlap-area": "^1.1.0",
         "react-css-styled": "^1.0.3"
     },

diff --git a/packages/react-moveable/src/react-moveable/gesto/getAbleGesto.ts b/packages/react-moveable/src/react-moveable/gesto/getAbleGesto.ts
@@ -208,10 +208,12 @@ export function getAbleGesto(
         pinchOutside,
         preventClickEventOnDrag: isTargetAbles ? preventClickEventOnDrag : false,
         preventClickEventOnDragStart: isTargetAbles ? preventClickDefault : false,
+        preventClickEventByCondition: isTargetAbles ? null : (e: MouseEvent) => {
+            return moveable.controlBox.getElement().contains(e.target as Element);
+        },
         checkInput: isTargetAbles ? checkInput : false,
     };
     const gesto = new Gesto(target!, options);
-
     const isControl = eventAffix === "Control";
 
     ["drag", "pinch"].forEach(eventOperation => {