root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix: Revert "fix: Revert "fix(reactivity): self-referencing computed should refresh"" 

This reverts commit 35c760f82f.
This commit is contained in:
Evan You 2024-09-10 15:55:41 +08:00
parent 48613bb928
commit e596378e0b
No known key found for this signature in database
GPG Key ID: 00E9AB7A6704CE0A
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/reactivity/__tests__/computed.spec.ts
View File

@ -594,7 +594,7 @@ describe('reactivity/computed', () => {
v.value += ' World' v.value += ' World'
await nextTick() await nextTick()
expect(serializeInner(root)).toBe('Hello World World World') expect(serializeInner(root)).toBe('Hello World World World World')
// expect(COMPUTED_SIDE_EFFECT_WARN).toHaveBeenWarned() // expect(COMPUTED_SIDE_EFFECT_WARN).toHaveBeenWarned()
}) })
@ -892,7 +892,7 @@ describe('reactivity/computed', () => {
v.value += ' World' v.value += ' World'
await nextTick() await nextTick()
expect(serializeInner(root)).toBe( expect(serializeInner(root)).toBe(
'Hello World World World | Hello World World World', 'Hello World World World World | Hello World World World World',
) )
}) })
@ -962,6 +962,7 @@ describe('reactivity/computed', () => {
}) })
}) })
// #11797
test('should prevent endless recursion in self-referencing computed getters', async () => { test('should prevent endless recursion in self-referencing computed getters', async () => {
const Comp = defineComponent({ const Comp = defineComponent({
data() { data() {
@ -998,7 +999,7 @@ describe('reactivity/computed', () => {
}) })
const root = nodeOps.createElement('div') const root = nodeOps.createElement('div')
render(h(Comp), root) render(h(Comp), root)
expect(serializeInner(root)).toBe(`<button>Step</button><p></p>`) expect(serializeInner(root)).toBe(`<button>Step</button><p>Step 1</p>`)
triggerEvent(root.children[1] as TestElement, 'click') triggerEvent(root.children[1] as TestElement, 'click')
await nextTick() await nextTick()
expect(serializeInner(root)).toBe(`<button>Step</button><p>Step 2</p>`) expect(serializeInner(root)).toBe(`<button>Step</button><p>Step 2</p>`)

2
packages/reactivity/src/computed.ts
View File

@ -111,9 +111,9 @@ export class ComputedRefImpl<T = any> implements Subscriber {
* @internal * @internal
*/ */
notify(): void { notify(): void {
this.flags |= EffectFlags.DIRTY
// avoid infinite self recursion // avoid infinite self recursion
if (activeSub !== this) { if (activeSub !== this) {
this.flags |= EffectFlags.DIRTY
this.dep.notify() this.dep.notify()
} else if (__DEV__) { } else if (__DEV__) {
// TODO warn // TODO warn

7
packages/reactivity/src/effect.ts
View File

@ -326,7 +326,7 @@ function isDirty(sub: Subscriber): boolean {
for (let link = sub.deps; link; link = link.nextDep) { for (let link = sub.deps; link; link = link.nextDep) {
if ( if (
link.dep.version !== link.version || link.dep.version !== link.version ||
(link.dep.computed && refreshComputed(link.dep.computed) === false) || (link.dep.computed && refreshComputed(link.dep.computed)) ||
link.dep.version !== link.version link.dep.version !== link.version
) { ) {
return true return true
@ -344,10 +344,7 @@ function isDirty(sub: Subscriber): boolean {
* Returning false indicates the refresh failed * Returning false indicates the refresh failed
* @internal * @internal
*/ */
export function refreshComputed(computed: ComputedRefImpl): false | undefined { export function refreshComputed(computed: ComputedRefImpl): undefined {
if (computed.flags & EffectFlags.RUNNING) {
return false
}
if ( if (
computed.flags & EffectFlags.TRACKING && computed.flags & EffectFlags.TRACKING &&
!(computed.flags & EffectFlags.DIRTY) !(computed.flags & EffectFlags.DIRTY)