@leafer-ui/event 1.0.0-rc.20 → 1.0.0-rc.22

package/package.json

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

package/src/DragEvent.ts

@@ -1,4 +1,4 @@
-import { IDragEvent, IPointData, ILeaf, ILeafList, IObject } from '@leafer/interface'
+import { IDragEvent, IPointData, ILeaf, ILeafList, IObject, IBoundsData } from '@leafer/interface'
 import { registerUIEvent, LeafList } from '@leafer/core'
 
 import { PointerEvent } from './PointerEvent'
@@ -36,6 +36,30 @@ export class DragEvent extends PointerEvent implements IDragEvent {
     static setData(data: IObject): void {
         this.data = data
     }
+
+    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData): IPointData {
+        const { draggable, dragBounds, x, y } = leaf
+        const move = leaf.getLocalPoint(total, null, true)
+        move.x += start.x - x
+        move.y += start.y - y
+        if (dragBounds) this.getMoveInDragBounds(leaf.__local, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true)
+        if (draggable === 'x') move.y = 0
+        if (draggable === 'y') move.x = 0
+        return move
+    }
+
+    static getMoveInDragBounds(box: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData {
+        const x = box.x + move.x, y = box.y + move.y
+        const right = x + box.width, bottom = y + box.height
+        const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height
+        if (!change) move = { ...move }
+        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
+    }
+
     public getPageMove(total?: boolean): IPointData {
         this.assignMove(total)
         return this.current.getPagePoint(move, null, true)

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IUIEvent, ILeafList, ILeaf, IPointData, IPointerEvent, PointerType, IDragEvent, IObject, IDropEvent, IMoveEvent, IRotateEvent, ISwipeEvent, IZoomEvent, IKeyEvent } from '@leafer/interface';
+import { IUIEvent, ILeafList, ILeaf, IPointData, IPointerEvent, PointerType, IDragEvent, IObject, IBoundsData, IDropEvent, IMoveEvent, IRotateEvent, ISwipeEvent, IZoomEvent, IKeyEvent } from '@leafer/interface';
 import { Event } from '@leafer/core';
 
 declare class UIEvent extends Event implements IUIEvent {
@@ -72,6 +72,8 @@ declare class DragEvent extends PointerEvent implements IDragEvent {
     static data: IObject;
     static setList(data: ILeaf | ILeaf[] | ILeafList): void;
     static setData(data: IObject): void;
+    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData): IPointData;
+    static getMoveInDragBounds(box: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData;
     getPageMove(total?: boolean): IPointData;
     getInnerMove(relative?: ILeaf, total?: boolean): IPointData;
     getLocalMove(relative?: ILeaf, total?: boolean): IPointData;