Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(reactivity): trigger item directly instead of storing in an array first #11695

Merged
merged 8 commits into from
Sep 10, 2024
Merged

perf(reactivity): trigger item directly instead of storing in an array first #11695

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b355ad
fix(reactivity): handle a ref directly nested in reactive
edison1105 Aug 23, 2024
c03ec19
Revert "fix(reactivity): handle a ref directly nested in reactive"
edison1105 Aug 23, 2024
fc31326
Update dep.ts
zhangenming Aug 23, 2024
ea95b7f
Update dep.ts
zhangenming Aug 23, 2024
91960f8
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 23, 2024
c135fe4
Update dep.ts
zhangenming Aug 23, 2024
547248f
[autofix.ci] apply automated fixes
autofix-ci[bot] Aug 23, 2024
8eda1cc
Update dep.ts
yyx990803 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions packages/reactivity/src/dep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,29 @@ export function trigger(
return
}

let deps: Dep[] = []
const run = (dep: Dep | undefined) => {
if (dep) {
if (__DEV__) {
dep.trigger({
target,
type,
key,
newValue,
oldValue,
oldTarget,
})
} else {
dep.trigger()
}
}
}

startBatch()

if (type === TriggerOpTypes.CLEAR) {
// collection being cleared
// trigger all effects for target
deps = [...depsMap.values()]
depsMap.forEach(run)
} else {
const targetIsArray = isArray(target)
const isArrayIndex = targetIsArray && isIntegerKey(key)
Expand All @@ -267,67 +285,50 @@ export function trigger(
key === ARRAY_ITERATE_KEY ||
(!isSymbol(key) && key >= newLength)
) {
deps.push(dep)
run(dep)
}
})
} else {
const push = (dep: Dep | undefined) => dep && deps.push(dep)

// schedule runs for SET | ADD | DELETE
if (key !== void 0) {
push(depsMap.get(key))
run(depsMap.get(key))
}

// schedule ARRAY_ITERATE for any numeric key change (length is handled above)
if (isArrayIndex) {
push(depsMap.get(ARRAY_ITERATE_KEY))
run(depsMap.get(ARRAY_ITERATE_KEY))
}

// also run for iteration key on ADD | DELETE | Map.SET
switch (type) {
case TriggerOpTypes.ADD:
if (!targetIsArray) {
push(depsMap.get(ITERATE_KEY))
run(depsMap.get(ITERATE_KEY))
if (isMap(target)) {
push(depsMap.get(MAP_KEY_ITERATE_KEY))
run(depsMap.get(MAP_KEY_ITERATE_KEY))
}
} else if (isArrayIndex) {
// new index added to array -> length changes
push(depsMap.get('length'))
run(depsMap.get('length'))
}
break
case TriggerOpTypes.DELETE:
if (!targetIsArray) {
push(depsMap.get(ITERATE_KEY))
run(depsMap.get(ITERATE_KEY))
if (isMap(target)) {
push(depsMap.get(MAP_KEY_ITERATE_KEY))
run(depsMap.get(MAP_KEY_ITERATE_KEY))
}
}
break
case TriggerOpTypes.SET:
if (isMap(target)) {
push(depsMap.get(ITERATE_KEY))
run(depsMap.get(ITERATE_KEY))
}
break
}
}
}

startBatch()
for (const dep of deps) {
if (__DEV__) {
dep.trigger({
target,
type,
key,
newValue,
oldValue,
oldTarget,
})
} else {
dep.trigger()
}
}
endBatch()
}

Expand Down