chore: review

rudyxu1102 · Jun 5, 2024 · ba12cdb · ba12cdb
1 parent 275412c
commit ba12cdb
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts
@@ -1,4 +1,4 @@
-import type { ReactiveEffect } from './effect'
+import { type ReactiveEffect, pauseTracking, resetTracking } from './effect'
 import { warn } from './warning'
 
 let activeEffectScope: EffectScope | undefined
@@ -80,6 +80,7 @@ export class EffectScope {
 
   stop(fromParent?: boolean) {
     if (this._active) {
+      pauseTracking()
       let i, l
       for (i = 0, l = this.effects.length; i < l; i++) {
         this.effects[i].stop()
@@ -103,6 +104,7 @@ export class EffectScope {
       }
       this.parent = undefined
       this._active = false
+      resetTracking()
     }
   }
 }
@@ -147,11 +149,7 @@ export function getCurrentScope() {
  */
 export function onScopeDispose(fn: () => void) {
   if (activeEffectScope) {
-    activeEffectScope.cleanups.push(() => {
-      pauseTracking()
-      fn()
-      resetTracking()
-    })
+    activeEffectScope.cleanups.push(fn)
   } else if (__DEV__) {
     warn(
       `onScopeDispose() is called when there is no active effect scope` +