@leafer/display 1.0.0-rc.4 → 1.0.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,16 +22,16 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-rc.4",
-    "@leafer/data": "1.0.0-rc.4",
-    "@leafer/layout": "1.0.0-rc.4",
-    "@leafer/display-module": "1.0.0-rc.4",
-    "@leafer/event": "1.0.0-rc.4",
-    "@leafer/decorator": "1.0.0-rc.4",
-    "@leafer/helper": "1.0.0-rc.4",
-    "@leafer/platform": "1.0.0-rc.4"
+    "@leafer/math": "1.0.0-rc.5",
+    "@leafer/data": "1.0.0-rc.5",
+    "@leafer/layout": "1.0.0-rc.5",
+    "@leafer/display-module": "1.0.0-rc.5",
+    "@leafer/event": "1.0.0-rc.5",
+    "@leafer/decorator": "1.0.0-rc.5",
+    "@leafer/helper": "1.0.0-rc.5",
+    "@leafer/platform": "1.0.0-rc.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.4"
+    "@leafer/interface": "1.0.0-rc.5"
   }
 }

package/src/Branch.ts

@@ -75,7 +75,7 @@ export class Branch extends Leaf {
 
         index === undefined ? this.children.push(child) : this.children.splice(index, 0, child)
         if (child.isBranch) this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1
-        child.__layout.boundsChanged || child.__layout.positionChange() // layouted(removed), need update
+        child.__layout.boundsChanged || child.__layout.matrixChange() // layouted(removed), need update
 
         if (child.__parentWait) WaitHelper.run(child.__parentWait)
 

package/src/Leaf.ts

@@ -88,8 +88,12 @@ export class Leaf implements ILeaf {
 
 
     constructor(data?: ILeafInputData) {
-
         this.innerId = create(LEAF)
+        this.reset(data)
+    }
+
+
+    public reset(data?: ILeafInputData): void {
 
         this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1, rotation: 0, skewX: 0, skewY: 0 }
         this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
@@ -99,6 +103,8 @@ export class Leaf implements ILeaf {
         this.__ = new this.__DataProcessor(this)
         this.__layout = new this.__LayoutProcessor(this)
 
+        if (this.__level) this.resetCustom()
+
         if (data) {
             if (data.children) {
                 this.set(data)
@@ -108,6 +114,11 @@ export class Leaf implements ILeaf {
         }
     }
 
+    public resetCustom(): void {
+        this.__hasMask = this.__hasEraser = null
+        this.forceUpdate()
+    }
+
 
     public waitParent(item: IFunction): void {
         this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item])
@@ -126,9 +137,12 @@ export class Leaf implements ILeaf {
             if (leafer !== null) leafer = this as unknown as ILeafer
         }
 
+        if (this.leafer && !leafer) this.leafer.leafs--
+
         this.leafer = leafer
 
         if (leafer) {
+            leafer.leafs++
             this.__level = this.parent ? this.parent.__level + 1 : 1
             if (this.__leaferWait) WaitHelper.run(this.__leaferWait)
         }
@@ -162,7 +176,7 @@ export class Leaf implements ILeaf {
     // ---
 
     public forceUpdate(attrName?: string): void {
-        if (attrName === undefined) attrName = 'scaleX'
+        if (attrName === undefined) attrName = 'width'
         else if (attrName === 'surface') attrName = 'blendMode'
         const value = this.__.__getInput(attrName)
         this.__[attrName] = value === undefined ? null : undefined;

package/types/index.d.ts

@@ -43,6 +43,8 @@ declare class Leaf implements ILeaf {
     children?: ILeaf[];
     destroyed: boolean;
     constructor(data?: ILeafInputData);
+    reset(data?: ILeafInputData): void;
+    resetCustom(): void;
     waitParent(item: IFunction): void;
     waitLeafer(item: IFunction): void;
     nextRender(item: IFunction): void;