fix: render-imperative (#1076)

ZhongAnTech · Mar 27, 2023 · e6cabda · e6cabda
1 parent ed1e876
commit e6cabda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/zarm/src/utils/dom/render.ts b/packages/zarm/src/utils/dom/render.ts
@@ -18,12 +18,11 @@ const fullClone = {
 const { version, render: reactRender, unmountComponentAtNode } = fullClone;
 
 let createRoot: CreateRoot;
-let flushSync;
+
 try {
   const mainVersion = Number((version || '').split('.')[0]);
   if (mainVersion >= 18 && fullClone.createRoot) {
     createRoot = fullClone.createRoot;
-    flushSync = fullClone.flushSync;
   }
 } catch {
   // Do nothing;
@@ -55,9 +54,7 @@ function modernRender(node: React.ReactElement, container: ContainerType) {
   toggleWarning(true);
   const root = container[MARK] || createRoot(container);
   toggleWarning(false);
-  flushSync(() => {
-    root.render(node);
-  })
+  root.render(node);
   container[MARK] = root;
 }
 

diff --git a/packages/zarm/src/utils/dom/renderImperatively.tsx b/packages/zarm/src/utils/dom/renderImperatively.tsx
@@ -72,7 +72,11 @@ export const renderImperatively = (element: TargetElement) => {
 
   return {
     close: () => {
-      wrapperRef.current?.close();
+      if (wrapperRef.current) {
+        wrapperRef.current?.close();
+      } else {
+        unmount();
+      }
     },
     replace: (replacedElement) => {
       wrapperRef.current?.replace(replacedElement);