remove support conditions

leaferjs · Sep 26, 2024 · 63e1faf · 63e1faf
1 parent a757f86
commit 63e1faf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/display/src/Branch.ts b/packages/display/src/Branch.ts
@@ -93,8 +93,12 @@ export class Branch extends Leaf { // tip: rewrited Group
     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)

diff --git a/packages/display/src/Leaf.ts b/packages/display/src/Leaf.ts
@@ -611,7 +611,7 @@ export class Leaf implements ILeaf {
 
     public add(_child: ILeaf | 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)
     }
 

diff --git a/packages/interface/src/display/ILeaf.ts b/packages/interface/src/display/ILeaf.ts
@@ -663,7 +663,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     __updateSortChildren(): void
     add(child: ILeaf | ILeafInputData, index?: number): void
-    remove(child?: ILeaf, destroy?: boolean): void
+    remove(child?: ILeaf | number | string | IFindMethod, destroy?: boolean): void
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void
 }