fix(reactivity): properly avoid effect recurse

vuejs · Jan 12, 2024 · 595bae8 · 595bae8
1 parent bb6b7a2
commit 595bae8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/reactivity/__tests__/computed.spec.ts b/packages/reactivity/__tests__/computed.spec.ts
@@ -72,6 +72,17 @@ describe('reactivity/computed', () => {
  expect(c1.value).toBe(1)
  })
 
+ it('should work when chained(ref+computed)', () => {
+ const value = ref(0)
+ const provider = computed(() => value.value + consumer.value)
+ const consumer = computed(() => {
+ value.value++
+ return 'foo'
+ })
+ provider.value
+ expect(provider.value).toBe('1foo')
+ })
+
  it('should trigger effect when chained', () => {
  const value = reactive({ foo: 0 })
  const getter1 = vi.fn(() => value.foo)

diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
@@ -290,7 +290,7 @@ export function triggerEffects(
 ) {
  pauseScheduling()
  for (const effect of dep.keys()) {
- if (!effect.allowRecurse && effect._runnings) {
+ if (!effect.allowRecurse && effect._runnings && effect === activeEffect) {
  continue
  }
  if (