fix(watch): replace instance unmounted with scope inactive

vuejs · Dec 30, 2023 · 735da8a · 735da8a
1 parent 8f85b6d
commit 735da8a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -220,9 +220,8 @@ function doWatch(
     )
   }
 
-  const instance =
-    getCurrentScope() === currentInstance?.scope ? currentInstance : null
-  // const instance = currentInstance
+  const scope = getCurrentScope()
+  const instance = currentInstance
   let getter: () => any
   let forceTrigger = false
   let isMultiSource = false
@@ -259,7 +258,7 @@ function doWatch(
     } else {
       // no cb -> simple effect
       getter = () => {
-        if (instance && instance.isUnmounted) {
+        if (scope && !scope.active) {
           return
         }
         if (cleanup) {