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

fix(reactivity): ensure watcher with once: true are properly removed from effect scope (#11665)

This commit is contained in:
yangxiuxiu 2024-08-20 16:35:08 +08:00 committed by GitHub
parent f2ea25dc54
commit fbc0c42bcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/reactivity/src/watch.ts
View File

@ -206,18 +206,26 @@ export function watch(
getter = () => traverse(baseGetter(), depth)
}
const scope = getCurrentScope()
const watchHandle: WatchHandle = () => {
effect.stop()
if (scope) {
remove(scope.effects, effect)
}
}
if (once) {
if (cb) {
const _cb = cb
cb = (...args) => {
_cb(...args)
effect.stop()
watchHandle()
}
} else {
const _getter = getter
getter = () => {
_getter()
effect.stop()
watchHandle()
}
}
}
@ -317,14 +325,6 @@ export function watch(
effect.run()
}
const scope = getCurrentScope()
const watchHandle: WatchHandle = () => {
effect.stop()
if (scope) {
remove(scope.effects, effect)
}
}
watchHandle.pause = effect.pause.bind(effect)
watchHandle.resume = effect.resume.bind(effect)
watchHandle.stop = watchHandle

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

@ -1771,6 +1771,11 @@ describe('api: watch', () => {
expect(scope.effects.length).toBe(1)
unwatch!()
expect(scope.effects.length).toBe(0)
scope.run(() => {
watch(num, () => {}, { once: true, immediate: true })
})
expect(scope.effects.length).toBe(0)
})
// simplified case of VueUse syncRef