Skip to content

fix(react-router): do not wrap children in outlet in suspense unless (default)pendingComponent is configured #2035

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

Closed
schiller-manuel wants to merge 2 commits into from
Closed

fix(react-router): do not wrap children in outlet in suspense unless (default)pendingComponent is configured #2035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b494751
fix: prefer pendingComponent over defaultPendingComponent when wrappi…
schiller-manuel Jul 26, 2024
bc81168
do not wrap root outlet in suspense if neither pendingComponent nor d…
schiller-manuel Jul 27, 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
16 changes: 9 additions & 7 deletions packages/react-router/src/Match.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,16 @@ export const Outlet = React.memo(function OutletImpl() {

const nextMatch = <Match matchId={childMatchId} />

const pendingElement = router.options.defaultPendingComponent ? (
<router.options.defaultPendingComponent />
) : null

if (matchId === rootRouteId) {
return (
<React.Suspense fallback={pendingElement}>{nextMatch}</React.Suspense>
)
const PendingComponent =
route.options.pendingComponent ?? router.options.defaultPendingComponent
if (PendingComponent !== undefined) {
return (
<React.Suspense fallback={<PendingComponent />}>
{nextMatch}
</React.Suspense>
)
}
}

return nextMatch
Expand Down