Commit 6d857f5

committed

fix(watch): new property addition should trigger deep watcher with getter

1 parent a174c29 commit 6d857f5Copy full SHA for 6d857f5

File tree

+37

-2

lines changed

+37

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,11 @@ function doWatch(`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`const instance = currentInstance`
`188`		`- const call = (fn: Function, type: string, args: any[] \| null = null) =>`
`189`		`- invokeWithErrorHandling(fn, null, args, instance, type)`
	`188`	`+ const call = (fn: Function, type: string, args: any[] \| null = null) => {`
	`189`	`+ const res = invokeWithErrorHandling(fn, null, args, instance, type)`
	`190`	`+ if (deep && res && res.__ob__) res.__ob__.dep.depend()`
	`191`	`+ return res`
	`192`	`+ }`
`190`	`193`
`191`	`194`	`let getter: () => any`
`192`	`195`	`let forceTrigger = false`
`@@ -209,6 +212,7 @@ function doWatch(`
`209`	`212`	`if (isRef(s)) {`
`210`	`213`	`return s.value`
`211`	`214`	`} else if (isReactive(s)) {`
	`215`	`+ s.__ob__.dep.depend()`
`212`	`216`	`return traverse(s)`
`213`	`217`	`} else if (isFunction(s)) {`
`214`	`218`	`return call(s, WATCHER_GETTER)`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1200,4 +1200,35 @@ describe('api: watch', () => {`
`1200`	`1200`	`expect(parentSpy).toHaveBeenCalledTimes(1)`
`1201`	`1201`	`expect(childSpy).toHaveBeenCalledTimes(1)`
`1202`	`1202`	`})`
	`1203`	`+`
	`1204`	`+ // #12967`
	`1205`	`+ test('trigger when adding new property with Vue.set (getter)', async () => {`
	`1206`	`+ const spy = vi.fn()`
	`1207`	`+ const r = reactive({ exist: 5 })`
	`1208`	`+ watch(() => r, spy, { deep: true })`
	`1209`	`+ set(r, 'add', 1)`
	`1210`	`+`
	`1211`	`+ await nextTick()`
	`1212`	`+ expect(spy).toHaveBeenCalledTimes(1)`
	`1213`	`+ })`
	`1214`	`+`
	`1215`	`+ test('trigger when adding new property with Vue.set (getter in array source)', async () => {`
	`1216`	`+ const spy = vi.fn()`
	`1217`	`+ const r = reactive({ exist: 5 })`
	`1218`	`+ watch([() => r], spy, { deep: true })`
	`1219`	`+ set(r, 'add', 1)`
	`1220`	`+`
	`1221`	`+ await nextTick()`
	`1222`	`+ expect(spy).toHaveBeenCalledTimes(1)`
	`1223`	`+ })`
	`1224`	`+`
	`1225`	`+ test('trigger when adding new property with Vue.set (reactive in array source)', async () => {`
	`1226`	`+ const spy = vi.fn()`
	`1227`	`+ const r = reactive({ exist: 5 })`
	`1228`	`+ watch([r], spy, { deep: true })`
	`1229`	`+ set(r, 'add', 1)`
	`1230`	`+`
	`1231`	`+ await nextTick()`
	`1232`	`+ expect(spy).toHaveBeenCalledTimes(1)`
	`1233`	`+ })`
`1203`	`1234`	`})`

Comments

(0)