fix: fix portal cleanup (fix #209)

igordanchenko · Nov 27, 2023 · 02d8f49 · 02d8f49
1 parent 443ba5f
commit 02d8f49
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/modules/Portal.tsx b/src/modules/Portal.tsx
@@ -49,11 +49,15 @@ export function Portal({ children, animation, styles, className, on, portal, clo
     };
   }, []);
 
+  const handleCleanup = useEventCallback(() => {
+    cleanup.current.forEach((clean) => clean());
+    cleanup.current = [];
+  });
+
   const handleClose = useEventCallback(() => {
     setVisible(false);
 
-    cleanup.current.forEach((clean) => clean());
-    cleanup.current = [];
+    handleCleanup();
 
     on.exiting?.();
 
@@ -97,9 +101,11 @@ export function Portal({ children, animation, styles, className, on, portal, clo
     (node: HTMLDivElement | null) => {
       if (node) {
         handleEnter(node);
+      } else {
+        handleCleanup();
       }
     },
-    [handleEnter],
+    [handleEnter, handleCleanup],
   );
 
   return mounted