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

fix(watch): for immediate watch with single source, ensure cb is called with undefined as oldValue (#7075) 

fix: #7074
This commit is contained in:
Thorsten Lünborg 2022-11-10 00:19:35 +01:00 committed by GitHub
parent 9a816dcec0
commit 5dc593ba28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/runtime-core/__tests__/apiWatch.spec.ts
View File

@ -745,7 +745,7 @@ describe('api: watch', () => {
const state = ref() const state = ref()
const spy = jest.fn() const spy = jest.fn()
watch(() => state.value, spy, { immediate: true }) watch(() => state.value, spy, { immediate: true })
expect(spy).toHaveBeenCalled() expect(spy).toHaveBeenCalledWith(undefined, undefined, expect.any(Function))
state.value = 3 state.value = 3
await nextTick() await nextTick()
expect(spy).toHaveBeenCalledTimes(2) expect(spy).toHaveBeenCalledTimes(2)

9
packages/runtime-core/src/apiWatch.ts
View File

@ -333,10 +333,11 @@ 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 || oldValue === INITIAL_WATCHER_VALUE
(isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE) ? undefined
? [] : (isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE)
: oldValue, ? []
: oldValue,
onCleanup onCleanup
]) ])
oldValue = newValue oldValue = newValue