@leafer-ui/event 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/event",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "@leafer-ui/event",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.9.1"
+    "@leafer/core": "1.9.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.9.1"
+    "@leafer/interface": "1.9.2"
   }
 }

package/src/DragEvent.ts

@@ -1,5 +1,6 @@
 import { IDragEvent, IPointData, ILeaf, ILeafList, IObject, IBoundsData } from '@leafer/interface'
 import { registerUIEvent, LeafList, BoundsHelper, PointHelper } from '@leafer/core'
+import { DragBoundsHelper } from '@leafer-ui/draw'
 
 import { PointerEvent } from './PointerEvent'
 
@@ -40,36 +41,13 @@ export class DragEvent extends PointerEvent implements IDragEvent {
     static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData, checkLimit = true): IPointData {
         const move = leaf.getLocalPoint(total, null, true)
         PointHelper.move(move, start.x - leaf.x, start.y - leaf.y)
-        if (checkLimit) this.limitMove(leaf, move) // 检查拖拽限制
+        if (checkLimit) this.limitMove(leaf, move)
+        DragBoundsHelper.axisMove(leaf, move)
         return move
     }
 
     static limitMove(leaf: ILeaf, move: IPointData): void {
-        const { draggable, dragBounds } = leaf
-        if (dragBounds) this.getMoveInDragBounds(leaf.__localBoxBounds, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true)
-        if (draggable === 'x') move.y = 0
-        if (draggable === 'y') move.x = 0
-    }
-
-    static getMoveInDragBounds(childBox: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData {
-        const x = childBox.x + move.x, y = childBox.y + move.y, right = x + childBox.width, bottom = y + childBox.height
-        const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height
-
-        if (!change) move = { ...move }
-
-        if (BoundsHelper.includes(childBox, dragBounds)) { // childBox > dragBounds
-            if (x > dragBounds.x) move.x += dragBounds.x - x
-            else if (right < boundsRight) move.x += boundsRight - right
-            if (y > dragBounds.y) move.y += dragBounds.y - y
-            else if (bottom < boundsBottom) move.y += boundsBottom - bottom
-        } else {
-            if (x < dragBounds.x) move.x += dragBounds.x - x
-            else if (right > boundsRight) move.x += boundsRight - right
-            if (y < dragBounds.y) move.y += dragBounds.y - y
-            else if (bottom > boundsBottom) move.y += boundsBottom - bottom
-        }
-
-        return move
+        DragBoundsHelper.limitMove(leaf, move)
     }
 
     public getPageMove(total?: boolean): IPointData {

package/types/index.d.ts

@@ -81,7 +81,6 @@ declare class DragEvent extends PointerEvent implements IDragEvent {
     static setData(data: IObject): void;
     static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData, checkLimit?: boolean): IPointData;
     static limitMove(leaf: ILeaf, move: IPointData): void;
-    static getMoveInDragBounds(childBox: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData;
     getPageMove(total?: boolean): IPointData;
     getInnerMove(relative?: ILeaf, total?: boolean): IPointData;
     getLocalMove(relative?: ILeaf, total?: boolean): IPointData;