Skip to content

fix(runtime-core): ensure suspense creates dep's setupEffect with correct optimized flag (fix #7688) #7689

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

Merged
merged 3 commits into from
May 31, 2024
Merged

fix(runtime-core): ensure suspense creates dep's setupEffect with correct optimized flag (fix #7688) #7689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb02d5
fix(runtime-core): ensure suspense creates dep's setupEffect with cor…
LinusBorg Feb 11, 2023
26e273f
refactor: drop default value for new `optimized` argument
LinusBorg Feb 12, 2023
15b23ff
Merge branch 'main' into linusborg/suspense-optimized-bug-7688
yyx990803 May 31, 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
3 changes: 2 additions & 1 deletion packages/runtime-core/src/components/Suspense.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ export interface SuspenseBoundary {
registerDep(
instance: ComponentInternalInstance,
setupRenderEffect: SetupRenderEffectFn,
optimized: boolean,
): void
unmount(parentSuspense: SuspenseBoundary | null, doRemove?: boolean): void
}
Expand Down Expand Up @@ -679,7 +680,7 @@ function createSuspenseBoundary(
return suspense.activeBranch && next(suspense.activeBranch)
},

registerDep(instance, setupRenderEffect) {
registerDep(instance, setupRenderEffect, optimized) {
const isInPendingSuspense = !!suspense.pendingBranch
if (isInPendingSuspense) {
suspense.deps++
Expand Down
3 changes: 2 additions & 1 deletion packages/runtime-core/src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,8 @@ function baseCreateRenderer(
// setup() is async. This component relies on async logic to be resolved
// before proceeding
if (__FEATURE_SUSPENSE__ && instance.asyncDep) {
parentSuspense && parentSuspense.registerDep(instance, setupRenderEffect)
parentSuspense &&
parentSuspense.registerDep(instance, setupRenderEffect, optimized)

// Give it a placeholder if this is not hydration
// TODO handle self-defined fallback
Expand Down