@leafer-ui/event 1.0.0-rc.25 → 1.0.0-rc.27

package/package.json

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

package/src/DragEvent.ts

@@ -1,5 +1,5 @@
 import { IDragEvent, IPointData, ILeaf, ILeafList, IObject, IBoundsData } from '@leafer/interface'
-import { registerUIEvent, LeafList } from '@leafer/core'
+import { registerUIEvent, LeafList, BoundsHelper } from '@leafer/core'
 
 import { PointerEvent } from './PointerEvent'
 
@@ -48,15 +48,25 @@ export class DragEvent extends PointerEvent implements IDragEvent {
         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
+    static getMoveInDragBounds(childBox: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData {
+        const x = childBox.x + move.x, y = childBox.y + move.y
+        const right = x + childBox.width, bottom = y + childBox.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
+
+        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
     }
 
@@ -89,6 +99,15 @@ export class DragEvent extends PointerEvent implements IDragEvent {
         return this.getLocalMove(relative, true)
     }
 
+    public getPageBounds(): IBoundsData {
+        const total = this.getPageTotal()
+        const start = this.getPage()
+        const bounds = {} as IBoundsData
+        BoundsHelper.set(bounds, start.x - total.x, start.y - total.y, total.x, total.y)
+        BoundsHelper.unsign(bounds)
+        return bounds
+    }
+
     protected assignMove(total: boolean): void {
         move.x = total ? this.totalX : this.moveX
         move.y = total ? this.totalY : this.moveY

package/types/index.d.ts

@@ -73,13 +73,14 @@ declare class DragEvent extends PointerEvent implements IDragEvent {
     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;
+    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;
     getPageTotal(): IPointData;
     getInnerTotal(relative?: ILeaf): IPointData;
     getLocalTotal(relative?: ILeaf): IPointData;
+    getPageBounds(): IBoundsData;
     protected assignMove(total: boolean): void;
 }