wip: fix watch simple effect usage

This commit is contained in:
Evan You
2019-08-19 14:44:52 -04:00
parent 36ab2ab980
commit 145bf98840
2 changed files with 25 additions and 11 deletions

View File

@@ -77,9 +77,6 @@ function doWatch(
| null,
{ lazy, deep, flush, onTrack, onTrigger }: WatchOptions = EMPTY_OBJ
): StopHandle {
const scheduler =
flush === 'sync' ? invoke : flush === 'pre' ? queueJob : queuePostFlushCb
const baseGetter = isArray(source)
? () => source.map(s => (isRef(s) ? s.value : s()))
: isRef(source)
@@ -111,17 +108,24 @@ function doWatch(
}
: void 0
const scheduler =
flush === 'sync' ? invoke : flush === 'pre' ? queueJob : queuePostFlushCb
const runner = effect(getter, {
lazy: true,
// so it runs before component update effects in pre flush mode
computed: true,
onTrack,
onTrigger,
scheduler: applyCb ? () => scheduler(applyCb) : void 0
scheduler: applyCb ? () => scheduler(applyCb) : scheduler
})
if (!lazy) {
applyCb && scheduler(applyCb)
if (applyCb) {
scheduler(applyCb)
} else {
scheduler(runner)
}
} else {
oldValue = runner()
}