mirror of https://github.com/vuejs/core.git
fix(runtime-core): watching multiple values - handle `undefined` as initial values (fix: #5032) (#5033)
This commit is contained in:
parent
9617dd4b2a
commit
bc167b5c6c
|
@ -177,6 +177,23 @@ describe('api: watch', () => {
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('watching multiple sources: undefined initial values and immediate: true', async () => {
|
||||||
|
const a = ref()
|
||||||
|
const b = ref()
|
||||||
|
let called = false
|
||||||
|
watch(
|
||||||
|
[a, b],
|
||||||
|
(newVal, oldVal) => {
|
||||||
|
called = true
|
||||||
|
expect(newVal).toMatchObject([undefined, undefined])
|
||||||
|
expect(oldVal).toBeUndefined()
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
await nextTick()
|
||||||
|
expect(called).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
it('watching multiple sources: readonly array', async () => {
|
it('watching multiple sources: readonly array', async () => {
|
||||||
const state = reactive({ count: 1 })
|
const state = reactive({ count: 1 })
|
||||||
const status = ref(false)
|
const status = ref(false)
|
||||||
|
|
|
@ -296,7 +296,9 @@ function doWatch(
|
||||||
return NOOP
|
return NOOP
|
||||||
}
|
}
|
||||||
|
|
||||||
let oldValue = isMultiSource ? [] : INITIAL_WATCHER_VALUE
|
let oldValue: any = isMultiSource
|
||||||
|
? new Array((source as []).length).fill(INITIAL_WATCHER_VALUE)
|
||||||
|
: INITIAL_WATCHER_VALUE
|
||||||
const job: SchedulerJob = () => {
|
const job: SchedulerJob = () => {
|
||||||
if (!effect.active) {
|
if (!effect.active) {
|
||||||
return
|
return
|
||||||
|
@ -323,7 +325,10 @@ function doWatch(
|
||||||
callWithAsyncErrorHandling(cb, instance, ErrorCodes.WATCH_CALLBACK, [
|
callWithAsyncErrorHandling(cb, instance, ErrorCodes.WATCH_CALLBACK, [
|
||||||
newValue,
|
newValue,
|
||||||
// pass undefined as the old value when it's changed for the first time
|
// pass undefined as the old value when it's changed for the first time
|
||||||
oldValue === INITIAL_WATCHER_VALUE ? undefined : oldValue,
|
oldValue === INITIAL_WATCHER_VALUE ||
|
||||||
|
(isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE)
|
||||||
|
? undefined
|
||||||
|
: oldValue,
|
||||||
onCleanup
|
onCleanup
|
||||||
])
|
])
|
||||||
oldValue = newValue
|
oldValue = newValue
|
||||||
|
|
Loading…
Reference in New Issue