Skip to content

fix: update error handling in MatchInner to access error data directly #4746

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+169 −8
Open

fix: update error handling in MatchInner to access error data directly #4746

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f907711
fix(router): spread data props in notFoundComponent
leesb971204 Jul 22, 2025
a3bdffd
refactor(router-core): change proper NotFoundRouteProps type definition
leesb971204 Jul 22, 2025
35ec117
test(react-router): add test verify notFoundRouteProps properly passe…
leesb971204 Aug 2, 2025
0b6cccb
docs(react-router): correct type annotation for data in notFoundCompo…
leesb971204 Aug 2, 2025
2e28b59
refactor(router-core): enhance NotFoundRouteProps type with generics …
leesb971204 Aug 3, 2025
3f98c67
refactor(router-core): simplify NotFoundRouteProps type by removing g…
leesb971204 Aug 13, 2025
337c168
test(react-router): improve notFoundComponent tests with type guard f…
leesb971204 Aug 13, 2025
0fc4886
docs(router): revert type annotation for data in notFoundComponent
leesb971204 Aug 13, 2025
17e1384
docs(router): add NotFoundComponent documentation and update router A…
leesb971204 Aug 13, 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
4 changes: 2 additions & 2 deletions packages/react-router/src/renderRouteNotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function renderRouteNotFound(
) {
if (!route.options.notFoundComponent) {
if (router.options.defaultNotFoundComponent) {
return <router.options.defaultNotFoundComponent data={data} />
return <router.options.defaultNotFoundComponent {...data} />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part causes the structure to become nested like data: { data: ... }.

}

if (process.env.NODE_ENV === 'development') {
Expand All @@ -23,5 +23,5 @@ export function renderRouteNotFound(
return <DefaultGlobalNotFound />
}

return <route.options.notFoundComponent data={data} />
return <route.options.notFoundComponent {...data} />
}
5 changes: 1 addition & 4 deletions packages/router-core/src/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,10 +1322,7 @@ export type ErrorComponentProps<TError = Error> = {
info?: { componentStack: string }
reset: () => void
}
export type NotFoundRouteProps = {
// TODO: Make sure this is `| null | undefined` (this is for global not-founds)
data: unknown
}
export type NotFoundRouteProps = Partial<NotFoundError>

export class BaseRoute<
in out TParentRoute extends AnyRoute = AnyRoute,
Expand Down
4 changes: 2 additions & 2 deletions packages/solid-router/src/renderRouteNotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function renderRouteNotFound(
) {
if (!route.options.notFoundComponent) {
if (router.options.defaultNotFoundComponent) {
return <router.options.defaultNotFoundComponent data={data} />
return <router.options.defaultNotFoundComponent {...data} />
}

if (process.env.NODE_ENV === 'development') {
Expand All @@ -22,5 +22,5 @@ export function renderRouteNotFound(
return <DefaultGlobalNotFound />
}

return <route.options.notFoundComponent data={data} />
return <route.options.notFoundComponent {...data} />
}
Loading