mirror of https://github.com/vuejs/core.git
fix: Revert "fix: Revert "fix(reactivity): self-referencing computed should refresh""
This reverts commit 35c760f82f
.
This commit is contained in:
parent
48613bb928
commit
e596378e0b
|
@ -594,7 +594,7 @@ describe('reactivity/computed', () => {
|
|||
|
||||
v.value += ' World'
|
||||
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()
|
||||
})
|
||||
|
||||
|
@ -892,7 +892,7 @@ describe('reactivity/computed', () => {
|
|||
v.value += ' World'
|
||||
await nextTick()
|
||||
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 () => {
|
||||
const Comp = defineComponent({
|
||||
data() {
|
||||
|
@ -998,7 +999,7 @@ describe('reactivity/computed', () => {
|
|||
})
|
||||
const root = nodeOps.createElement('div')
|
||||
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')
|
||||
await nextTick()
|
||||
expect(serializeInner(root)).toBe(`<button>Step</button><p>Step 2</p>`)
|
||||
|
|
|
@ -111,9 +111,9 @@ export class ComputedRefImpl<T = any> implements Subscriber {
|
|||
* @internal
|
||||
*/
|
||||
notify(): void {
|
||||
this.flags |= EffectFlags.DIRTY
|
||||
// avoid infinite self recursion
|
||||
if (activeSub !== this) {
|
||||
this.flags |= EffectFlags.DIRTY
|
||||
this.dep.notify()
|
||||
} else if (__DEV__) {
|
||||
// TODO warn
|
||||
|
|
|
@ -326,7 +326,7 @@ function isDirty(sub: Subscriber): boolean {
|
|||
for (let link = sub.deps; link; link = link.nextDep) {
|
||||
if (
|
||||
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
|
||||
) {
|
||||
return true
|
||||
|
@ -344,10 +344,7 @@ function isDirty(sub: Subscriber): boolean {
|
|||
* Returning false indicates the refresh failed
|
||||
* @internal
|
||||
*/
|
||||
export function refreshComputed(computed: ComputedRefImpl): false | undefined {
|
||||
if (computed.flags & EffectFlags.RUNNING) {
|
||||
return false
|
||||
}
|
||||
export function refreshComputed(computed: ComputedRefImpl): undefined {
|
||||
if (
|
||||
computed.flags & EffectFlags.TRACKING &&
|
||||
!(computed.flags & EffectFlags.DIRTY)
|
||||
|
|
Loading…
Reference in New Issue