fix(watch): replace instance unmounted with scope inactive

yangmingshan · yangmingshan · commit f8ea946ef761 · 2023-12-31T17:48:44.000+08:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,8 @@ function doWatch(`
`220`	`220`	`)`
`221`	`221`	`}`
`222`	`222`
`223`		`- const instance =`
`224`		`- getCurrentScope() === currentInstance?.scope ? currentInstance : null`
	`223`	`+ const scope = getCurrentScope()`
	`224`	`+ const instance = currentInstance`
`225`	`225`	`const reactiveGetter = (source: object) =>`
`226`	`226`	`deep === true`
`227`	`227`	`? source // traverse will happen in wrapped getter below`
`@@ -261,7 +261,7 @@ function doWatch(`
`261`	`261`	`} else {`
`262`	`262`	`// no cb -> simple effect`
`263`	`263`	`getter = () => {`
`264`		`- if (instance && instance.isUnmounted) {`
	`264`	`+ if (scope && !scope.active) {`
`265`	`265`	`return`
`266`	`266`	`}`
`267`	`267`	`if (cleanup) {`