Vue/vue
1
0
Fork 0
mirror of https://github.com/vuejs/vue.git synced 2024-11-21 20:28:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fix #12825
This commit is contained in:
Evan You 2022-10-14 10:51:07 +08:00
parent 5960f05c69
commit 800207c473
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/v3/reactivity/effectScope.ts
View File

@ -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) {
if (!detached && activeEffectScope) {
constructor(public detached = false) {
this.parent = activeEffectScope
if (!detached && activeEffectScope) {
this.index =
(activeEffectScope.scopes || (activeEffectScope.scopes = [])).push(
this
@ -93,7 +91,7 @@ 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) {
@ -101,6 +99,7 @@ export class EffectScope {
last.index = this.index!
}
}
this.parent = undefined
this.active = false
}
}

11
test/unit/features/v3/reactivity/effectScope.spec.ts
View File

@ -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)
})
})
})