@leafer/helper 1.0.0-rc.6 → 1.0.0-rc.8

package/package.json

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

package/src/BranchHelper.ts

@@ -1,10 +1,8 @@
-import { ILeaf, ILeafList } from '@leafer/interface'
+import { ILeaf, ILeafLevelList, ILeafList } from '@leafer/interface'
 
+import { LeafHelper } from './LeafHelper'
 
-interface ILeafPushList {
-    push(item: ILeaf): void
-}
-
+const { updateBounds } = LeafHelper
 
 export const BranchHelper = {
 
@@ -14,7 +12,7 @@ export const BranchHelper = {
 
     // push
 
-    pushAllChildBranch(branch: ILeaf, pushList: ILeafPushList): void {
+    pushAllChildBranch(branch: ILeaf, leafList: ILeafList | ILeafLevelList): void {
         branch.__tempNumber = 1   // 标识需要更新子Leaf元素的WorldBounds分支 Layouter需使用
 
         if (branch.__.__childBranchNumber) {
@@ -23,19 +21,19 @@ export const BranchHelper = {
                 branch = children[i]
                 if (branch.isBranch) {
                     branch.__tempNumber = 1
-                    pushList.push(branch)
-                    pushAllChildBranch(branch, pushList)
+                    leafList.add(branch)
+                    pushAllChildBranch(branch, leafList)
                 }
             }
         }
     },
 
-    pushAllParent(leaf: ILeaf, pushList: ILeafPushList): void {
-        const { keys } = (pushList as ILeafList)
+    pushAllParent(leaf: ILeaf, leafList: ILeafList | ILeafLevelList): void {
+        const { keys } = (leafList as ILeafList)
         if (keys) {
             while (leaf.parent) {
                 if (keys[leaf.parent.innerId] === undefined) {
-                    pushList.push(leaf.parent)
+                    leafList.add(leaf.parent)
                     leaf = leaf.parent
                 } else {
                     break
@@ -43,7 +41,7 @@ export const BranchHelper = {
             }
         } else {
             while (leaf.parent) {
-                pushList.push(leaf.parent)
+                leafList.add(leaf.parent)
                 leaf = leaf.parent
             }
         }
@@ -64,16 +62,24 @@ export const BranchHelper = {
         }
     },
 
-    updateWorldBoundsByBranchStack(branchStack: ILeaf[]): void {
-        let branch: ILeaf
+    updateBounds(branch: ILeaf, exclude?: ILeaf): void {
+        const branchStack: ILeaf[] = [branch]
+        pushAllBranchStack(branch, branchStack)
+        updateBoundsByBranchStack(branchStack, exclude)
+    },
+
+    updateBoundsByBranchStack(branchStack: ILeaf[], exclude?: ILeaf): void {
+        let branch: ILeaf, children: ILeaf[]
         for (let i = branchStack.length - 1; i > -1; i--) {
             branch = branchStack[i]
-            for (let j = 0, len = branch.children.length; j < len; j++) {
-                branch.children[j].__updateWorldBounds()
+            children = branch.children
+            for (let j = 0, len = children.length; j < len; j++) {
+                updateBounds(children[j])
             }
+            if (exclude && exclude === branch) continue
+            updateBounds(branch)
         }
-        branch.__updateWorldBounds()
     }
 }
 
-const { pushAllChildBranch, pushAllBranchStack } = BranchHelper
+const { pushAllChildBranch, pushAllBranchStack, updateBoundsByBranchStack } = BranchHelper

package/src/LeafBoundsHelper.ts

@@ -8,10 +8,10 @@ export const LeafBoundsHelper = {
     },
 
     localBoxBounds(target: ILeaf): IBoundsData {
-        return target.__.isEraser ? null : target.__local
+        return target.__.isEraser ? null : (target.__local || target.__ as IBoundsData)
     },
 
-    localEventBounds(target: ILeaf): IBoundsData {
+    localStrokeBounds(target: ILeaf): IBoundsData {
         return target.__.isEraser ? null : target.__layout.localStrokeBounds
     },
 
@@ -20,10 +20,10 @@ export const LeafBoundsHelper = {
     },
 
     maskLocalBoxBounds(target: ILeaf): IBoundsData {
-        return target.__.isMask ? target.__local : null
+        return target.__.isMask ? target.__localBounds : null
     },
 
-    maskLocalEventBounds(target: ILeaf): IBoundsData {
+    maskLocalStrokeBounds(target: ILeaf): IBoundsData {
         return target.__.isMask ? target.__layout.localStrokeBounds : null
     },
 

package/src/LeafHelper.ts

@@ -1,23 +1,47 @@
-import { IBranch, ILeaf, IMatrixData, IPointData } from '@leafer/interface'
+import { ILeaf, IMatrixData, IPointData } from '@leafer/interface'
 import { MathHelper, MatrixHelper, PointHelper } from '@leafer/math'
 
 
-const { copy, toInnerPoint, scaleOfOuter, rotateOfOuter, skewOfOuter } = MatrixHelper
+const { copy, toInnerPoint, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent, divideParent, getLayout } = MatrixHelper
 const matrix = {} as IMatrixData
 
 export const LeafHelper = {
 
-    updateAllWorldMatrix(leaf: ILeaf): void {
-        leaf.__updateWorldMatrix()
+    updateAllMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void {
+        if (checkAutoLayout && leaf.__hasAutoLayout && leaf.__layout.matrixChanged) waitAutoLayout = true
+
+        updateMatrix(leaf, checkAutoLayout, waitAutoLayout)
 
         if (leaf.isBranch) {
             const { children } = leaf
             for (let i = 0, len = children.length; i < len; i++) {
-                updateAllWorldMatrix(children[i])
+                updateAllMatrix(children[i], checkAutoLayout, waitAutoLayout)
             }
         }
     },
 
+    updateMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void {
+        const layout = leaf.__layout
+
+        if (checkAutoLayout) {
+            if (waitAutoLayout) {
+                layout.waitAutoLayout = true
+                if (leaf.__hasAutoLayout) layout.matrixChanged = false // wait updateAutoLayout
+            }
+        } else if (layout.waitAutoLayout) {
+            layout.waitAutoLayout = false
+        }
+
+        if (layout.matrixChanged) leaf.__updateLocalMatrix()
+        if (!layout.waitAutoLayout) leaf.__updateWorldMatrix()
+    },
+
+    updateBounds(leaf: ILeaf): void {
+        const layout = leaf.__layout
+        if (layout.boundsChanged) leaf.__updateLocalBounds()
+        if (!layout.waitAutoLayout) leaf.__updateWorldBounds()
+    },
+
     updateAllWorldOpacity(leaf: ILeaf): void {
         leaf.__updateWorldOpacity()
 
@@ -30,7 +54,6 @@ export const LeafHelper = {
     },
 
     updateAllChange(leaf: ILeaf): void {
-
         updateAllWorldOpacity(leaf)
 
         leaf.__updateChange()
@@ -44,11 +67,9 @@ export const LeafHelper = {
     },
 
     worldHittable(t: ILeaf): boolean {
-        if (!t.__.hittable) return false
-        let { parent } = t
-        while (parent) {
-            if (!parent.__.hittable || !parent.__.hitChildren) return false
-            parent = parent.parent
+        while (t) {
+            if (!t.__.hittable) return false
+            t = t.parent
         }
         return true
     },
@@ -66,16 +87,15 @@ export const LeafHelper = {
         t.y += y
     },
 
-    zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number): void {
-        this.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY)
+    zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void {
+        this.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize)
     },
 
-    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY: number = scaleX): void {
-        copy(matrix, t.__local)
+    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY: number = scaleX, resize?: boolean): void {
+        copy(matrix, t.__localMatrix)
         scaleOfOuter(matrix, origin, scaleX, scaleY)
         moveByMatrix(t, matrix)
-        t.scaleX *= scaleX
-        t.scaleY *= scaleY
+        t.scaleResize(scaleX, scaleY, resize !== true)
     },
 
     rotateOfWorld(t: ILeaf, origin: IPointData, angle: number): void {
@@ -83,53 +103,73 @@ export const LeafHelper = {
     },
 
     rotateOfLocal(t: ILeaf, origin: IPointData, angle: number): void {
-        copy(matrix, t.__local)
+        copy(matrix, t.__localMatrix)
         rotateOfOuter(matrix, origin, angle)
         moveByMatrix(t, matrix)
         t.rotation = MathHelper.formatRotation(t.rotation + angle)
     },
 
-    skewOfWorld(t: ILeaf, origin: IPointData, skewX: number, skewY?: number): void {
-        this.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY)
+    skewOfWorld(t: ILeaf, origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void {
+        this.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize)
     },
 
-    skewOfLocal(t: ILeaf, origin: IPointData, skewX: number, skewY: number): void {
-        copy(matrix, t.__local)
+    skewOfLocal(t: ILeaf, origin: IPointData, skewX: number, skewY: number = 0, resize?: boolean): void {
+        copy(matrix, t.__localMatrix)
         skewOfOuter(matrix, origin, skewX, skewY)
-        moveByMatrix(t, matrix)
-        t.skewX = MathHelper.formatSkew(t.skewX + skewX)
-        t.skewY = MathHelper.formatSkew(t.skewY + skewY)
+        L.setTransform(t, matrix, resize)
     },
 
-    drop(t: ILeaf, parent: IBranch): void {
-        const position = { x: t.x, y: t.y }
-        t.localToWorld(position)
-        parent.worldToInner(position)
-        t.set(position)
-        parent.add(t)
+    transform(t: ILeaf, transform: IMatrixData, resize?: boolean): void {
+        copy(matrix, t.localTransform)
+        multiplyParent(matrix, transform)
+        L.setTransform(t, matrix, resize)
     },
 
-    hasParent(t: ILeaf, parent: ILeaf): boolean {
+    setTransform(t: ILeaf, transform: IMatrixData, resize?: boolean): void {
+        const layout = getLayout(transform)
+        if (resize) {
+            t.scaleResize(layout.scaleX / t.scaleX, layout.scaleY / t.scaleY, resize !== true)
+            delete layout.scaleX
+            delete layout.scaleY
+        }
+        t.set(layout)
+    },
+
+
+    drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void {
+        copy(matrix, t.worldTransform)
+        divideParent(matrix, parent.worldTransform)
+        t.setTransform(matrix, resize)
+        parent.add(t, index)
+    },
+
+    hasParent(p: ILeaf, parent: ILeaf): boolean | void {
         if (!parent) return false
-        let p = t
         while (p) {
             if (parent === p) return true
             p = p.parent
         }
-        return false
+    },
+
+    hasParentAutoLayout(p: ILeaf): boolean | void {
+        while (p.parent) {
+            p = p.parent
+            if (p.__hasAutoLayout) return true
+        }
     }
 
 }
 
 const L = LeafHelper
-const { updateAllWorldMatrix, updateAllWorldOpacity, updateAllChange } = L
+const { updateAllMatrix, updateMatrix, updateAllWorldOpacity, updateAllChange } = L
 
 function moveByMatrix(t: ILeaf, matrix: IMatrixData): void {
-    t.x += matrix.e - t.__local.e
-    t.y += matrix.f - t.__local.f
+    const { e, f } = t.__localMatrix
+    t.x += matrix.e - e
+    t.y += matrix.f - f
 }
 
 function getTempLocal(t: ILeaf, world: IPointData): IPointData {
-    t.__layout.checkUpdate()
+    t.__layout.update()
     return t.parent ? PointHelper.tempToInnerOf(world, t.parent.__world) : world
 }

package/types/index.d.ts

@@ -1,41 +1,44 @@
-import { ILeaf, IPointData, IBranch, IBoundsData, IFunction } from '@leafer/interface';
+import { ILeaf, IPointData, IMatrixData, IBoundsData, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
 
 declare const LeafHelper: {
-    updateAllWorldMatrix(leaf: ILeaf): void;
+    updateAllMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void;
+    updateMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void;
+    updateBounds(leaf: ILeaf): void;
     updateAllWorldOpacity(leaf: ILeaf): void;
     updateAllChange(leaf: ILeaf): void;
     worldHittable(t: ILeaf): boolean;
     moveWorld(t: ILeaf, x: number, y: number): void;
     moveLocal(t: ILeaf, x: number, y?: number): void;
-    zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number): void;
-    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number): void;
+    zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
+    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOfWorld(t: ILeaf, origin: IPointData, angle: number): void;
     rotateOfLocal(t: ILeaf, origin: IPointData, angle: number): void;
-    skewOfWorld(t: ILeaf, origin: IPointData, skewX: number, skewY?: number): void;
-    skewOfLocal(t: ILeaf, origin: IPointData, skewX: number, skewY: number): void;
-    drop(t: ILeaf, parent: IBranch): void;
-    hasParent(t: ILeaf, parent: ILeaf): boolean;
+    skewOfWorld(t: ILeaf, origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    skewOfLocal(t: ILeaf, origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    transform(t: ILeaf, transform: IMatrixData, resize?: boolean): void;
+    setTransform(t: ILeaf, transform: IMatrixData, resize?: boolean): void;
+    drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void;
+    hasParent(p: ILeaf, parent: ILeaf): boolean | void;
+    hasParentAutoLayout(p: ILeaf): boolean | void;
 };
 
 declare const LeafBoundsHelper: {
     worldBounds(target: ILeaf): IBoundsData;
     localBoxBounds(target: ILeaf): IBoundsData;
-    localEventBounds(target: ILeaf): IBoundsData;
+    localStrokeBounds(target: ILeaf): IBoundsData;
     localRenderBounds(target: ILeaf): IBoundsData;
     maskLocalBoxBounds(target: ILeaf): IBoundsData;
-    maskLocalEventBounds(target: ILeaf): IBoundsData;
+    maskLocalStrokeBounds(target: ILeaf): IBoundsData;
     maskLocalRenderBounds(target: ILeaf): IBoundsData;
 };
 
-interface ILeafPushList {
-    push(item: ILeaf): void;
-}
 declare const BranchHelper: {
     sort(a: ILeaf, b: ILeaf): number;
-    pushAllChildBranch(branch: ILeaf, pushList: ILeafPushList): void;
-    pushAllParent(leaf: ILeaf, pushList: ILeafPushList): void;
+    pushAllChildBranch(branch: ILeaf, leafList: ILeafList | ILeafLevelList): void;
+    pushAllParent(leaf: ILeaf, leafList: ILeafList | ILeafLevelList): void;
     pushAllBranchStack(branch: ILeaf, pushList: ILeaf[]): void;
-    updateWorldBoundsByBranchStack(branchStack: ILeaf[]): void;
+    updateBounds(branch: ILeaf, exclude?: ILeaf): void;
+    updateBoundsByBranchStack(branchStack: ILeaf[], exclude?: ILeaf): void;
 };
 
 declare const WaitHelper: {