fix(effectScope): calling off() of a detached scope should not break …

…currentScope fix #12825
vuejs · Oct 14, 2022 · 800207c · 800207c
1 parent 5960f05
commit 800207c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/v3/reactivity/effectScope.ts b/src/v3/reactivity/effectScope.ts
@@ -16,9 +16,7 @@ export class EffectScope {
    * @internal
    */
   cleanups: (() => void)[] = []
-
   /**
-   * only assigned by undetached scope
    * @internal
    */
   parent: EffectScope | undefined
@@ -38,9 +36,9 @@ export class EffectScope {
    */
   private index: number | undefined
 
-  constructor(detached = false) {
+  constructor(public detached = false) {
+    this.parent = activeEffectScope
     if (!detached && activeEffectScope) {
-      this.parent = activeEffectScope
       this.index =
         (activeEffectScope.scopes || (activeEffectScope.scopes = [])).push(
           this
@@ -93,14 +91,15 @@ export class EffectScope {
         }
       }
       // nested scope, dereference from parent to avoid memory leaks
-      if (this.parent && !fromParent) {
+      if (!this.detached && this.parent && !fromParent) {
         // optimized O(1) removal
         const last = this.parent.scopes!.pop()
         if (last && last !== this) {
           this.parent.scopes![this.index!] = last
           last.index = this.index!
         }
       }
+      this.parent = undefined
       this.active = false
     }
   }

diff --git a/test/unit/features/v3/reactivity/effectScope.spec.ts b/test/unit/features/v3/reactivity/effectScope.spec.ts
@@ -279,4 +279,15 @@ describe('reactivity/effectScope', () => {
       expect(getCurrentScope()).toBe(currentScope)
     })
   })
+
+  it('calling .off() of a detached scope inside an active scope should not break currentScope', () => {
+    const parentScope = new EffectScope()
+
+    parentScope.run(() => {
+      const childScope = new EffectScope(true)
+      childScope.on()
+      childScope.off()
+      expect(getCurrentScope()).toBe(parentScope)
+    })
+  })
 })