fix(watch): replace instance unmounted with scope inactive

yangmingshan · yangmingshan · commit 735da8a23f2d · 2023-12-31T00:52:34.000+08:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -220,9 +220,8 @@ function doWatch(`
`220`	`220`	`)`
`221`	`221`	`}`
`222`	`222`
`223`		`- const instance =`
`224`		`- getCurrentScope() === currentInstance?.scope ? currentInstance : null`
`225`		`- // const instance = currentInstance`
	`223`	`+ const scope = getCurrentScope()`
	`224`	`+ const instance = currentInstance`
`226`	`225`	`let getter: () => any`
`227`	`226`	`let forceTrigger = false`
`228`	`227`	`let isMultiSource = false`
`@@ -259,7 +258,7 @@ function doWatch(`
`259`	`258`	`} else {`
`260`	`259`	`// no cb -> simple effect`
`261`	`260`	`getter = () => {`
`262`		`- if (instance && instance.isUnmounted) {`
	`261`	`+ if (scope && !scope.active) {`
`263`	`262`	`return`
`264`	`263`	`}`
`265`	`264`	`if (cleanup) {`