Merge pull request #3420 from easyops-cn/steve/v3-control-nodes-life-…

…cycle fix(): dispatch onUnmount for control nodes when root unmount
easyops-cn · Aug 29, 2023 · f6b1265 · f6b1265
2 parents c67b211 + 81627a2
commit f6b1265
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/packages/runtime/src/internal/Renderer.spec.ts b/packages/runtime/src/internal/Renderer.spec.ts
@@ -1054,7 +1054,24 @@ describe("renderBrick for control nodes", () => {
 
     unmountTree(container);
     unmountTree(portal);
+    rendererContext.dispatchOnUnmount();
     rendererContext.dispose();
+
+    expect(consoleInfo).toBeCalledTimes(12);
+    expect(consoleInfo).toHaveBeenNthCalledWith(
+      10,
+      "onUnmount",
+      "unmount",
+      "a"
+    );
+    expect(consoleInfo).toHaveBeenNthCalledWith(
+      11,
+      "onUnmount",
+      "unmount",
+      "c"
+    );
+    expect(consoleInfo).toHaveBeenNthCalledWith(12, ":forEach unmount");
+
     consoleInfo.mockReset();
   });
 

diff --git a/packages/runtime/src/internal/Renderer.ts b/packages/runtime/src/internal/Renderer.ts
@@ -440,7 +440,7 @@ export async function renderBrick(
             listenerFactory(
               onUnmount,
               runtimeContext
-            )(new CustomEvent("unmount"));
+            )(new CustomEvent("unmount", { detail: { rerender: true } }));
           }
 
           rendererContext.reRender(
@@ -489,6 +489,15 @@ export async function renderBrick(
       });
     }
 
+    if (onUnmount) {
+      rendererContext.registerArbitraryLifeCycle("onUnmount", () => {
+        listenerFactory(
+          onUnmount,
+          runtimeContext
+        )(new CustomEvent("unmount", { detail: { rerender: false } }));
+      });
+    }
+
     return controlledOutput;
   }