Skip to content

Commit a6182f5

Browse files
authored
Fix internal type error in useRoute types that surfaces when skipLibCheck is disabled (#14577)
1 parent 266dc7f commit a6182f5

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

.changeset/shiny-pans-admire.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Fix internal type error in useRoute types that surfaces when skipLibCheck is disabled

packages/react-router/lib/hooks.tsx

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,16 +1869,20 @@ type UseRouteResult<Args extends UseRouteArgs> =
18691869
Args extends [infer RouteId extends keyof RouteModules] ? UseRoute<RouteId> | undefined :
18701870
never;
18711871

1872+
// prettier-ignore
18721873
type UseRoute<RouteId extends keyof RouteModules | unknown> = {
1873-
handle: RouteId extends keyof RouteModules
1874-
? RouteModules[RouteId]["handle"]
1875-
: unknown;
1876-
loaderData: RouteId extends keyof RouteModules
1877-
? GetLoaderData<RouteModules[RouteId]> | undefined
1878-
: unknown;
1879-
actionData: RouteId extends keyof RouteModules
1880-
? GetActionData<RouteModules[RouteId]> | undefined
1881-
: unknown;
1874+
handle:
1875+
RouteId extends keyof RouteModules ?
1876+
RouteModules[RouteId] extends { handle: infer handle } ? handle :
1877+
unknown
1878+
:
1879+
unknown;
1880+
loaderData:
1881+
RouteId extends keyof RouteModules ? GetLoaderData<RouteModules[RouteId]> | undefined :
1882+
unknown;
1883+
actionData:
1884+
RouteId extends keyof RouteModules ? GetActionData<RouteModules[RouteId]> | undefined :
1885+
unknown;
18821886
};
18831887

18841888
export function useRoute<Args extends UseRouteArgs>(

0 commit comments

Comments
 (0)