@leafer/display 1.0.0-beta.10 → 1.0.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,15 +19,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-beta.10",
-    "@leafer/data": "1.0.0-beta.10",
-    "@leafer/layout": "1.0.0-beta.10",
-    "@leafer/display-module": "1.0.0-beta.10",
-    "@leafer/event": "1.0.0-beta.10",
-    "@leafer/decorator": "1.0.0-beta.10",
-    "@leafer/helper": "1.0.0-beta.10"
+    "@leafer/math": "1.0.0-beta.12",
+    "@leafer/data": "1.0.0-beta.12",
+    "@leafer/layout": "1.0.0-beta.12",
+    "@leafer/display-module": "1.0.0-beta.12",
+    "@leafer/event": "1.0.0-beta.12",
+    "@leafer/decorator": "1.0.0-beta.12",
+    "@leafer/helper": "1.0.0-beta.12"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.10"
+    "@leafer/interface": "1.0.0-beta.12"
   }
 }

package/src/Branch.ts

@@ -104,13 +104,15 @@ export class Branch extends Leaf {
 
     public removeAll(destroy?: boolean): void {
         const { children } = this
-        this.children = []
-        this.__preRemove()
-        this.__.__childBranchNumber = 0
-        children.forEach(child => {
-            this.__realRemoveChild(child)
-            if (destroy) child.destroy()
-        })
+        if (children.length) {
+            this.children = []
+            this.__preRemove()
+            this.__.__childBranchNumber = 0
+            children.forEach(child => {
+                this.__realRemoveChild(child)
+                if (destroy) child.destroy()
+            })
+        }
     }
 
     protected __preRemove(): void {
@@ -125,6 +127,7 @@ export class Branch extends Leaf {
         if (this.leafer) {
             child.__bindLeafer(null)
             if (this.leafer.ready) this.__emitChildEvent(ChildEvent.REMOVE, child)
+            this.leafer.hitCanvasManager.clear()
         }
     }
 

package/src/Leaf.ts

@@ -77,12 +77,16 @@ export class Leaf implements ILeaf {
     // branch 
     public children?: ILeaf[]
 
+
+    public destroyed: boolean
+
+
     constructor(data?: ILeafInputData) {
 
         this.innerId = create(LEAF)
 
         this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
-        this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
+        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 }
 
         this.__worldOpacity = 1
 
@@ -103,12 +107,16 @@ export class Leaf implements ILeaf {
 
 
     public __bindLeafer(leafer: ILeafer | null): void {
-        if (this.isLeafer) leafer = this as unknown as ILeafer
+        if (this.isLeafer) {
+            if (leafer !== null) leafer = this as unknown as ILeafer
+        }
 
         this.leafer = leafer
-        this.__level = this.parent ? this.parent.__level + 1 : 1
 
-        if (this.__leaferWait && leafer) WaitHelper.run(this.__leaferWait)
+        if (leafer) {
+            this.__level = this.parent ? this.parent.__level + 1 : 1
+            if (this.__leaferWait) WaitHelper.run(this.__leaferWait)
+        }
 
         if (this.isBranch) {
             const { children } = this
@@ -318,18 +326,15 @@ export class Leaf implements ILeaf {
     // ---
 
     public destroy(): void {
-        if (this.__) {
-
-            if (this.children && this.children.length) (this as unknown as IBranch).removeAll(true)
+        if (!this.destroyed) {
             if (this.parent) this.remove()
-
-            if (this.__hitCanvas) this.__hitCanvas.destroy()
+            if (this.children) (this as unknown as IBranch).removeAll(true)
 
             this.__.destroy()
             this.__layout.destroy()
 
-            this.leafer = this.parent = this.__hitCanvas = this.__ = this.__layout = this.__captureMap = this.__bubbleMap = null
-
+            this.__captureMap = this.__bubbleMap = this.__parentWait = this.__leaferWait = null
+            this.destroyed = true
         }
     }