fix(reactivity): ensure watch cleanup on effect stop

edison1105 · edison1105 · commit de855274c917 · 2024-11-13T09:05:08.000+08:00
diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts
@@ -121,8 +121,9 @@ export class EffectScope {
       for (i = 0, l = this.effects.length; i < l; i++) {
         this.effects[i].stop()
       }
-      for (i = 0, l = this.cleanups.length; i < l; i++) {
-        this.cleanups[i]()
+      const cleanups = this.cleanups.slice()
+      for (i = 0, l = cleanups.length; i < l; i++) {
+        cleanups[i]()
       }
       if (this.scopes) {
         for (i = 0, l = this.scopes.length; i < l; i++) {
diff --git a/packages/reactivity/src/watch.ts b/packages/reactivity/src/watch.ts
@@ -215,8 +215,12 @@ export function watch(
     effect.stop()
     if (scope) {
       remove(scope.effects, effect)
+      remove(scope.cleanups, watchHandle)
     }
   }
+  if (scope) {
+    scope.cleanups.push(watchHandle)
+  }
 
   if (once && cb) {
     const _cb = cb

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,9 @@ export class EffectScope {`
`121`	`121`	`for (i = 0, l = this.effects.length; i < l; i++) {`
`122`	`122`	`this.effects[i].stop()`
`123`	`123`	`}`
`124`		`- for (i = 0, l = this.cleanups.length; i < l; i++) {`
`125`		`- this.cleanups[i]()`
	`124`	`+ const cleanups = this.cleanups.slice()`
	`125`	`+ for (i = 0, l = cleanups.length; i < l; i++) {`
	`126`	`+ cleanups[i]()`
`126`	`127`	`}`
`127`	`128`	`if (this.scopes) {`
`128`	`129`	`for (i = 0, l = this.scopes.length; i < l; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,12 @@ export function watch(`
`215`	`215`	`effect.stop()`
`216`	`216`	`if (scope) {`
`217`	`217`	`remove(scope.effects, effect)`
	`218`	`+ remove(scope.cleanups, watchHandle)`
`218`	`219`	`}`
`219`	`220`	`}`
	`221`	`+ if (scope) {`
	`222`	`+ scope.cleanups.push(watchHandle)`
	`223`	`+ }`
`220`	`224`
`221`	`225`	`if (once && cb) {`
`222`	`226`	`const _cb = cb`