@leafer/helper 1.8.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/helper",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "@leafer/helper",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.8.0",
-    "@leafer/platform": "1.8.0"
+    "@leafer/data": "1.9.0",
+    "@leafer/math": "1.9.0",
+    "@leafer/platform": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.8.0"
+    "@leafer/interface": "1.9.0"
   }
 }

package/src/BranchHelper.ts

@@ -1,5 +1,5 @@
 import { ILeaf, ILeafLevelList, ILeafList } from '@leafer/interface'
-
+import { isUndefined } from '@leafer/data'
 import { LeafHelper } from './LeafHelper'
 
 const { updateBounds } = LeafHelper
@@ -32,7 +32,7 @@ export const BranchHelper = {
         const { keys } = (leafList as ILeafList)
         if (keys) {
             while (leaf.parent) {
-                if (keys[leaf.parent.innerId] === undefined) {
+                if (isUndefined(keys[leaf.parent.innerId])) {
                     leafList.add(leaf.parent)
                     leaf = leaf.parent
                 } else {

package/src/LeafBoundsHelper.ts

@@ -19,16 +19,16 @@ export const LeafBoundsHelper = {
         return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localRenderBounds
     },
 
-    maskLocalBoxBounds(target: ILeaf): IBoundsData {
-        return target.__.mask ? target.__localBoxBounds : null
+    maskLocalBoxBounds(target: ILeaf, index: number): IBoundsData {
+        return checkMask(target, index) && target.__localBoxBounds
     },
 
-    maskLocalStrokeBounds(target: ILeaf): IBoundsData {
-        return target.__.mask ? target.__layout.localStrokeBounds : null
+    maskLocalStrokeBounds(target: ILeaf, index: number): IBoundsData {
+        return checkMask(target, index) && target.__layout.localStrokeBounds
     },
 
-    maskLocalRenderBounds(target: ILeaf): IBoundsData {
-        return target.__.mask ? target.__layout.localRenderBounds : null
+    maskLocalRenderBounds(target: ILeaf, index: number): IBoundsData {
+        return checkMask(target, index) && target.__layout.localRenderBounds
     },
 
     excludeRenderBounds(child: ILeaf, options: IRenderOptions): boolean {
@@ -38,3 +38,12 @@ export const LeafBoundsHelper = {
     }
 
 }
+
+
+let findMask: number
+
+function checkMask(target: ILeaf, index: number): boolean {
+    if (!index) findMask = 0
+    if (target.__.mask) findMask = 1
+    return findMask < 0 ? null : (findMask && (findMask = -1), true) // 第一个 mask 元素之后的元素 bounds 可以忽略，返回 null
+}

package/src/LeafHelper.ts

@@ -1,6 +1,7 @@
 import { IAlign, ILeaf, IMatrixData, IPointData, IAxis, ITransition, ILeaferCanvas, IBoundsData, IMatrixWithBoundsData } from '@leafer/interface'
 import { MathHelper, MatrixHelper, PointHelper, AroundHelper, getMatrixData, BoundsHelper } from '@leafer/math'
 import { Platform } from '@leafer/platform'
+import { isObject, isNumber } from '@leafer/data'
 
 
 const { copy, toInnerPoint, toOuterPoint, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent, divideParent, getLayout } = MatrixHelper
@@ -79,6 +80,10 @@ export const LeafHelper = {
         return true
     },
 
+    draggable(t: ILeaf): boolean {
+        return (t.draggable || t.editable) && t.hitSelf && !t.locked
+    },
+
     copyCanvasByWorld(leaf: ILeaf, currentCanvas: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld?: IBoundsData, blendMode?: string, onlyResetTransform?: boolean): void {
         if (!fromWorld) fromWorld = leaf.__nowWorld
         if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform)
@@ -88,13 +93,13 @@ export const LeafHelper = {
     // transform
 
     moveWorld(t: ILeaf, x: number | IPointData, y = 0, isInnerPoint?: boolean, transition?: ITransition): void {
-        const local = typeof x === 'object' ? { ...x } : { x, y }
+        const local = isObject(x) ? { ...x } : { x, y }
         isInnerPoint ? toOuterPoint(t.localTransform, local, local, true) : (t.parent && toInnerPoint(t.parent.worldTransform, local, local, true))
         L.moveLocal(t, local.x, local.y, transition)
     },
 
     moveLocal(t: ILeaf, x: number | IPointData, y = 0, transition?: ITransition): void {
-        if (typeof x === 'object') y = x.y, x = x.x
+        if (isObject(x)) y = x.y, x = x.x
         x += t.x
         y += t.y
         if (t.leafer && t.leafer.config.pointSnap) x = round(x), y = round(y)
@@ -107,7 +112,7 @@ export const LeafHelper = {
 
     zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY: number | ITransition = scaleX, resize?: boolean, transition?: ITransition): void {
         const o = t.__localMatrix
-        if (typeof scaleY !== 'number') {
+        if (!isNumber(scaleY)) {
             if (scaleY) transition = scaleY
             scaleY = scaleX
         }
@@ -210,6 +215,20 @@ export const LeafHelper = {
             if (parent === p) return true
             p = p.parent
         }
+    },
+
+    // 简单动画操作
+
+    animateMove(t: ILeaf, move: IPointData, speed = 0.3) {
+        if (!move.x && !move.y) return
+        if (Math.abs(move.x) < 1 && Math.abs(move.y) < 1) {
+            t.move(move)
+        } else {
+            const x = move.x * speed, y = move.y * speed
+            move.x -= x, move.y -= y
+            t.move(x, y)
+            Platform.requestRender(() => L.animateMove(t, move, speed))
+        }
     }
 
 }

package/types/index.d.ts

@@ -8,6 +8,7 @@ declare const LeafHelper: {
     updateChange(leaf: ILeaf): void;
     updateAllChange(leaf: ILeaf): void;
     worldHittable(t: ILeaf): boolean;
+    draggable(t: ILeaf): boolean;
     copyCanvasByWorld(leaf: ILeaf, currentCanvas: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld?: IBoundsData, blendMode?: string, onlyResetTransform?: boolean): void;
     moveWorld(t: ILeaf, x: number | IPointData, y?: number, isInnerPoint?: boolean, transition?: ITransition): void;
     moveLocal(t: ILeaf, x: number | IPointData, y?: number, transition?: ITransition): void;
@@ -26,6 +27,7 @@ declare const LeafHelper: {
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData;
     drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void;
     hasParent(p: ILeaf, parent: ILeaf): boolean | void;
+    animateMove(t: ILeaf, move: IPointData, speed?: number): void;
 };
 
 declare const LeafBoundsHelper: {
@@ -33,9 +35,9 @@ declare const LeafBoundsHelper: {
     localBoxBounds(target: ILeaf): IBoundsData;
     localStrokeBounds(target: ILeaf): IBoundsData;
     localRenderBounds(target: ILeaf): IBoundsData;
-    maskLocalBoxBounds(target: ILeaf): IBoundsData;
-    maskLocalStrokeBounds(target: ILeaf): IBoundsData;
-    maskLocalRenderBounds(target: ILeaf): IBoundsData;
+    maskLocalBoxBounds(target: ILeaf, index: number): IBoundsData;
+    maskLocalStrokeBounds(target: ILeaf, index: number): IBoundsData;
+    maskLocalRenderBounds(target: ILeaf, index: number): IBoundsData;
     excludeRenderBounds(child: ILeaf, options: IRenderOptions): boolean;
 };