fix: prevent removing active instances in normal mode

antfu · Jan 15, 2021 · 3aef4b8 · 3aef4b8
1 parent fae5ab0
commit 3aef4b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/reactivue/src/component.ts b/packages/reactivue/src/component.ts
@@ -26,8 +26,10 @@ export const getNewInstanceId = () => {
     // When React is in Strict mode, it runs state functions twice
     // Remove unmounted instances before creating new one
     Object.keys(_vueState).forEach((id) => {
-      if (!_vueState[+id].isActive)
-        unmount(+id)
+      setTimeout(() => {
+        if (_vueState[+id]?.isActive === false)
+          unmount(+id)
+      }, 0)
     })
   }
 

diff --git a/packages/reactivue/src/useSetup.ts b/packages/reactivue/src/useSetup.ts
@@ -60,11 +60,14 @@ export function useSetup<State extends Record<any, any>, Props = {}>(
       let isChanged = false
 
       useInstanceScope(id, (instance) => {
-        if (!instance || !instance.isUnmounting)
+        if (!instance)
           return
 
         instance.isActive = true
 
+        if (!instance.isUnmounting)
+          return
+
         const props = Object.assign({}, (ReactProps || {})) as any
         const setup = setupFunction(readonly(props))