Skip to content

fix: pending component handling for initial load #4044

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 2 commits into from
Apr 24, 2025
Merged

fix: pending component handling for initial load #4044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38410d7
fix: pending component handling for initial load
schiller-manuel Apr 24, 2025
6022972
fix: solid scroll restoration
schiller-manuel Apr 24, 2025
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: 7 additions & 9 deletions packages/router-core/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,10 +2274,6 @@ export class RouterCore<
return !!(allPreload && !this.state.matches.find((d) => d.id === matchId))
}

if (!this.isServer && !this.state.matches.length) {
triggerOnReady()
}

const handleRedirectAndNotFound = (match: AnyRouteMatch, err: any) => {
if (isResolvedRedirect(err)) {
if (!err.reloadDocument) {
Expand Down Expand Up @@ -2383,7 +2379,9 @@ export class RouterCore<
onReady &&
!this.isServer &&
!resolvePreload(matchId) &&
(route.options.loader || route.options.beforeLoad) &&
(route.options.loader ||
route.options.beforeLoad ||
routeNeedsPreload(route)) &&
typeof pendingMs === 'number' &&
pendingMs !== Infinity &&
(route.options.pendingComponent ??
Expand Down Expand Up @@ -2668,6 +2666,10 @@ export class RouterCore<
loaderData,
})

// Last but not least, wait for the the components
// to be preloaded before we resolve the match
await route._componentsPromise

updateMatch(matchId, (prev) => ({
...prev,
error: undefined,
Expand Down Expand Up @@ -2710,10 +2712,6 @@ export class RouterCore<
router: this,
match: this.getMatch(matchId)!,
})

// Last but not least, wait for the the components
// to be preloaded before we resolve the match
await route._componentsPromise
} catch (err) {
updateMatch(matchId, (prev) => ({
...prev,
Expand Down
4 changes: 2 additions & 2 deletions packages/solid-router/src/Transitioner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ export function Transitioner() {
const previousIsPagePending = usePrevious(isPagePending)

if (!router.isServer) {
router.startTransition = (fn: () => void) => {
router.startTransition = async (fn: () => void | Promise<void>) => {
setIsTransitioning(true)
fn()
await fn()
setIsTransitioning(false)
}
}
Expand Down