Skip to content

Commit

Permalink
fix(reactivity): fix currentScope loss when running detached effect s…
Browse files Browse the repository at this point in the history
…cope (#5575)
  • Loading branch information
a65162 authored Apr 12, 2022
1 parent cee1eaf commit 0a301d4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
16 changes: 15 additions & 1 deletion packages/reactivity/__tests__/effectScope.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {
onScopeDispose,
computed,
ref,
ComputedRef
ComputedRef,
getCurrentScope
} from '../src'

describe('reactivity/effect/scope', () => {
Expand Down Expand Up @@ -263,4 +264,17 @@ describe('reactivity/effect/scope', () => {
expect(watchSpy).toHaveBeenCalledTimes(1)
expect(watchEffectSpy).toHaveBeenCalledTimes(2)
})

it('getCurrentScope() stays valid when running a detached nested EffectScope', () => {
const parentScope = new EffectScope()

parentScope.run(() => {
const currentScope = getCurrentScope()
expect(currentScope).toBeDefined()
const detachedScope = new EffectScope(true)
detachedScope.run(() => {})

expect(getCurrentScope()).toBe(currentScope)
})
})
})
9 changes: 8 additions & 1 deletion packages/reactivity/src/effectScope.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ export class EffectScope {
effects: ReactiveEffect[] = []
cleanups: (() => void)[] = []

/**
* only assinged by undetached scope
*/
parent: EffectScope | undefined
/**
* record undetached scopes
*/
scopes: EffectScope[] | undefined
/**
* track a child scope's index in its parent's scopes array for optimized
Expand All @@ -28,11 +34,12 @@ export class EffectScope {

run<T>(fn: () => T): T | undefined {
if (this.active) {
const currentEffectScope = activeEffectScope
try {
activeEffectScope = this
return fn()
} finally {
activeEffectScope = this.parent
activeEffectScope = currentEffectScope
}
} else if (__DEV__) {
warn(`cannot run an inactive effect scope.`)
Expand Down

0 comments on commit 0a301d4

Please sign in to comment.