fix(watch): replace instance unmounted with scope inactive

vuejs · Dec 31, 2023 · f8ea946 · f8ea946
1 parent 24d77c2
commit f8ea946
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -220,8 +220,8 @@ function doWatch(
     )
   }
 
-  const instance =
-    getCurrentScope() === currentInstance?.scope ? currentInstance : null
+  const scope = getCurrentScope()
+  const instance = currentInstance
   const reactiveGetter = (source: object) =>
     deep === true
       ? source // traverse will happen in wrapped getter below
@@ -261,7 +261,7 @@ function doWatch(
     } else {
       // no cb -> simple effect
       getter = () => {
-        if (instance && instance.isUnmounted) {
+        if (scope && !scope.active) {
           return
         }
         if (cleanup) {