theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(watch): should not leak this context to setup watch getters

Browse Source 
ref #3603
This commit is contained in:
Evan You
2021-05-25 11:10:11 -04:00
parent 9e3708ca75
commit 1526f94edf
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,9 +189,7 @@ function doWatch(
} else if (isReactive(s)) {
return traverse(s)
} else if (isFunction(s)) {
return callWithErrorHandling(s, instance, ErrorCodes.WATCH_GETTER, [
instance && (instance.proxy as any)
])
return callWithErrorHandling(s, instance, ErrorCodes.WATCH_GETTER)
} else {
__DEV__ && warnInvalidSource(s)
}
@@ -200,9 +198,7 @@ function doWatch(
if (cb) {
// getter with cb
getter = () =>
callWithErrorHandling(source, instance, ErrorCodes.WATCH_GETTER, [
instance && (instance.proxy as any)
])
callWithErrorHandling(source, instance, ErrorCodes.WATCH_GETTER)
} else {
// no cb -> simple effect
getter = () => {
@@ -371,7 +367,7 @@ export function instanceWatch(
? source.includes('.')
? createPathGetter(publicThis, source)
: () => publicThis[source]
: source.bind(publicThis)
: source.bind(publicThis, publicThis)
let cb
if (isFunction(value)) {
cb = value