find the root cause of some jank

collabsoft · Feb 1, 2023 · 557fe74 · 557fe74
1 parent e9139e0
commit 557fe74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/packages/core/src/core-models/WorkspaceCollectionModel.ts b/packages/core/src/core-models/WorkspaceCollectionModel.ts
@@ -22,12 +22,10 @@ export class WorkspaceCollectionModel<
   implements WorkspaceCollectionInterface
 {
   children: WorkspaceModel[];
-  childrenListeners: Set<() => any>;
 
   constructor(type: string) {
     super(type);
     this.children = [];
-    this.childrenListeners = new Set();
   }
 
   fromArray(payload: S, engine: WorkspaceEngine) {
@@ -103,15 +101,6 @@ export class WorkspaceCollectionModel<
     return this.children[index + 1];
   }
 
-  delete() {
-    // delete all the children
-    this.childrenListeners.forEach((l) => l());
-    for (let child of this.children) {
-      child.delete();
-    }
-    super.delete();
-  }
-
   normalize() {
     if (this.parent && this.parent instanceof WorkspaceCollectionModel) {
       if (this.children.length === 0) {
@@ -152,7 +141,6 @@ export class WorkspaceCollectionModel<
       const listener = model.registerListener({
         removed: () => {
           listener();
-          this.childrenListeners.delete(listener);
           this.removeModel(model);
           this.iterateListeners((list) => {
             list.childRemoved?.(model);
@@ -165,7 +153,6 @@ export class WorkspaceCollectionModel<
           this.invalidateDimensions();
         }
       });
-      this.childrenListeners.add(listener);
 
       if (position === null) {
         this.children.push(model);

diff --git a/packages/defaults/src/DefaultSubComponentRenderer.tsx b/packages/defaults/src/DefaultSubComponentRenderer.tsx
@@ -39,6 +39,7 @@ export class DefaultSubComponentRenderer
         title={event.model.displayName}
         close={() => {
           event.model.delete();
+          event.engine.normalize();
         }}
       />
     );
@@ -58,6 +59,7 @@ export class DefaultSubComponentRenderer
         title={event.model.displayName}
         close={() => {
           event.model.parent.delete();
+          event.engine.normalize();
         }}
       />
     );