revert: fix(reactivity): correct dirty assign in render function (#10091)

This reverts commit 8d04205041.

close #10098
close #10100
This commit is contained in:
Evan You 2024-01-13 10:28:47 +08:00
parent fd337dddd1
commit 8b1848173b
2 changed files with 1 additions and 35 deletions

View File

@ -3,19 +3,16 @@ import {
type ReactiveEffectRunner,
TrackOpTypes,
TriggerOpTypes,
computed,
effect,
markRaw,
reactive,
readonly,
ref,
shallowReactive,
stop,
toRaw,
} from '../src/index'
import { pauseScheduling, resetScheduling } from '../src/effect'
import { ITERATE_KEY, getDepFromReactive } from '../src/reactiveEffect'
import { h, nextTick, nodeOps, render, serialize } from '@vue/runtime-test'
describe('reactivity/effect', () => {
it('should run the passed function once (wrapped by a effect)', () => {
@ -1014,35 +1011,6 @@ describe('reactivity/effect', () => {
expect(counterSpy).toHaveBeenCalledTimes(1)
})
// #10082
it('should set dirtyLevel when effect is allowRecurse and is running', async () => {
const s = ref(0)
const n = computed(() => s.value + 1)
const Child = {
setup() {
s.value++
return () => n.value
},
}
const renderSpy = vi.fn()
const Parent = {
setup() {
return () => {
renderSpy()
return [n.value, h(Child)]
}
},
}
const root = nodeOps.createElement('div')
render(h(Parent), root)
await nextTick()
expect(serialize(root)).toBe('<div>22</div>')
expect(renderSpy).toHaveBeenCalledTimes(2)
})
describe('empty dep cleanup', () => {
it('should remove the dep when the effect is stopped', () => {
const obj = reactive({ prop: 1 })

View File

@ -295,9 +295,7 @@ export function triggerEffects(
}
if (
effect._dirtyLevel < dirtyLevel &&
(!effect._runnings ||
effect.allowRecurse ||
dirtyLevel !== DirtyLevels.ComputedValueDirty)
(!effect._runnings || dirtyLevel !== DirtyLevels.ComputedValueDirty)
) {
const lastDirtyLevel = effect._dirtyLevel
effect._dirtyLevel = dirtyLevel