fix(antd/next): remove host element after unmount in portal (#2900)

alibaba · Mar 3, 2022 · a2af5c9 · a2af5c9
1 parent 1ef47b0
commit a2af5c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/antd/src/__builtins__/portal.tsx b/packages/antd/src/__builtins__/portal.tsx
@@ -49,7 +49,8 @@ export function createPortalRoot<T extends React.ReactNode>(
   function unmount() {
     if (PortalMap.has(id)) {
       PortalMap.set(id, null)
-    } else if (host) {
+    }
+    if (host) {
       ReactDOM.unmountComponentAtNode(host)
       host.parentNode?.removeChild(host)
     }

diff --git a/packages/next/src/__builtins__/portal.tsx b/packages/next/src/__builtins__/portal.tsx
@@ -49,7 +49,8 @@ export function createPortalRoot<T extends React.ReactNode>(
   function unmount() {
     if (PortalMap.has(id)) {
       PortalMap.set(id, null)
-    } else if (host) {
+    }
+    if (host) {
       ReactDOM.unmountComponentAtNode(host)
       host.parentNode?.removeChild(host)
     }