fix(runtime-core): watching multiple values - handle `undefined` as initial values (fix: #5032) (#5033)

This commit is contained in:
Thorsten Lünborg 2022-10-20 21:45:05 +02:00 committed by GitHub
parent 9617dd4b2a
commit bc167b5c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View File

@ -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 () => {
const state = reactive({ count: 1 })
const status = ref(false)

View File

@ -296,7 +296,9 @@ function doWatch(
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 = () => {
if (!effect.active) {
return
@ -323,7 +325,10 @@ function doWatch(
callWithAsyncErrorHandling(cb, instance, ErrorCodes.WATCH_CALLBACK, [
newValue,
// 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
])
oldValue = newValue