@leafer-ui/bounds 1.9.0 → 1.9.2

package/package.json

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

package/src/DragBoundsHelper.ts

@@ -0,0 +1,54 @@
+import { IPointData, IBoundsData, IDragBoundsType, ILeaf } from '@leafer/interface'
+import { MathHelper } from '@leafer/core'
+
+
+export const DragBoundsHelper = {
+
+    getValidMove(content: IBoundsData, dragBounds: IBoundsData, dragBoundsType: IDragBoundsType, move: IPointData, change?: boolean): IPointData {
+        const x = content.x + move.x, y = content.y + move.y, right = x + content.width, bottom = y + content.height
+        const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height
+
+        if (!change) move = { ...move }
+
+        const isBiggerWidth = content.width > dragBounds.width
+        const isBiggerHeight = content.height > dragBounds.height
+
+        if (isBiggerWidth && dragBoundsType !== 'outer') {  // inner / auto 模式
+            if (x > dragBounds.x) move.x += dragBounds.x - x
+            else if (right < boundsRight) move.x += boundsRight - right
+        } else {
+            if (x < dragBounds.x) move.x += dragBounds.x - x
+            else if (right > boundsRight) move.x += boundsRight - right
+        }
+
+        if (isBiggerHeight && dragBoundsType !== 'outer') { // inner / auto 模式
+            if (y > dragBounds.y) move.y += dragBounds.y - y
+            else if (bottom < boundsBottom) move.y += boundsBottom - bottom
+        } else {
+            if (y < dragBounds.y) move.y += dragBounds.y - y
+            else if (bottom > boundsBottom) move.y += boundsBottom - bottom
+        }
+
+        // 避免出现很小为0的小数
+        move.x = MathHelper.float(move.x)
+        move.y = MathHelper.float(move.y)
+
+        return move
+    },
+
+    // 按轴移动
+    axisMove(leaf: ILeaf, move: IPointData) {
+        const { draggable } = leaf
+        if (draggable === 'x') move.y = 0
+        if (draggable === 'y') move.x = 0
+    },
+
+    // 拖拽区域内移动
+    limitMove(leaf: ILeaf, move: IPointData): void {
+        const { dragBounds, dragBoundsType } = leaf
+        if (dragBounds) D.getValidMove(leaf.__localBoxBounds, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, dragBoundsType, move, true)
+        D.axisMove(leaf, move)
+    }
+}
+
+const D = DragBoundsHelper

package/src/index.ts

@@ -1 +1,2 @@
 export { UIBounds } from "./UIBounds"
+export { DragBoundsHelper } from './DragBoundsHelper'

package/types/index.d.ts

@@ -1,5 +1,12 @@
 import { IUIBoundsModule } from '@leafer-ui/interface';
+import { IBoundsData, IDragBoundsType, IPointData, ILeaf } from '@leafer/interface';
 
 declare const UIBounds: IUIBoundsModule;
 
-export { UIBounds };
+declare const DragBoundsHelper: {
+    getValidMove(content: IBoundsData, dragBounds: IBoundsData, dragBoundsType: IDragBoundsType, move: IPointData, change?: boolean): IPointData;
+    axisMove(leaf: ILeaf, move: IPointData): void;
+    limitMove(leaf: ILeaf, move: IPointData): void;
+};
+
+export { DragBoundsHelper, UIBounds };