@leafer/display 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,17 +22,17 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.4",
-    "@leafer/data": "1.0.4",
-    "@leafer/layout": "1.0.4",
-    "@leafer/display-module": "1.0.4",
-    "@leafer/event": "1.0.4",
-    "@leafer/decorator": "1.0.4",
-    "@leafer/helper": "1.0.4",
-    "@leafer/debug": "1.0.4",
-    "@leafer/platform": "1.0.4"
+    "@leafer/math": "1.0.6",
+    "@leafer/data": "1.0.6",
+    "@leafer/layout": "1.0.6",
+    "@leafer/display-module": "1.0.6",
+    "@leafer/event": "1.0.6",
+    "@leafer/decorator": "1.0.6",
+    "@leafer/helper": "1.0.6",
+    "@leafer/debug": "1.0.6",
+    "@leafer/platform": "1.0.6"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.4"
+    "@leafer/interface": "1.0.6"
   }
 }

package/src/Branch.ts

@@ -4,6 +4,7 @@ import { BoundsHelper } from '@leafer/math'
 import { BranchHelper, LeafBoundsHelper } from '@leafer/helper'
 import { useModule } from '@leafer/decorator'
 import { BranchRender } from '@leafer/display-module'
+import { UICreator } from '@leafer/platform'
 
 import { Leaf } from './Leaf'
 
@@ -64,11 +65,16 @@ export class Branch extends Leaf { // tip: rewrited Group
 
     public add(child: ILeaf, index?: number): void {
         if (child === this) return
+        const noIndex = index === undefined
+        if (!child.__) {
+            if (child instanceof Array) return child.forEach(item => { this.add(item, index); noIndex || index++ }) // add []
+            else child = UICreator.get(child.tag, child) // add JSON
+        }
 
         if (child.parent) child.parent.remove(child)
         child.parent = this
 
-        index === undefined ? this.children.push(child) : this.children.splice(index, 0, child)
+        noIndex ? this.children.push(child) : this.children.splice(index, 0, child)
         if (child.isBranch) this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1
 
         child.__layout.boxChanged || child.__layout.boxChange() // layouted(removed), need update
@@ -84,15 +90,17 @@ export class Branch extends Leaf { // tip: rewrited Group
         this.__layout.affectChildrenSort && this.__layout.childrenSortChange()
     }
 
-    public addMany(...children: ILeaf[]): void {
-        children.forEach(child => this.add(child))
-    }
+    public addMany(...children: ILeaf[]): void { this.add(children as any) }
 
     public remove(child?: ILeaf, destroy?: boolean): void {
         if (child) {
 
-            if ((child as ILeaf).animationOut) child.__runAnimation('out', () => this.__remove(child, destroy))
-            else this.__remove(child, destroy)
+            if (child.__) {
+
+                if ((child as ILeaf).animationOut) child.__runAnimation('out', () => this.__remove(child, destroy))
+                else this.__remove(child, destroy)
+
+            } else this.find(child as any).forEach(item => this.remove(item, destroy)) // 
 
         } else if (child === undefined) {
             super.remove(null, destroy)

package/src/Leaf.ts

@@ -36,6 +36,9 @@ export class Leaf implements ILeaf {
     public leafer?: ILeaferBase
     public parent?: ILeaf
 
+    public get leaferIsCreated(): boolean { return this.leafer && this.leafer.created }
+    public get leaferIsReady(): boolean { return this.leafer && this.leafer.ready }
+
     public get isLeafer(): boolean { return false }
     public get isBranch(): boolean { return false }
     public get isBranchLeaf(): boolean { return false }
@@ -609,9 +612,9 @@ export class Leaf implements ILeaf {
 
     public __updateSortChildren(): void { }
 
-    public add(_child: ILeaf, _index?: number): void { }
+    public add(_child: ILeaf | ILeaf[] | ILeafInputData | ILeafInputData[], _index?: number): void { }
 
-    public remove(_child?: ILeaf, destroy?: boolean): void {
+    public remove(_child?: ILeaf | number | string | IFindMethod, destroy?: boolean): void {
         if (this.parent) this.parent.remove(this, destroy)
     }
 

package/types/index.d.ts

@@ -12,6 +12,8 @@ declare class Leaf implements ILeaf {
     get __LayoutProcessor(): typeof LeafLayout;
     leafer?: ILeaferBase;
     parent?: ILeaf;
+    get leaferIsCreated(): boolean;
+    get leaferIsReady(): boolean;
     get isLeafer(): boolean;
     get isBranch(): boolean;
     get isBranchLeaf(): boolean;
@@ -166,8 +168,8 @@ declare class Leaf implements ILeaf {
     __updateMotionPath(): void;
     __runAnimation(_type: 'in' | 'out', _complete?: IFunction): void;
     __updateSortChildren(): void;
-    add(_child: ILeaf, _index?: number): void;
-    remove(_child?: ILeaf, destroy?: boolean): void;
+    add(_child: ILeaf | ILeaf[] | ILeafInputData | ILeafInputData[], _index?: number): void;
+    remove(_child?: ILeaf | number | string | IFindMethod, destroy?: boolean): void;
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void;
     on(_type: string | string[] | IEventMap, _listener?: IEventListener, _options?: IEventOption): void;
     off(_type?: string | string[], _listener?: IEventListener, _options?: IEventOption): void;