refactor: Split Ables

daybrush · Aug 11, 2019 · 1b4558a · 1b4558a
1 parent 7340549
commit 1b4558a
Show file tree

Hide file tree

Showing 27 changed files with 1,468 additions and 1,269 deletions.
diff --git a/packages/react-moveable/rollup.config.js b/packages/react-moveable/rollup.config.js
@@ -9,6 +9,7 @@ export default builder([
         ...defaultOptions,
         input: "src/react-moveable/index.ts",
         output: "./dist/moveable.esm.js",
+        visualizer: true,
         format: "es",
     },
     {

diff --git a/packages/react-moveable/src/App.tsx b/packages/react-moveable/src/App.tsx
@@ -113,13 +113,24 @@ class App extends React.Component {
             </div>
         );
     }
+    public onCLickOuside = (e: any) => {
+
+    }
+    public onClickInside = (e: any) => {
+        const target = e.target;
+
+    }
     public onClick = (e: any) => {
         const target = e.target;
 
         const id = target.getAttribute("data-target");
         e.preventDefault();
 
-        if (!id) {
+        const clientX = e.clientX;
+        const clientY = e.clientY;
+
+        console.log(this.moveable.isInside(clientX, clientY));
+        if (!id || this.state.target && this.moveable.isInside(clientX, clientY)) {
             return;
         }
         const items = this.items;
@@ -143,7 +154,7 @@ class App extends React.Component {
                     target: e.target,
                     item: items[id],
                 }, () => {
-                    this.moveable.dragstart(nativeEvent);
+                    this.moveable.dragStart(nativeEvent);
                 });
             }
         }

diff --git a/packages/react-moveable/src/react-moveable/Draggable.ts b/packages/react-moveable/src/react-moveable/Draggable.ts
diff --git a/packages/react-moveable/src/react-moveable/DraggableDragger.ts b/packages/react-moveable/src/react-moveable/DraggableDragger.ts
diff --git a/...ct-moveable/src/react-moveable/Dragger.ts → ...veable/src/react-moveable/DraggerUtils.ts b/...ct-moveable/src/react-moveable/Dragger.ts → ...veable/src/react-moveable/DraggerUtils.ts
@@ -1,7 +1,7 @@
-import Moveable from "./Moveable";
 import { invert, caculate, minus, sum, convertPositionMatrix } from "./matrix";
+import MoveableManager from "./MoveableManager";
 
-export function setDragStart(moveable: Moveable, { datas }: any) {
+export function setDragStart(moveable: MoveableManager<any>, { datas }: any) {
     const {
         matrix,
         beforeMatrix,
@@ -12,14 +12,15 @@ export function setDragStart(moveable: Moveable, { datas }: any) {
     } = moveable.state;
 
     const n = is3d ? 4 : 3;
+
     datas.is3d = is3d;
     datas.matrix = matrix;
     datas.inverseMatrix = invert(matrix, n);
     datas.beforeMatrix = beforeMatrix;
     datas.inverseBeforeMatrix = invert(beforeMatrix, n);
     datas.absoluteOrigin = convertPositionMatrix(sum([left, top], origin), n);
-    datas.startDragBeforeDist = caculate(datas.inverseBeforeMatrix, datas.absoluteOrigin, is3d ? 4 : 3);
-    datas.startDragDist = caculate(datas.inverseMatrix, datas.absoluteOrigin, is3d ? 4 : 3);
+    datas.startDragBeforeDist = caculate(datas.inverseBeforeMatrix, datas.absoluteOrigin, n);
+    datas.startDragDist = caculate(datas.inverseMatrix, datas.absoluteOrigin, n);
 }
 export function getDragDist({ datas, distX, distY }: any, isBefore?: boolean) {
     const {