@tanstack/react-router 1.7.1 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/CatchBoundary.cjs +106 -0
- package/dist/cjs/CatchBoundary.cjs.map +1 -0
- package/dist/cjs/Matches.cjs +278 -0
- package/dist/cjs/Matches.cjs.map +1 -0
- package/{build/cjs/RouterProvider.js → dist/cjs/RouterProvider.cjs} +55 -58
- package/dist/cjs/RouterProvider.cjs.map +1 -0
- package/dist/cjs/awaited.cjs +51 -0
- package/dist/cjs/awaited.cjs.map +1 -0
- package/dist/cjs/defer.cjs +30 -0
- package/dist/cjs/defer.cjs.map +1 -0
- package/dist/cjs/fileRoute.cjs +19 -0
- package/dist/cjs/fileRoute.cjs.map +1 -0
- package/dist/cjs/history.d.cts +7 -0
- package/{build/cjs/index.js → dist/cjs/index.cjs} +39 -51
- package/dist/cjs/index.cjs.map +1 -0
- package/dist/cjs/lazyRouteComponent.cjs +40 -0
- package/dist/cjs/lazyRouteComponent.cjs.map +1 -0
- package/dist/cjs/link.cjs +196 -0
- package/dist/cjs/link.cjs.map +1 -0
- package/dist/cjs/link.d.cts +85 -0
- package/{build/cjs/path.js → dist/cjs/path.cjs} +77 -94
- package/dist/cjs/path.cjs.map +1 -0
- package/dist/cjs/qss.cjs +45 -0
- package/dist/cjs/qss.cjs.map +1 -0
- package/dist/cjs/redirects.cjs +15 -0
- package/dist/cjs/redirects.cjs.map +1 -0
- package/dist/cjs/route.cjs +143 -0
- package/dist/cjs/route.cjs.map +1 -0
- package/dist/cjs/router.cjs +1070 -0
- package/dist/cjs/router.cjs.map +1 -0
- package/dist/cjs/routerContext.cjs +29 -0
- package/dist/cjs/routerContext.cjs.map +1 -0
- package/{build/cjs/scroll-restoration.js → dist/cjs/scroll-restoration.cjs} +58 -75
- package/dist/cjs/scroll-restoration.cjs.map +1 -0
- package/{build/cjs/searchParams.js → dist/cjs/searchParams.cjs} +18 -36
- package/dist/cjs/searchParams.cjs.map +1 -0
- package/dist/cjs/useBlocker.cjs +36 -0
- package/dist/cjs/useBlocker.cjs.map +1 -0
- package/dist/cjs/useNavigate.cjs +55 -0
- package/dist/cjs/useNavigate.cjs.map +1 -0
- package/dist/cjs/useParams.cjs +16 -0
- package/dist/cjs/useParams.cjs.map +1 -0
- package/dist/cjs/useRouteContext.cjs +11 -0
- package/dist/cjs/useRouteContext.cjs.map +1 -0
- package/dist/cjs/useRouter.cjs +33 -0
- package/dist/cjs/useRouter.cjs.map +1 -0
- package/dist/cjs/useRouterState.cjs +12 -0
- package/dist/cjs/useRouterState.cjs.map +1 -0
- package/dist/cjs/useSearch.cjs +13 -0
- package/dist/cjs/useSearch.cjs.map +1 -0
- package/{build/cjs/utils.js → dist/cjs/utils.cjs} +25 -116
- package/dist/cjs/utils.cjs.map +1 -0
- package/dist/esm/CatchBoundary.d.ts +36 -0
- package/dist/esm/CatchBoundary.js +89 -0
- package/dist/esm/CatchBoundary.js.map +1 -0
- package/dist/esm/Matches.d.ts +71 -0
- package/dist/esm/Matches.js +261 -0
- package/{build/cjs → dist/esm}/Matches.js.map +1 -1
- package/dist/esm/RouterProvider.d.ts +27 -0
- package/dist/esm/RouterProvider.js +136 -0
- package/{build/cjs → dist/esm}/RouterProvider.js.map +1 -1
- package/dist/esm/awaited.d.ts +9 -0
- package/dist/esm/awaited.js +51 -0
- package/dist/esm/awaited.js.map +1 -0
- package/dist/esm/defer.d.ts +22 -0
- package/dist/esm/defer.js +30 -0
- package/{build/cjs → dist/esm}/defer.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +21 -0
- package/dist/esm/fileRoute.js +19 -0
- package/dist/esm/fileRoute.js.map +1 -0
- package/{build/types → dist/esm}/history.d.ts +1 -1
- package/dist/esm/index.d.ts +30 -0
- package/dist/esm/index.js +118 -0
- package/dist/esm/index.js.map +1 -0
- package/dist/esm/lazyRouteComponent.d.ts +2 -0
- package/dist/esm/lazyRouteComponent.js +23 -0
- package/{build/cjs → dist/esm}/lazyRouteComponent.js.map +1 -1
- package/{build/types → dist/esm}/link.d.ts +3 -1
- package/dist/esm/link.js +179 -0
- package/dist/esm/link.js.map +1 -0
- package/dist/esm/location.d.ts +12 -0
- package/dist/esm/path.d.ts +17 -0
- package/dist/esm/path.js +200 -0
- package/dist/esm/path.js.map +1 -0
- package/dist/esm/qss.d.ts +2 -0
- package/dist/esm/qss.js +45 -0
- package/dist/esm/qss.js.map +1 -0
- package/dist/esm/redirects.d.ts +11 -0
- package/dist/esm/redirects.js +15 -0
- package/{build/cjs → dist/esm}/redirects.js.map +1 -1
- package/dist/esm/route.d.ts +300 -0
- package/dist/esm/route.js +143 -0
- package/dist/esm/route.js.map +1 -0
- package/dist/esm/routeInfo.d.ts +31 -0
- package/dist/esm/router.d.ts +201 -0
- package/dist/esm/router.js +1070 -0
- package/{build/cjs → dist/esm}/router.js.map +1 -1
- package/dist/esm/routerContext.d.ts +3 -0
- package/dist/esm/routerContext.js +13 -0
- package/{build/cjs → dist/esm}/routerContext.js.map +1 -1
- package/dist/esm/scroll-restoration.d.ts +18 -0
- package/dist/esm/scroll-restoration.js +168 -0
- package/dist/esm/scroll-restoration.js.map +1 -0
- package/dist/esm/searchParams.d.ts +7 -0
- package/dist/esm/searchParams.js +63 -0
- package/{build/cjs → dist/esm}/searchParams.js.map +1 -1
- package/dist/esm/useBlocker.d.ts +9 -0
- package/dist/esm/useBlocker.js +19 -0
- package/{build/cjs → dist/esm}/useBlocker.js.map +1 -1
- package/dist/esm/useNavigate.d.ts +20 -0
- package/dist/esm/useNavigate.js +38 -0
- package/{build/cjs → dist/esm}/useNavigate.js.map +1 -1
- package/dist/esm/useParams.d.ts +7 -0
- package/dist/esm/useParams.js +16 -0
- package/{build/cjs → dist/esm}/useParams.js.map +1 -1
- package/dist/esm/useRouteContext.d.ts +7 -0
- package/dist/esm/useRouteContext.js +11 -0
- package/{build/cjs → dist/esm}/useRouteContext.js.map +1 -1
- package/dist/esm/useRouter.d.ts +5 -0
- package/dist/esm/useRouter.js +16 -0
- package/{build/cjs → dist/esm}/useRouter.js.map +1 -1
- package/dist/esm/useRouterState.d.ts +6 -0
- package/dist/esm/useRouterState.js +12 -0
- package/{build/cjs → dist/esm}/useRouterState.js.map +1 -1
- package/dist/esm/useSearch.d.ts +7 -0
- package/dist/esm/useSearch.js +13 -0
- package/dist/esm/useSearch.js.map +1 -0
- package/dist/esm/utils.d.ts +46 -0
- package/dist/esm/utils.js +137 -0
- package/{build/cjs → dist/esm}/utils.js.map +1 -1
- package/package.json +43 -22
- package/src/fileRoute.ts +4 -5
- package/src/link.tsx +5 -4
- package/src/route.ts +5 -6
- package/src/useSearch.tsx +5 -2
- package/build/cjs/CatchBoundary.js +0 -128
- package/build/cjs/CatchBoundary.js.map +0 -1
- package/build/cjs/Matches.js +0 -260
- package/build/cjs/_virtual/_rollupPluginBabelHelpers.js +0 -29
- package/build/cjs/_virtual/_rollupPluginBabelHelpers.js.map +0 -1
- package/build/cjs/awaited.js +0 -60
- package/build/cjs/awaited.js.map +0 -1
- package/build/cjs/defer.js +0 -42
- package/build/cjs/fileRoute.js +0 -31
- package/build/cjs/fileRoute.js.map +0 -1
- package/build/cjs/index.js.map +0 -1
- package/build/cjs/lazyRouteComponent.js +0 -54
- package/build/cjs/link.js +0 -224
- package/build/cjs/link.js.map +0 -1
- package/build/cjs/path.js.map +0 -1
- package/build/cjs/qss.js +0 -63
- package/build/cjs/qss.js.map +0 -1
- package/build/cjs/redirects.js +0 -28
- package/build/cjs/route.js +0 -292
- package/build/cjs/route.js.map +0 -1
- package/build/cjs/router.js +0 -1116
- package/build/cjs/routerContext.js +0 -42
- package/build/cjs/scroll-restoration.js.map +0 -1
- package/build/cjs/useBlocker.js +0 -55
- package/build/cjs/useNavigate.js +0 -88
- package/build/cjs/useParams.js +0 -27
- package/build/cjs/useRouteContext.js +0 -23
- package/build/cjs/useRouter.js +0 -44
- package/build/cjs/useRouterState.js +0 -24
- package/build/cjs/useSearch.js +0 -25
- package/build/cjs/useSearch.js.map +0 -1
- package/build/esm/index.js +0 -2874
- package/build/esm/index.js.map +0 -1
- package/build/stats-html.html +0 -4838
- package/build/stats-react.json +0 -1471
- package/build/umd/index.development.js +0 -3573
- package/build/umd/index.development.js.map +0 -1
- package/build/umd/index.production.js +0 -22
- package/build/umd/index.production.js.map +0 -1
- /package/{build/types/CatchBoundary.d.ts → dist/cjs/CatchBoundary.d.cts} +0 -0
- /package/{build/types/Matches.d.ts → dist/cjs/Matches.d.cts} +0 -0
- /package/{build/types/RouterProvider.d.ts → dist/cjs/RouterProvider.d.cts} +0 -0
- /package/{build/types/awaited.d.ts → dist/cjs/awaited.d.cts} +0 -0
- /package/{build/types/defer.d.ts → dist/cjs/defer.d.cts} +0 -0
- /package/{build/types/fileRoute.d.ts → dist/cjs/fileRoute.d.cts} +0 -0
- /package/{build/types/index.d.ts → dist/cjs/index.d.cts} +0 -0
- /package/{build/types/lazyRouteComponent.d.ts → dist/cjs/lazyRouteComponent.d.cts} +0 -0
- /package/{build/types/location.d.ts → dist/cjs/location.d.cts} +0 -0
- /package/{build/types/path.d.ts → dist/cjs/path.d.cts} +0 -0
- /package/{build/types/qss.d.ts → dist/cjs/qss.d.cts} +0 -0
- /package/{build/types/redirects.d.ts → dist/cjs/redirects.d.cts} +0 -0
- /package/{build/types/route.d.ts → dist/cjs/route.d.cts} +0 -0
- /package/{build/types/routeInfo.d.ts → dist/cjs/routeInfo.d.cts} +0 -0
- /package/{build/types/router.d.ts → dist/cjs/router.d.cts} +0 -0
- /package/{build/types/routerContext.d.ts → dist/cjs/routerContext.d.cts} +0 -0
- /package/{build/types/scroll-restoration.d.ts → dist/cjs/scroll-restoration.d.cts} +0 -0
- /package/{build/types/searchParams.d.ts → dist/cjs/searchParams.d.cts} +0 -0
- /package/{build/types/useBlocker.d.ts → dist/cjs/useBlocker.d.cts} +0 -0
- /package/{build/types/useNavigate.d.ts → dist/cjs/useNavigate.d.cts} +0 -0
- /package/{build/types/useParams.d.ts → dist/cjs/useParams.d.cts} +0 -0
- /package/{build/types/useRouteContext.d.ts → dist/cjs/useRouteContext.d.cts} +0 -0
- /package/{build/types/useRouter.d.ts → dist/cjs/useRouter.d.cts} +0 -0
- /package/{build/types/useRouterState.d.ts → dist/cjs/useRouterState.d.cts} +0 -0
- /package/{build/types/useSearch.d.ts → dist/cjs/useSearch.d.cts} +0 -0
- /package/{build/types/utils.d.ts → dist/cjs/utils.d.cts} +0 -0
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
import { jsx, Fragment } from "react/jsx-runtime";
|
|
2
|
+
import * as React from "react";
|
|
3
|
+
import invariant from "tiny-invariant";
|
|
4
|
+
import warning from "tiny-warning";
|
|
5
|
+
import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
|
|
6
|
+
import { useRouterState } from "./useRouterState.js";
|
|
7
|
+
import { useRouter } from "./useRouter.js";
|
|
8
|
+
import { pick } from "./utils.js";
|
|
9
|
+
const matchContext = React.createContext(void 0);
|
|
10
|
+
function Matches() {
|
|
11
|
+
const router = useRouter();
|
|
12
|
+
const matchId = useRouterState({
|
|
13
|
+
select: (s) => {
|
|
14
|
+
var _a;
|
|
15
|
+
return (_a = getRenderedMatches(s)[0]) == null ? void 0 : _a.id;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
return /* @__PURE__ */ jsx(matchContext.Provider, { value: matchId, children: /* @__PURE__ */ jsx(
|
|
19
|
+
CatchBoundary,
|
|
20
|
+
{
|
|
21
|
+
getResetKey: () => {
|
|
22
|
+
var _a;
|
|
23
|
+
return (_a = router.state.resolvedLocation.state) == null ? void 0 : _a.key;
|
|
24
|
+
},
|
|
25
|
+
errorComponent: ErrorComponent,
|
|
26
|
+
onCatch: () => {
|
|
27
|
+
warning(
|
|
28
|
+
false,
|
|
29
|
+
`Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`
|
|
30
|
+
);
|
|
31
|
+
},
|
|
32
|
+
children: matchId ? /* @__PURE__ */ jsx(Match, { matchId }) : null
|
|
33
|
+
}
|
|
34
|
+
) });
|
|
35
|
+
}
|
|
36
|
+
function SafeFragment(props) {
|
|
37
|
+
return /* @__PURE__ */ jsx(Fragment, { children: props.children });
|
|
38
|
+
}
|
|
39
|
+
function Match({ matchId }) {
|
|
40
|
+
var _a, _b, _c;
|
|
41
|
+
const router = useRouter();
|
|
42
|
+
const routeId = useRouterState({
|
|
43
|
+
select: (s) => {
|
|
44
|
+
var _a2;
|
|
45
|
+
return (_a2 = getRenderedMatches(s).find((d) => d.id === matchId)) == null ? void 0 : _a2.routeId;
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
invariant(
|
|
49
|
+
routeId,
|
|
50
|
+
`Could not find routeId for matchId "${matchId}". Please file an issue!`
|
|
51
|
+
);
|
|
52
|
+
const route = router.routesById[routeId];
|
|
53
|
+
const PendingComponent = route.options.pendingComponent ?? router.options.defaultPendingComponent;
|
|
54
|
+
const pendingElement = PendingComponent ? /* @__PURE__ */ jsx(PendingComponent, {}) : null;
|
|
55
|
+
const routeErrorComponent = route.options.errorComponent ?? router.options.defaultErrorComponent ?? ErrorComponent;
|
|
56
|
+
const ResolvedSuspenseBoundary = route.options.wrapInSuspense ?? PendingComponent ?? ((_a = route.options.component) == null ? void 0 : _a.preload) ?? ((_b = route.options.pendingComponent) == null ? void 0 : _b.preload) ?? ((_c = route.options.errorComponent) == null ? void 0 : _c.preload) ? React.Suspense : SafeFragment;
|
|
57
|
+
const ResolvedCatchBoundary = routeErrorComponent ? CatchBoundary : SafeFragment;
|
|
58
|
+
return /* @__PURE__ */ jsx(matchContext.Provider, { value: matchId, children: /* @__PURE__ */ jsx(ResolvedSuspenseBoundary, { fallback: pendingElement, children: /* @__PURE__ */ jsx(
|
|
59
|
+
ResolvedCatchBoundary,
|
|
60
|
+
{
|
|
61
|
+
getResetKey: () => {
|
|
62
|
+
var _a2;
|
|
63
|
+
return (_a2 = router.state.resolvedLocation.state) == null ? void 0 : _a2.key;
|
|
64
|
+
},
|
|
65
|
+
errorComponent: routeErrorComponent,
|
|
66
|
+
onCatch: () => {
|
|
67
|
+
warning(false, `Error in route match: ${matchId}`);
|
|
68
|
+
},
|
|
69
|
+
children: /* @__PURE__ */ jsx(MatchInner, { matchId, pendingElement })
|
|
70
|
+
}
|
|
71
|
+
) }) });
|
|
72
|
+
}
|
|
73
|
+
function MatchInner({
|
|
74
|
+
matchId,
|
|
75
|
+
pendingElement
|
|
76
|
+
}) {
|
|
77
|
+
var _a;
|
|
78
|
+
const router = useRouter();
|
|
79
|
+
const routeId = useRouterState({
|
|
80
|
+
select: (s) => {
|
|
81
|
+
var _a2;
|
|
82
|
+
return (_a2 = getRenderedMatches(s).find((d) => d.id === matchId)) == null ? void 0 : _a2.routeId;
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
const route = router.routesById[routeId];
|
|
86
|
+
const match = useRouterState({
|
|
87
|
+
select: (s) => pick(getRenderedMatches(s).find((d) => d.id === matchId), [
|
|
88
|
+
"status",
|
|
89
|
+
"error",
|
|
90
|
+
"showPending",
|
|
91
|
+
"loadPromise"
|
|
92
|
+
])
|
|
93
|
+
});
|
|
94
|
+
if (match.status === "error") {
|
|
95
|
+
if (isServerSideError(match.error)) {
|
|
96
|
+
const deserializeError = ((_a = router.options.errorSerializer) == null ? void 0 : _a.deserialize) ?? defaultDeserializeError;
|
|
97
|
+
throw deserializeError(match.error.data);
|
|
98
|
+
} else {
|
|
99
|
+
throw match.error;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (match.status === "pending") {
|
|
103
|
+
if (match.showPending) {
|
|
104
|
+
return pendingElement;
|
|
105
|
+
}
|
|
106
|
+
throw match.loadPromise;
|
|
107
|
+
}
|
|
108
|
+
if (match.status === "success") {
|
|
109
|
+
let Comp = route.options.component ?? router.options.defaultComponent;
|
|
110
|
+
if (Comp) {
|
|
111
|
+
return /* @__PURE__ */ jsx(Comp, {});
|
|
112
|
+
}
|
|
113
|
+
return /* @__PURE__ */ jsx(Outlet, {});
|
|
114
|
+
}
|
|
115
|
+
invariant(
|
|
116
|
+
false,
|
|
117
|
+
"Idle routeMatch status encountered during rendering! You should never see this. File an issue!"
|
|
118
|
+
);
|
|
119
|
+
}
|
|
120
|
+
const Outlet = React.memo(function Outlet2() {
|
|
121
|
+
const matchId = React.useContext(matchContext);
|
|
122
|
+
const childMatchId = useRouterState({
|
|
123
|
+
select: (s) => {
|
|
124
|
+
var _a;
|
|
125
|
+
const matches = getRenderedMatches(s);
|
|
126
|
+
const index = matches.findIndex((d) => d.id === matchId);
|
|
127
|
+
return (_a = matches[index + 1]) == null ? void 0 : _a.id;
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
if (!childMatchId) {
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
return /* @__PURE__ */ jsx(Match, { matchId: childMatchId });
|
|
134
|
+
});
|
|
135
|
+
function useMatchRoute() {
|
|
136
|
+
useRouterState({ select: (s) => [s.location, s.resolvedLocation] });
|
|
137
|
+
const { matchRoute } = useRouter();
|
|
138
|
+
return React.useCallback(
|
|
139
|
+
(opts) => {
|
|
140
|
+
const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts;
|
|
141
|
+
return matchRoute(rest, {
|
|
142
|
+
pending,
|
|
143
|
+
caseSensitive,
|
|
144
|
+
fuzzy,
|
|
145
|
+
includeSearch
|
|
146
|
+
});
|
|
147
|
+
},
|
|
148
|
+
[]
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
function MatchRoute(props) {
|
|
152
|
+
const matchRoute = useMatchRoute();
|
|
153
|
+
const params = matchRoute(props);
|
|
154
|
+
if (typeof props.children === "function") {
|
|
155
|
+
return props.children(params);
|
|
156
|
+
}
|
|
157
|
+
return !!params ? props.children : null;
|
|
158
|
+
}
|
|
159
|
+
function getRenderedMatches(state) {
|
|
160
|
+
var _a;
|
|
161
|
+
return ((_a = state.pendingMatches) == null ? void 0 : _a.some((d) => d.showPending)) ? state.pendingMatches : state.matches;
|
|
162
|
+
}
|
|
163
|
+
function useMatch(opts) {
|
|
164
|
+
var _a;
|
|
165
|
+
const router = useRouter();
|
|
166
|
+
const nearestMatchId = React.useContext(matchContext);
|
|
167
|
+
const nearestMatchRouteId = (_a = getRenderedMatches(router.state).find(
|
|
168
|
+
(d) => d.id === nearestMatchId
|
|
169
|
+
)) == null ? void 0 : _a.routeId;
|
|
170
|
+
const matchRouteId = (() => {
|
|
171
|
+
const matches = getRenderedMatches(router.state);
|
|
172
|
+
const match = (opts == null ? void 0 : opts.from) ? matches.find((d) => d.routeId === (opts == null ? void 0 : opts.from)) : matches.find((d) => d.id === nearestMatchId);
|
|
173
|
+
return match.routeId;
|
|
174
|
+
})();
|
|
175
|
+
if ((opts == null ? void 0 : opts.strict) ?? true) {
|
|
176
|
+
invariant(
|
|
177
|
+
nearestMatchRouteId == matchRouteId,
|
|
178
|
+
`useMatch("${matchRouteId}") is being called in a component that is meant to render the '${nearestMatchRouteId}' route. Did you mean to 'useMatch("${matchRouteId}", { strict: false })' or 'useRoute("${matchRouteId}")' instead?`
|
|
179
|
+
);
|
|
180
|
+
}
|
|
181
|
+
const matchSelection = useRouterState({
|
|
182
|
+
select: (state) => {
|
|
183
|
+
const match = getRenderedMatches(state).find(
|
|
184
|
+
(d) => d.id === nearestMatchId
|
|
185
|
+
);
|
|
186
|
+
invariant(
|
|
187
|
+
match,
|
|
188
|
+
`Could not find ${(opts == null ? void 0 : opts.from) ? `an active match from "${opts.from}"` : "a nearest match!"}`
|
|
189
|
+
);
|
|
190
|
+
return (opts == null ? void 0 : opts.select) ? opts.select(match) : match;
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
return matchSelection;
|
|
194
|
+
}
|
|
195
|
+
function useMatches(opts) {
|
|
196
|
+
return useRouterState({
|
|
197
|
+
select: (state) => {
|
|
198
|
+
let matches = getRenderedMatches(state);
|
|
199
|
+
return (opts == null ? void 0 : opts.select) ? opts.select(matches) : matches;
|
|
200
|
+
}
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
function useParentMatches(opts) {
|
|
204
|
+
const contextMatchId = React.useContext(matchContext);
|
|
205
|
+
return useMatches({
|
|
206
|
+
select: (matches) => {
|
|
207
|
+
matches = matches.slice(matches.findIndex((d) => d.id === contextMatchId));
|
|
208
|
+
return (opts == null ? void 0 : opts.select) ? opts.select(matches) : matches;
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
function useLoaderDeps(opts) {
|
|
213
|
+
return useMatch({
|
|
214
|
+
...opts,
|
|
215
|
+
select: (s) => {
|
|
216
|
+
return typeof opts.select === "function" ? opts.select(s == null ? void 0 : s.loaderDeps) : s == null ? void 0 : s.loaderDeps;
|
|
217
|
+
}
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
function useLoaderData(opts) {
|
|
221
|
+
return useMatch({
|
|
222
|
+
...opts,
|
|
223
|
+
select: (s) => {
|
|
224
|
+
return typeof opts.select === "function" ? opts.select(s == null ? void 0 : s.loaderData) : s == null ? void 0 : s.loaderData;
|
|
225
|
+
}
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
function isServerSideError(error) {
|
|
229
|
+
if (!(typeof error === "object" && error && "data" in error))
|
|
230
|
+
return false;
|
|
231
|
+
if (!("__isServerError" in error && error.__isServerError))
|
|
232
|
+
return false;
|
|
233
|
+
if (!(typeof error.data === "object" && error.data))
|
|
234
|
+
return false;
|
|
235
|
+
return error.__isServerError === true;
|
|
236
|
+
}
|
|
237
|
+
function defaultDeserializeError(serializedData) {
|
|
238
|
+
if ("name" in serializedData && "message" in serializedData) {
|
|
239
|
+
const error = new Error(serializedData.message);
|
|
240
|
+
error.name = serializedData.name;
|
|
241
|
+
return error;
|
|
242
|
+
}
|
|
243
|
+
return serializedData.data;
|
|
244
|
+
}
|
|
245
|
+
export {
|
|
246
|
+
Match,
|
|
247
|
+
MatchRoute,
|
|
248
|
+
Matches,
|
|
249
|
+
Outlet,
|
|
250
|
+
defaultDeserializeError,
|
|
251
|
+
getRenderedMatches,
|
|
252
|
+
isServerSideError,
|
|
253
|
+
matchContext,
|
|
254
|
+
useLoaderData,
|
|
255
|
+
useLoaderDeps,
|
|
256
|
+
useMatch,
|
|
257
|
+
useMatchRoute,
|
|
258
|
+
useMatches,
|
|
259
|
+
useParentMatches
|
|
260
|
+
};
|
|
261
|
+
//# sourceMappingURL=Matches.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Matches.js","sources":["../../src/Matches.tsx"],"sourcesContent":["import * as React from 'react'\nimport invariant from 'tiny-invariant'\nimport warning from 'tiny-warning'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport { ResolveRelativePath, ToOptions } from './link'\nimport { AnyRoute, ReactNode, RootSearchSchema } from './route'\nimport {\n ParseRoute,\n RouteById,\n RouteByPath,\n RouteIds,\n RoutePaths,\n} from './routeInfo'\nimport { RegisteredRouter, RouterState } from './router'\nimport { NoInfer, StrictOrFrom, pick } from './utils'\n\nexport const matchContext = React.createContext<string | undefined>(undefined)\n\nexport interface RouteMatch<\n TRouteTree extends AnyRoute = AnyRoute,\n TRouteId extends RouteIds<TRouteTree> = ParseRoute<TRouteTree>['id'],\n> {\n id: string\n routeId: TRouteId\n pathname: string\n params: RouteById<TRouteTree, TRouteId>['types']['allParams']\n status: 'pending' | 'success' | 'error'\n isFetching: boolean\n showPending: boolean\n error: unknown\n paramsError: unknown\n searchError: unknown\n updatedAt: number\n loadPromise?: Promise<void>\n loaderData?: RouteById<TRouteTree, TRouteId>['types']['loaderData']\n routeContext: RouteById<TRouteTree, TRouteId>['types']['routeContext']\n context: RouteById<TRouteTree, TRouteId>['types']['allContext']\n search: Exclude<\n RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema'],\n RootSearchSchema\n >\n fetchCount: number\n abortController: AbortController\n cause: 'preload' | 'enter' | 'stay'\n loaderDeps: RouteById<TRouteTree, TRouteId>['types']['loaderDeps']\n preload: boolean\n invalid: boolean\n pendingPromise?: Promise<void>\n}\n\nexport type AnyRouteMatch = RouteMatch<any, any>\n\nexport function Matches() {\n const router = useRouter()\n const matchId = useRouterState({\n select: (s) => {\n return getRenderedMatches(s)[0]?.id\n },\n })\n\n return (\n <matchContext.Provider value={matchId}>\n <CatchBoundary\n getResetKey={() => router.state.resolvedLocation.state?.key}\n errorComponent={ErrorComponent}\n onCatch={() => {\n warning(\n false,\n `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,\n )\n }}\n >\n {matchId ? <Match matchId={matchId} /> : null}\n </CatchBoundary>\n </matchContext.Provider>\n )\n}\n\nfunction SafeFragment(props: any) {\n return <>{props.children}</>\n}\n\nexport function Match({ matchId }: { matchId: string }) {\n const router = useRouter()\n const routeId = useRouterState({\n select: (s) =>\n getRenderedMatches(s).find((d) => d.id === matchId)?.routeId as string,\n })\n\n invariant(\n routeId,\n `Could not find routeId for matchId \"${matchId}\". Please file an issue!`,\n )\n\n const route = router.routesById[routeId]!\n\n const PendingComponent = (route.options.pendingComponent ??\n router.options.defaultPendingComponent) as any\n\n const pendingElement = PendingComponent ? <PendingComponent /> : null\n\n const routeErrorComponent =\n route.options.errorComponent ??\n router.options.defaultErrorComponent ??\n ErrorComponent\n\n const ResolvedSuspenseBoundary =\n route.options.wrapInSuspense ??\n PendingComponent ??\n route.options.component?.preload ??\n route.options.pendingComponent?.preload ??\n (route.options.errorComponent as any)?.preload\n ? React.Suspense\n : SafeFragment\n\n const ResolvedCatchBoundary = routeErrorComponent\n ? CatchBoundary\n : SafeFragment\n\n return (\n <matchContext.Provider value={matchId}>\n <ResolvedSuspenseBoundary fallback={pendingElement}>\n <ResolvedCatchBoundary\n getResetKey={() => router.state.resolvedLocation.state?.key}\n errorComponent={routeErrorComponent}\n onCatch={() => {\n warning(false, `Error in route match: ${matchId}`)\n }}\n >\n <MatchInner matchId={matchId!} pendingElement={pendingElement} />\n </ResolvedCatchBoundary>\n </ResolvedSuspenseBoundary>\n </matchContext.Provider>\n )\n}\n\nfunction MatchInner({\n matchId,\n pendingElement,\n}: {\n matchId: string\n pendingElement: any\n}): any {\n const router = useRouter()\n const routeId = useRouterState({\n select: (s) =>\n getRenderedMatches(s).find((d) => d.id === matchId)?.routeId as string,\n })\n\n const route = router.routesById[routeId]!\n\n const match = useRouterState({\n select: (s) =>\n pick(getRenderedMatches(s).find((d) => d.id === matchId)!, [\n 'status',\n 'error',\n 'showPending',\n 'loadPromise',\n ]),\n })\n\n if (match.status === 'error') {\n if (isServerSideError(match.error)) {\n const deserializeError =\n router.options.errorSerializer?.deserialize ?? defaultDeserializeError\n throw deserializeError(match.error.data)\n } else {\n throw match.error\n }\n }\n\n if (match.status === 'pending') {\n if (match.showPending) {\n return pendingElement\n }\n throw match.loadPromise\n }\n\n if (match.status === 'success') {\n let Comp = route.options.component ?? router.options.defaultComponent\n\n if (Comp) {\n return <Comp />\n }\n\n return <Outlet />\n }\n\n invariant(\n false,\n 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',\n )\n}\n\nexport const Outlet = React.memo(function Outlet() {\n const matchId = React.useContext(matchContext)\n\n const childMatchId = useRouterState({\n select: (s) => {\n const matches = getRenderedMatches(s)\n const index = matches.findIndex((d) => d.id === matchId)\n return matches[index + 1]?.id\n },\n })\n\n if (!childMatchId) {\n return null\n }\n\n return <Match matchId={childMatchId} />\n})\n\nexport interface MatchRouteOptions {\n pending?: boolean\n caseSensitive?: boolean\n includeSearch?: boolean\n fuzzy?: boolean\n}\n\nexport type UseMatchRouteOptions<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n> = ToOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & MatchRouteOptions\n\nexport function useMatchRoute<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n>() {\n useRouterState({ select: (s) => [s.location, s.resolvedLocation] })\n const { matchRoute } = useRouter()\n\n return React.useCallback(\n <\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n TResolved extends string = ResolveRelativePath<TFrom, NoInfer<TTo>>,\n >(\n opts: UseMatchRouteOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n ): false | RouteById<TRouteTree, TResolved>['types']['allParams'] => {\n const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n return matchRoute(rest as any, {\n pending,\n caseSensitive,\n fuzzy,\n includeSearch,\n })\n },\n [],\n )\n}\n\nexport type MakeMatchRouteOptions<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n> = ToOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> &\n MatchRouteOptions & {\n // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n children?:\n | ((\n params?: RouteByPath<\n TRouteTree,\n ResolveRelativePath<TFrom, NoInfer<TTo>>\n >['types']['allParams'],\n ) => ReactNode)\n | React.ReactNode\n }\n\nexport function MatchRoute<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n>(\n props: MakeMatchRouteOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n): any {\n const matchRoute = useMatchRoute()\n const params = matchRoute(props as any)\n\n if (typeof props.children === 'function') {\n return (props.children as any)(params)\n }\n\n return !!params ? props.children : null\n}\n\nexport function getRenderedMatches(state: RouterState) {\n return state.pendingMatches?.some((d) => d.showPending)\n ? state.pendingMatches\n : state.matches\n}\n\nexport function useMatch<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatchState = RouteMatch<TRouteTree, TFrom>,\n TSelected = TRouteMatchState,\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatchState) => TSelected\n },\n): TSelected {\n const router = useRouter()\n const nearestMatchId = React.useContext(matchContext)\n\n const nearestMatchRouteId = getRenderedMatches(router.state).find(\n (d) => d.id === nearestMatchId,\n )?.routeId\n\n const matchRouteId = (() => {\n const matches = getRenderedMatches(router.state)\n const match = opts?.from\n ? matches.find((d) => d.routeId === opts?.from)\n : matches.find((d) => d.id === nearestMatchId)\n return match!.routeId\n })()\n\n if (opts?.strict ?? true) {\n invariant(\n nearestMatchRouteId == matchRouteId,\n `useMatch(\"${\n matchRouteId as string\n }\") is being called in a component that is meant to render the '${nearestMatchRouteId}' route. Did you mean to 'useMatch(\"${\n matchRouteId as string\n }\", { strict: false })' or 'useRoute(\"${\n matchRouteId as string\n }\")' instead?`,\n )\n }\n\n const matchSelection = useRouterState({\n select: (state) => {\n const match = getRenderedMatches(state).find(\n (d) => d.id === nearestMatchId,\n )\n\n invariant(\n match,\n `Could not find ${\n opts?.from\n ? `an active match from \"${opts.from}\"`\n : 'a nearest match!'\n }`,\n )\n\n return opts?.select ? opts.select(match as any) : match\n },\n })\n\n return matchSelection as any\n}\n\nexport function useMatches<T = RouteMatch[]>(opts?: {\n select?: (matches: RouteMatch[]) => T\n}): T {\n return useRouterState({\n select: (state) => {\n let matches = getRenderedMatches(state)\n return opts?.select ? opts.select(matches) : (matches as T)\n },\n })\n}\n\nexport function useParentMatches<T = RouteMatch[]>(opts?: {\n select?: (matches: RouteMatch[]) => T\n}): T {\n const contextMatchId = React.useContext(matchContext)\n\n return useMatches({\n select: (matches) => {\n matches = matches.slice(matches.findIndex((d) => d.id === contextMatchId))\n return opts?.select ? opts.select(matches) : (matches as T)\n },\n })\n}\n\nexport function useLoaderDeps<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<\n TRouteTree,\n TFrom\n >,\n TSelected = Required<TRouteMatch>['loaderDeps'],\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatch) => TSelected\n },\n): TSelected {\n return useMatch({\n ...opts,\n select: (s) => {\n return typeof opts.select === 'function'\n ? opts.select(s?.loaderDeps)\n : s?.loaderDeps\n },\n })\n}\n\nexport function useLoaderData<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<\n TRouteTree,\n TFrom\n >,\n TSelected = Required<TRouteMatch>['loaderData'],\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatch) => TSelected\n },\n): TSelected {\n return useMatch({\n ...opts,\n select: (s) => {\n return typeof opts.select === 'function'\n ? opts.select(s?.loaderData)\n : s?.loaderData\n },\n })\n}\n\nexport function isServerSideError(error: unknown): error is {\n __isServerError: true\n data: Record<string, any>\n} {\n if (!(typeof error === 'object' && error && 'data' in error)) return false\n if (!('__isServerError' in error && error.__isServerError)) return false\n if (!(typeof error.data === 'object' && error.data)) return false\n\n return error.__isServerError === true\n}\n\nexport function defaultDeserializeError(serializedData: Record<string, any>) {\n if ('name' in serializedData && 'message' in serializedData) {\n const error = new Error(serializedData.message)\n error.name = serializedData.name\n return error\n }\n\n return serializedData.data\n}\n"],"names":["matchContext","React","createContext","undefined","Matches","router","useRouter","matchId","useRouterState","select","s","getRenderedMatches","id","createElement","Provider","value","CatchBoundary","getResetKey","state","resolvedLocation","key","errorComponent","ErrorComponent","onCatch","warning","Match","SafeFragment","props","Fragment","children","routeId","find","d","invariant","route","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","pendingElement","routeErrorComponent","defaultErrorComponent","ResolvedSuspenseBoundary","wrapInSuspense","component","preload","Suspense","ResolvedCatchBoundary","fallback","MatchInner","match","pick","status","isServerSideError","error","deserializeError","errorSerializer","deserialize","defaultDeserializeError","data","showPending","loadPromise","Comp","defaultComponent","Outlet","memo","useContext","childMatchId","matches","index","findIndex","useMatchRoute","location","matchRoute","useCallback","opts","pending","caseSensitive","fuzzy","includeSearch","rest","MatchRoute","params","pendingMatches","some","useMatch","nearestMatchId","nearestMatchRouteId","matchRouteId","from","strict","matchSelection","useMatches","useParentMatches","contextMatchId","slice","useLoaderDeps","loaderDeps","useLoaderData","loaderData","__isServerError","serializedData","Error","message","name"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Matches.js","sources":["../../src/Matches.tsx"],"sourcesContent":["import * as React from 'react'\nimport invariant from 'tiny-invariant'\nimport warning from 'tiny-warning'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport { ResolveRelativePath, ToOptions } from './link'\nimport { AnyRoute, ReactNode, RootSearchSchema } from './route'\nimport {\n ParseRoute,\n RouteById,\n RouteByPath,\n RouteIds,\n RoutePaths,\n} from './routeInfo'\nimport { RegisteredRouter, RouterState } from './router'\nimport { NoInfer, StrictOrFrom, pick } from './utils'\n\nexport const matchContext = React.createContext<string | undefined>(undefined)\n\nexport interface RouteMatch<\n TRouteTree extends AnyRoute = AnyRoute,\n TRouteId extends RouteIds<TRouteTree> = ParseRoute<TRouteTree>['id'],\n> {\n id: string\n routeId: TRouteId\n pathname: string\n params: RouteById<TRouteTree, TRouteId>['types']['allParams']\n status: 'pending' | 'success' | 'error'\n isFetching: boolean\n showPending: boolean\n error: unknown\n paramsError: unknown\n searchError: unknown\n updatedAt: number\n loadPromise?: Promise<void>\n loaderData?: RouteById<TRouteTree, TRouteId>['types']['loaderData']\n routeContext: RouteById<TRouteTree, TRouteId>['types']['routeContext']\n context: RouteById<TRouteTree, TRouteId>['types']['allContext']\n search: Exclude<\n RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema'],\n RootSearchSchema\n >\n fetchCount: number\n abortController: AbortController\n cause: 'preload' | 'enter' | 'stay'\n loaderDeps: RouteById<TRouteTree, TRouteId>['types']['loaderDeps']\n preload: boolean\n invalid: boolean\n pendingPromise?: Promise<void>\n}\n\nexport type AnyRouteMatch = RouteMatch<any, any>\n\nexport function Matches() {\n const router = useRouter()\n const matchId = useRouterState({\n select: (s) => {\n return getRenderedMatches(s)[0]?.id\n },\n })\n\n return (\n <matchContext.Provider value={matchId}>\n <CatchBoundary\n getResetKey={() => router.state.resolvedLocation.state?.key}\n errorComponent={ErrorComponent}\n onCatch={() => {\n warning(\n false,\n `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,\n )\n }}\n >\n {matchId ? <Match matchId={matchId} /> : null}\n </CatchBoundary>\n </matchContext.Provider>\n )\n}\n\nfunction SafeFragment(props: any) {\n return <>{props.children}</>\n}\n\nexport function Match({ matchId }: { matchId: string }) {\n const router = useRouter()\n const routeId = useRouterState({\n select: (s) =>\n getRenderedMatches(s).find((d) => d.id === matchId)?.routeId as string,\n })\n\n invariant(\n routeId,\n `Could not find routeId for matchId \"${matchId}\". Please file an issue!`,\n )\n\n const route = router.routesById[routeId]!\n\n const PendingComponent = (route.options.pendingComponent ??\n router.options.defaultPendingComponent) as any\n\n const pendingElement = PendingComponent ? <PendingComponent /> : null\n\n const routeErrorComponent =\n route.options.errorComponent ??\n router.options.defaultErrorComponent ??\n ErrorComponent\n\n const ResolvedSuspenseBoundary =\n route.options.wrapInSuspense ??\n PendingComponent ??\n route.options.component?.preload ??\n route.options.pendingComponent?.preload ??\n (route.options.errorComponent as any)?.preload\n ? React.Suspense\n : SafeFragment\n\n const ResolvedCatchBoundary = routeErrorComponent\n ? CatchBoundary\n : SafeFragment\n\n return (\n <matchContext.Provider value={matchId}>\n <ResolvedSuspenseBoundary fallback={pendingElement}>\n <ResolvedCatchBoundary\n getResetKey={() => router.state.resolvedLocation.state?.key}\n errorComponent={routeErrorComponent}\n onCatch={() => {\n warning(false, `Error in route match: ${matchId}`)\n }}\n >\n <MatchInner matchId={matchId!} pendingElement={pendingElement} />\n </ResolvedCatchBoundary>\n </ResolvedSuspenseBoundary>\n </matchContext.Provider>\n )\n}\n\nfunction MatchInner({\n matchId,\n pendingElement,\n}: {\n matchId: string\n pendingElement: any\n}): any {\n const router = useRouter()\n const routeId = useRouterState({\n select: (s) =>\n getRenderedMatches(s).find((d) => d.id === matchId)?.routeId as string,\n })\n\n const route = router.routesById[routeId]!\n\n const match = useRouterState({\n select: (s) =>\n pick(getRenderedMatches(s).find((d) => d.id === matchId)!, [\n 'status',\n 'error',\n 'showPending',\n 'loadPromise',\n ]),\n })\n\n if (match.status === 'error') {\n if (isServerSideError(match.error)) {\n const deserializeError =\n router.options.errorSerializer?.deserialize ?? defaultDeserializeError\n throw deserializeError(match.error.data)\n } else {\n throw match.error\n }\n }\n\n if (match.status === 'pending') {\n if (match.showPending) {\n return pendingElement\n }\n throw match.loadPromise\n }\n\n if (match.status === 'success') {\n let Comp = route.options.component ?? router.options.defaultComponent\n\n if (Comp) {\n return <Comp />\n }\n\n return <Outlet />\n }\n\n invariant(\n false,\n 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',\n )\n}\n\nexport const Outlet = React.memo(function Outlet() {\n const matchId = React.useContext(matchContext)\n\n const childMatchId = useRouterState({\n select: (s) => {\n const matches = getRenderedMatches(s)\n const index = matches.findIndex((d) => d.id === matchId)\n return matches[index + 1]?.id\n },\n })\n\n if (!childMatchId) {\n return null\n }\n\n return <Match matchId={childMatchId} />\n})\n\nexport interface MatchRouteOptions {\n pending?: boolean\n caseSensitive?: boolean\n includeSearch?: boolean\n fuzzy?: boolean\n}\n\nexport type UseMatchRouteOptions<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n> = ToOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & MatchRouteOptions\n\nexport function useMatchRoute<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n>() {\n useRouterState({ select: (s) => [s.location, s.resolvedLocation] })\n const { matchRoute } = useRouter()\n\n return React.useCallback(\n <\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n TResolved extends string = ResolveRelativePath<TFrom, NoInfer<TTo>>,\n >(\n opts: UseMatchRouteOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n ): false | RouteById<TRouteTree, TResolved>['types']['allParams'] => {\n const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n return matchRoute(rest as any, {\n pending,\n caseSensitive,\n fuzzy,\n includeSearch,\n })\n },\n [],\n )\n}\n\nexport type MakeMatchRouteOptions<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n> = ToOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> &\n MatchRouteOptions & {\n // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n children?:\n | ((\n params?: RouteByPath<\n TRouteTree,\n ResolveRelativePath<TFrom, NoInfer<TTo>>\n >['types']['allParams'],\n ) => ReactNode)\n | React.ReactNode\n }\n\nexport function MatchRoute<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RoutePaths<TRouteTree> = '/',\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> = '/',\n TMaskTo extends string = '',\n>(\n props: MakeMatchRouteOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n): any {\n const matchRoute = useMatchRoute()\n const params = matchRoute(props as any)\n\n if (typeof props.children === 'function') {\n return (props.children as any)(params)\n }\n\n return !!params ? props.children : null\n}\n\nexport function getRenderedMatches(state: RouterState) {\n return state.pendingMatches?.some((d) => d.showPending)\n ? state.pendingMatches\n : state.matches\n}\n\nexport function useMatch<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatchState = RouteMatch<TRouteTree, TFrom>,\n TSelected = TRouteMatchState,\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatchState) => TSelected\n },\n): TSelected {\n const router = useRouter()\n const nearestMatchId = React.useContext(matchContext)\n\n const nearestMatchRouteId = getRenderedMatches(router.state).find(\n (d) => d.id === nearestMatchId,\n )?.routeId\n\n const matchRouteId = (() => {\n const matches = getRenderedMatches(router.state)\n const match = opts?.from\n ? matches.find((d) => d.routeId === opts?.from)\n : matches.find((d) => d.id === nearestMatchId)\n return match!.routeId\n })()\n\n if (opts?.strict ?? true) {\n invariant(\n nearestMatchRouteId == matchRouteId,\n `useMatch(\"${\n matchRouteId as string\n }\") is being called in a component that is meant to render the '${nearestMatchRouteId}' route. Did you mean to 'useMatch(\"${\n matchRouteId as string\n }\", { strict: false })' or 'useRoute(\"${\n matchRouteId as string\n }\")' instead?`,\n )\n }\n\n const matchSelection = useRouterState({\n select: (state) => {\n const match = getRenderedMatches(state).find(\n (d) => d.id === nearestMatchId,\n )\n\n invariant(\n match,\n `Could not find ${\n opts?.from\n ? `an active match from \"${opts.from}\"`\n : 'a nearest match!'\n }`,\n )\n\n return opts?.select ? opts.select(match as any) : match\n },\n })\n\n return matchSelection as any\n}\n\nexport function useMatches<T = RouteMatch[]>(opts?: {\n select?: (matches: RouteMatch[]) => T\n}): T {\n return useRouterState({\n select: (state) => {\n let matches = getRenderedMatches(state)\n return opts?.select ? opts.select(matches) : (matches as T)\n },\n })\n}\n\nexport function useParentMatches<T = RouteMatch[]>(opts?: {\n select?: (matches: RouteMatch[]) => T\n}): T {\n const contextMatchId = React.useContext(matchContext)\n\n return useMatches({\n select: (matches) => {\n matches = matches.slice(matches.findIndex((d) => d.id === contextMatchId))\n return opts?.select ? opts.select(matches) : (matches as T)\n },\n })\n}\n\nexport function useLoaderDeps<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<\n TRouteTree,\n TFrom\n >,\n TSelected = Required<TRouteMatch>['loaderDeps'],\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatch) => TSelected\n },\n): TSelected {\n return useMatch({\n ...opts,\n select: (s) => {\n return typeof opts.select === 'function'\n ? opts.select(s?.loaderDeps)\n : s?.loaderDeps\n },\n })\n}\n\nexport function useLoaderData<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,\n TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<\n TRouteTree,\n TFrom\n >,\n TSelected = Required<TRouteMatch>['loaderData'],\n>(\n opts: StrictOrFrom<TFrom> & {\n select?: (match: TRouteMatch) => TSelected\n },\n): TSelected {\n return useMatch({\n ...opts,\n select: (s) => {\n return typeof opts.select === 'function'\n ? opts.select(s?.loaderData)\n : s?.loaderData\n },\n })\n}\n\nexport function isServerSideError(error: unknown): error is {\n __isServerError: true\n data: Record<string, any>\n} {\n if (!(typeof error === 'object' && error && 'data' in error)) return false\n if (!('__isServerError' in error && error.__isServerError)) return false\n if (!(typeof error.data === 'object' && error.data)) return false\n\n return error.__isServerError === true\n}\n\nexport function defaultDeserializeError(serializedData: Record<string, any>) {\n if ('name' in serializedData && 'message' in serializedData) {\n const error = new Error(serializedData.message)\n error.name = serializedData.name\n return error\n }\n\n return serializedData.data\n}\n"],"names":["_a","Outlet"],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { NavigateOptions, ToOptions } from './link';
|
|
3
|
+
import { ParsedLocation } from './location';
|
|
4
|
+
import { AnyRoute } from './route';
|
|
5
|
+
import { RoutePaths } from './routeInfo';
|
|
6
|
+
import { RegisteredRouter, Router, RouterOptions, RouterState } from './router';
|
|
7
|
+
import { RouteMatch } from './Matches';
|
|
8
|
+
export interface CommitLocationOptions {
|
|
9
|
+
replace?: boolean;
|
|
10
|
+
resetScroll?: boolean;
|
|
11
|
+
startTransition?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export interface MatchLocation {
|
|
14
|
+
to?: string | number | null;
|
|
15
|
+
fuzzy?: boolean;
|
|
16
|
+
caseSensitive?: boolean;
|
|
17
|
+
from?: string;
|
|
18
|
+
}
|
|
19
|
+
export type NavigateFn<TRouteTree extends AnyRoute> = <TFrom extends RoutePaths<TRouteTree> | string = string, TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
|
|
20
|
+
export type BuildLocationFn<TRouteTree extends AnyRoute> = (opts: ToOptions<TRouteTree>) => ParsedLocation;
|
|
21
|
+
export type InjectedHtmlEntry = string | (() => Promise<string> | string);
|
|
22
|
+
export declare function RouterProvider<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): React.JSX.Element;
|
|
23
|
+
export declare function getRouteMatch<TRouteTree extends AnyRoute>(state: RouterState<TRouteTree>, id: string): undefined | RouteMatch<TRouteTree>;
|
|
24
|
+
export type RouterProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {
|
|
25
|
+
router: Router<TRouteTree>;
|
|
26
|
+
context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>;
|
|
27
|
+
};
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
|
+
import * as React from "react";
|
|
3
|
+
import { Matches } from "./Matches.js";
|
|
4
|
+
import { pick, useLayoutEffect } from "./utils.js";
|
|
5
|
+
import { useRouter } from "./useRouter.js";
|
|
6
|
+
import { useRouterState } from "./useRouterState.js";
|
|
7
|
+
import { routerContext } from "./routerContext.js";
|
|
8
|
+
const useTransition = React.useTransition || (() => [
|
|
9
|
+
false,
|
|
10
|
+
(cb) => {
|
|
11
|
+
cb();
|
|
12
|
+
}
|
|
13
|
+
]);
|
|
14
|
+
function RouterProvider({ router, ...rest }) {
|
|
15
|
+
router.update({
|
|
16
|
+
...router.options,
|
|
17
|
+
...rest,
|
|
18
|
+
context: {
|
|
19
|
+
...router.options.context,
|
|
20
|
+
...rest == null ? void 0 : rest.context
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
const matches = router.options.InnerWrap ? /* @__PURE__ */ jsx(router.options.InnerWrap, { children: /* @__PURE__ */ jsx(Matches, {}) }) : /* @__PURE__ */ jsx(Matches, {});
|
|
24
|
+
const provider = /* @__PURE__ */ jsxs(routerContext.Provider, { value: router, children: [
|
|
25
|
+
matches,
|
|
26
|
+
/* @__PURE__ */ jsx(Transitioner, {})
|
|
27
|
+
] });
|
|
28
|
+
if (router.options.Wrap) {
|
|
29
|
+
return /* @__PURE__ */ jsx(router.options.Wrap, { children: provider });
|
|
30
|
+
}
|
|
31
|
+
return provider;
|
|
32
|
+
}
|
|
33
|
+
function Transitioner() {
|
|
34
|
+
const mountLoadCount = React.useRef(0);
|
|
35
|
+
const router = useRouter();
|
|
36
|
+
const routerState = useRouterState({
|
|
37
|
+
select: (s) => pick(s, ["isLoading", "location", "resolvedLocation", "isTransitioning"])
|
|
38
|
+
});
|
|
39
|
+
const [isTransitioning, startReactTransition] = useTransition();
|
|
40
|
+
router.startReactTransition = startReactTransition;
|
|
41
|
+
React.useEffect(() => {
|
|
42
|
+
if (isTransitioning) {
|
|
43
|
+
router.__store.setState((s) => ({
|
|
44
|
+
...s,
|
|
45
|
+
isTransitioning
|
|
46
|
+
}));
|
|
47
|
+
}
|
|
48
|
+
}, [isTransitioning]);
|
|
49
|
+
const tryLoad = () => {
|
|
50
|
+
const apply = (cb) => {
|
|
51
|
+
if (!routerState.isTransitioning) {
|
|
52
|
+
startReactTransition(() => cb());
|
|
53
|
+
} else {
|
|
54
|
+
cb();
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
apply(() => {
|
|
58
|
+
try {
|
|
59
|
+
router.load();
|
|
60
|
+
} catch (err) {
|
|
61
|
+
console.error(err);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
};
|
|
65
|
+
useLayoutEffect(() => {
|
|
66
|
+
const unsub = router.history.subscribe(() => {
|
|
67
|
+
router.latestLocation = router.parseLocation(router.latestLocation);
|
|
68
|
+
if (routerState.location !== router.latestLocation) {
|
|
69
|
+
tryLoad();
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
const nextLocation = router.buildLocation({
|
|
73
|
+
search: true,
|
|
74
|
+
params: true,
|
|
75
|
+
hash: true,
|
|
76
|
+
state: true
|
|
77
|
+
});
|
|
78
|
+
if (routerState.location.href !== nextLocation.href) {
|
|
79
|
+
router.commitLocation({ ...nextLocation, replace: true });
|
|
80
|
+
}
|
|
81
|
+
return () => {
|
|
82
|
+
unsub();
|
|
83
|
+
};
|
|
84
|
+
}, [router.history]);
|
|
85
|
+
useLayoutEffect(() => {
|
|
86
|
+
var _a;
|
|
87
|
+
if (React.useTransition ? routerState.isTransitioning && !isTransitioning : !routerState.isLoading && routerState.resolvedLocation !== routerState.location) {
|
|
88
|
+
router.emit({
|
|
89
|
+
type: "onResolved",
|
|
90
|
+
fromLocation: routerState.resolvedLocation,
|
|
91
|
+
toLocation: routerState.location,
|
|
92
|
+
pathChanged: routerState.location.href !== ((_a = routerState.resolvedLocation) == null ? void 0 : _a.href)
|
|
93
|
+
});
|
|
94
|
+
if (document.querySelector) {
|
|
95
|
+
if (routerState.location.hash !== "") {
|
|
96
|
+
const el = document.getElementById(
|
|
97
|
+
routerState.location.hash
|
|
98
|
+
);
|
|
99
|
+
if (el) {
|
|
100
|
+
el.scrollIntoView();
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
router.__store.setState((s) => ({
|
|
105
|
+
...s,
|
|
106
|
+
isTransitioning: false,
|
|
107
|
+
resolvedLocation: s.location
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
}, [
|
|
111
|
+
routerState.isTransitioning,
|
|
112
|
+
isTransitioning,
|
|
113
|
+
routerState.isLoading,
|
|
114
|
+
routerState.resolvedLocation,
|
|
115
|
+
routerState.location
|
|
116
|
+
]);
|
|
117
|
+
useLayoutEffect(() => {
|
|
118
|
+
if (!window.__TSR_DEHYDRATED__ && !mountLoadCount.current) {
|
|
119
|
+
mountLoadCount.current++;
|
|
120
|
+
tryLoad();
|
|
121
|
+
}
|
|
122
|
+
}, []);
|
|
123
|
+
return null;
|
|
124
|
+
}
|
|
125
|
+
function getRouteMatch(state, id) {
|
|
126
|
+
return [
|
|
127
|
+
...state.cachedMatches,
|
|
128
|
+
...state.pendingMatches ?? [],
|
|
129
|
+
...state.matches
|
|
130
|
+
].find((d) => d.id === id);
|
|
131
|
+
}
|
|
132
|
+
export {
|
|
133
|
+
RouterProvider,
|
|
134
|
+
getRouteMatch
|
|
135
|
+
};
|
|
136
|
+
//# sourceMappingURL=RouterProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import * as React from 'react'\nimport { Matches } from './Matches'\nimport { NavigateOptions, ToOptions } from './link'\nimport { ParsedLocation } from './location'\nimport { AnyRoute } from './route'\nimport { RoutePaths } from './routeInfo'\nimport { RegisteredRouter, Router, RouterOptions, RouterState } from './router'\nimport { pick, useLayoutEffect } from './utils'\n\nimport { RouteMatch } from './Matches'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { routerContext } from './routerContext'\n\nconst useTransition =\n React.useTransition ||\n (() => [\n false,\n (cb) => {\n cb()\n },\n ])\n\nexport interface CommitLocationOptions {\n replace?: boolean\n resetScroll?: boolean\n startTransition?: boolean\n}\n\nexport interface MatchLocation {\n to?: string | number | null\n fuzzy?: boolean\n caseSensitive?: boolean\n from?: string\n}\n\nexport type NavigateFn<TRouteTree extends AnyRoute> = <\n TFrom extends RoutePaths<TRouteTree> | string = string,\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom,\n TMaskTo extends string = '',\n>(\n opts: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Promise<void>\n\nexport type BuildLocationFn<TRouteTree extends AnyRoute> = (\n opts: ToOptions<TRouteTree>,\n) => ParsedLocation\n\nexport type InjectedHtmlEntry = string | (() => Promise<string> | string)\n\nexport function RouterProvider<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>) {\n // Allow the router to update options on the router instance\n router.update({\n ...router.options,\n ...rest,\n context: {\n ...router.options.context,\n ...rest?.context,\n },\n } as any)\n\n const matches = router.options.InnerWrap ? (\n <router.options.InnerWrap>\n <Matches />\n </router.options.InnerWrap>\n ) : (\n <Matches />\n )\n\n const provider = (\n <routerContext.Provider value={router}>\n {matches}\n <Transitioner />\n </routerContext.Provider>\n )\n\n if (router.options.Wrap) {\n return <router.options.Wrap>{provider}</router.options.Wrap>\n }\n\n return provider\n}\n\nfunction Transitioner() {\n const mountLoadCount = React.useRef(0)\n const router = useRouter()\n const routerState = useRouterState({\n select: (s) =>\n pick(s, ['isLoading', 'location', 'resolvedLocation', 'isTransitioning']),\n })\n\n const [isTransitioning, startReactTransition] = useTransition()\n\n router.startReactTransition = startReactTransition\n\n React.useEffect(() => {\n if (isTransitioning) {\n router.__store.setState((s) => ({\n ...s,\n isTransitioning,\n }))\n }\n }, [isTransitioning])\n\n const tryLoad = () => {\n const apply = (cb: () => void) => {\n if (!routerState.isTransitioning) {\n startReactTransition(() => cb())\n } else {\n cb()\n }\n }\n\n apply(() => {\n try {\n router.load()\n } catch (err) {\n console.error(err)\n }\n })\n }\n\n useLayoutEffect(() => {\n const unsub = router.history.subscribe(() => {\n router.latestLocation = router.parseLocation(router.latestLocation)\n if (routerState.location !== router.latestLocation) {\n tryLoad()\n }\n })\n\n const nextLocation = router.buildLocation({\n search: true,\n params: true,\n hash: true,\n state: true,\n })\n\n if (routerState.location.href !== nextLocation.href) {\n router.commitLocation({ ...nextLocation, replace: true })\n }\n\n return () => {\n unsub()\n }\n }, [router.history])\n\n useLayoutEffect(() => {\n if (\n (React.useTransition as any)\n ? routerState.isTransitioning && !isTransitioning\n : true &&\n !routerState.isLoading &&\n routerState.resolvedLocation !== routerState.location\n ) {\n router.emit({\n type: 'onResolved',\n fromLocation: routerState.resolvedLocation,\n toLocation: routerState.location,\n pathChanged:\n routerState.location!.href !== routerState.resolvedLocation?.href,\n })\n\n if ((document as any).querySelector) {\n if (routerState.location.hash !== '') {\n const el = document.getElementById(\n routerState.location.hash,\n ) as HTMLElement | null\n if (el) {\n el.scrollIntoView()\n }\n }\n }\n\n router.__store.setState((s) => ({\n ...s,\n isTransitioning: false,\n resolvedLocation: s.location,\n }))\n }\n }, [\n routerState.isTransitioning,\n isTransitioning,\n routerState.isLoading,\n routerState.resolvedLocation,\n routerState.location,\n ])\n\n useLayoutEffect(() => {\n if (!window.__TSR_DEHYDRATED__ && !mountLoadCount.current) {\n mountLoadCount.current++\n tryLoad()\n }\n }, [])\n\n return null\n}\n\nexport function getRouteMatch<TRouteTree extends AnyRoute>(\n state: RouterState<TRouteTree>,\n id: string,\n): undefined | RouteMatch<TRouteTree> {\n return [\n ...state.cachedMatches,\n ...(state.pendingMatches ?? []),\n ...state.matches,\n ].find((d) => d.id === id)\n}\n\nexport type RouterProps<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {\n router: Router<TRouteTree>\n context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>\n}\n"],"names":["useTransition","React","cb","RouterProvider","router","rest","update","options","context","matches","InnerWrap","createElement","Matches","provider","routerContext","Provider","value","Transitioner","Wrap","mountLoadCount","useRef","useRouter","routerState","useRouterState","select","s","pick","isTransitioning","startReactTransition","useEffect","__store","setState","tryLoad","apply","load","err","console","error","useLayoutEffect","unsub","history","subscribe","latestLocation","parseLocation","location","nextLocation","buildLocation","search","params","hash","state","href","commitLocation","replace","isLoading","resolvedLocation","emit","type","fromLocation","toLocation","pathChanged","document","querySelector","el","getElementById","scrollIntoView","window","__TSR_DEHYDRATED__","current","getRouteMatch","id","cachedMatches","pendingMatches","find","d"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import * as React from 'react'\nimport { Matches } from './Matches'\nimport { NavigateOptions, ToOptions } from './link'\nimport { ParsedLocation } from './location'\nimport { AnyRoute } from './route'\nimport { RoutePaths } from './routeInfo'\nimport { RegisteredRouter, Router, RouterOptions, RouterState } from './router'\nimport { pick, useLayoutEffect } from './utils'\n\nimport { RouteMatch } from './Matches'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { routerContext } from './routerContext'\n\nconst useTransition =\n React.useTransition ||\n (() => [\n false,\n (cb) => {\n cb()\n },\n ])\n\nexport interface CommitLocationOptions {\n replace?: boolean\n resetScroll?: boolean\n startTransition?: boolean\n}\n\nexport interface MatchLocation {\n to?: string | number | null\n fuzzy?: boolean\n caseSensitive?: boolean\n from?: string\n}\n\nexport type NavigateFn<TRouteTree extends AnyRoute> = <\n TFrom extends RoutePaths<TRouteTree> | string = string,\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom,\n TMaskTo extends string = '',\n>(\n opts: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Promise<void>\n\nexport type BuildLocationFn<TRouteTree extends AnyRoute> = (\n opts: ToOptions<TRouteTree>,\n) => ParsedLocation\n\nexport type InjectedHtmlEntry = string | (() => Promise<string> | string)\n\nexport function RouterProvider<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>) {\n // Allow the router to update options on the router instance\n router.update({\n ...router.options,\n ...rest,\n context: {\n ...router.options.context,\n ...rest?.context,\n },\n } as any)\n\n const matches = router.options.InnerWrap ? (\n <router.options.InnerWrap>\n <Matches />\n </router.options.InnerWrap>\n ) : (\n <Matches />\n )\n\n const provider = (\n <routerContext.Provider value={router}>\n {matches}\n <Transitioner />\n </routerContext.Provider>\n )\n\n if (router.options.Wrap) {\n return <router.options.Wrap>{provider}</router.options.Wrap>\n }\n\n return provider\n}\n\nfunction Transitioner() {\n const mountLoadCount = React.useRef(0)\n const router = useRouter()\n const routerState = useRouterState({\n select: (s) =>\n pick(s, ['isLoading', 'location', 'resolvedLocation', 'isTransitioning']),\n })\n\n const [isTransitioning, startReactTransition] = useTransition()\n\n router.startReactTransition = startReactTransition\n\n React.useEffect(() => {\n if (isTransitioning) {\n router.__store.setState((s) => ({\n ...s,\n isTransitioning,\n }))\n }\n }, [isTransitioning])\n\n const tryLoad = () => {\n const apply = (cb: () => void) => {\n if (!routerState.isTransitioning) {\n startReactTransition(() => cb())\n } else {\n cb()\n }\n }\n\n apply(() => {\n try {\n router.load()\n } catch (err) {\n console.error(err)\n }\n })\n }\n\n useLayoutEffect(() => {\n const unsub = router.history.subscribe(() => {\n router.latestLocation = router.parseLocation(router.latestLocation)\n if (routerState.location !== router.latestLocation) {\n tryLoad()\n }\n })\n\n const nextLocation = router.buildLocation({\n search: true,\n params: true,\n hash: true,\n state: true,\n })\n\n if (routerState.location.href !== nextLocation.href) {\n router.commitLocation({ ...nextLocation, replace: true })\n }\n\n return () => {\n unsub()\n }\n }, [router.history])\n\n useLayoutEffect(() => {\n if (\n (React.useTransition as any)\n ? routerState.isTransitioning && !isTransitioning\n : true &&\n !routerState.isLoading &&\n routerState.resolvedLocation !== routerState.location\n ) {\n router.emit({\n type: 'onResolved',\n fromLocation: routerState.resolvedLocation,\n toLocation: routerState.location,\n pathChanged:\n routerState.location!.href !== routerState.resolvedLocation?.href,\n })\n\n if ((document as any).querySelector) {\n if (routerState.location.hash !== '') {\n const el = document.getElementById(\n routerState.location.hash,\n ) as HTMLElement | null\n if (el) {\n el.scrollIntoView()\n }\n }\n }\n\n router.__store.setState((s) => ({\n ...s,\n isTransitioning: false,\n resolvedLocation: s.location,\n }))\n }\n }, [\n routerState.isTransitioning,\n isTransitioning,\n routerState.isLoading,\n routerState.resolvedLocation,\n routerState.location,\n ])\n\n useLayoutEffect(() => {\n if (!window.__TSR_DEHYDRATED__ && !mountLoadCount.current) {\n mountLoadCount.current++\n tryLoad()\n }\n }, [])\n\n return null\n}\n\nexport function getRouteMatch<TRouteTree extends AnyRoute>(\n state: RouterState<TRouteTree>,\n id: string,\n): undefined | RouteMatch<TRouteTree> {\n return [\n ...state.cachedMatches,\n ...(state.pendingMatches ?? []),\n ...state.matches,\n ].find((d) => d.id === id)\n}\n\nexport type RouterProps<\n TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {\n router: Router<TRouteTree>\n context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { DeferredPromise } from './defer';
|
|
3
|
+
export type AwaitOptions<T> = {
|
|
4
|
+
promise: DeferredPromise<T>;
|
|
5
|
+
};
|
|
6
|
+
export declare function useAwaited<T>({ promise }: AwaitOptions<T>): [T];
|
|
7
|
+
export declare function Await<T>(props: AwaitOptions<T> & {
|
|
8
|
+
children: (result: T) => JSX.Element;
|
|
9
|
+
}): JSX.Element;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import warning from "tiny-warning";
|
|
2
|
+
import { isServerSideError, defaultDeserializeError } from "./Matches.js";
|
|
3
|
+
import { useRouter } from "./useRouter.js";
|
|
4
|
+
import { isDehydratedDeferred } from "./defer.js";
|
|
5
|
+
import { defaultSerializeError } from "./router.js";
|
|
6
|
+
function useAwaited({ promise }) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
const router = useRouter();
|
|
9
|
+
let state = promise.__deferredState;
|
|
10
|
+
const key = `__TSR__DEFERRED__${state.uid}`;
|
|
11
|
+
if (isDehydratedDeferred(promise)) {
|
|
12
|
+
state = router.hydrateData(key);
|
|
13
|
+
if (!state)
|
|
14
|
+
throw new Error("Could not find dehydrated data");
|
|
15
|
+
promise = Promise.resolve(state.data);
|
|
16
|
+
promise.__deferredState = state;
|
|
17
|
+
}
|
|
18
|
+
if (state.status === "pending") {
|
|
19
|
+
throw promise;
|
|
20
|
+
}
|
|
21
|
+
if (state.status === "error") {
|
|
22
|
+
if (typeof document !== "undefined") {
|
|
23
|
+
if (isServerSideError(state.error)) {
|
|
24
|
+
throw (((_a = router.options.errorSerializer) == null ? void 0 : _a.deserialize) ?? defaultDeserializeError)(state.error.data);
|
|
25
|
+
} else {
|
|
26
|
+
warning(
|
|
27
|
+
false,
|
|
28
|
+
"Encountered a server-side error that doesn't fit the expected shape"
|
|
29
|
+
);
|
|
30
|
+
throw state.error;
|
|
31
|
+
}
|
|
32
|
+
} else {
|
|
33
|
+
router.dehydrateData(key, state);
|
|
34
|
+
throw {
|
|
35
|
+
data: (((_b = router.options.errorSerializer) == null ? void 0 : _b.serialize) ?? defaultSerializeError)(state.error),
|
|
36
|
+
__isServerError: true
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
router.dehydrateData(key, state);
|
|
41
|
+
return [state.data];
|
|
42
|
+
}
|
|
43
|
+
function Await(props) {
|
|
44
|
+
const awaited = useAwaited(props);
|
|
45
|
+
return props.children(...awaited);
|
|
46
|
+
}
|
|
47
|
+
export {
|
|
48
|
+
Await,
|
|
49
|
+
useAwaited
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=awaited.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import warning from 'tiny-warning'\nimport { defaultDeserializeError, isServerSideError } from './Matches'\nimport { useRouter } from './useRouter'\nimport { DeferredPromise, isDehydratedDeferred } from './defer'\nimport { defaultSerializeError } from './router'\n\nexport type AwaitOptions<T> = {\n promise: DeferredPromise<T>\n}\n\nexport function useAwaited<T>({ promise }: AwaitOptions<T>): [T] {\n const router = useRouter()\n\n let state = promise.__deferredState\n const key = `__TSR__DEFERRED__${state.uid}`\n\n if (isDehydratedDeferred(promise)) {\n state = router.hydrateData(key)!\n if (!state) throw new Error('Could not find dehydrated data')\n promise = Promise.resolve(state.data) as DeferredPromise<any>\n promise.__deferredState = state\n }\n\n if (state.status === 'pending') {\n throw promise\n }\n\n if (state.status === 'error') {\n if (typeof document !== 'undefined') {\n if (isServerSideError(state.error)) {\n throw (\n router.options.errorSerializer?.deserialize ?? defaultDeserializeError\n )(state.error.data as any)\n } else {\n warning(\n false,\n \"Encountered a server-side error that doesn't fit the expected shape\",\n )\n throw state.error\n }\n } else {\n router.dehydrateData(key, state)\n throw {\n data: (\n router.options.errorSerializer?.serialize ?? defaultSerializeError\n )(state.error),\n __isServerError: true,\n }\n }\n }\n\n router.dehydrateData(key, state)\n\n return [state.data]\n}\n\nexport function Await<T>(\n props: AwaitOptions<T> & {\n children: (result: T) => JSX.Element\n },\n) {\n const awaited = useAwaited(props)\n return props.children(...awaited)\n}\n"],"names":[],"mappings":";;;;;AAUgB,SAAA,WAAc,EAAE,WAAiC;;AAC/D,QAAM,SAAS;AAEf,MAAI,QAAQ,QAAQ;AACd,QAAA,MAAM,oBAAoB,MAAM,GAAG;AAErC,MAAA,qBAAqB,OAAO,GAAG;AACzB,YAAA,OAAO,YAAY,GAAG;AAC9B,QAAI,CAAC;AAAa,YAAA,IAAI,MAAM,gCAAgC;AAClD,cAAA,QAAQ,QAAQ,MAAM,IAAI;AACpC,YAAQ,kBAAkB;AAAA,EAC5B;AAEI,MAAA,MAAM,WAAW,WAAW;AACxB,UAAA;AAAA,EACR;AAEI,MAAA,MAAM,WAAW,SAAS;AACxB,QAAA,OAAO,aAAa,aAAa;AAC/B,UAAA,kBAAkB,MAAM,KAAK,GAAG;AAClC,iBACE,YAAO,QAAQ,oBAAf,mBAAgC,gBAAe,yBAC/C,MAAM,MAAM,IAAW;AAAA,MAAA,OACpB;AACL;AAAA,UACE;AAAA,UACA;AAAA,QAAA;AAEF,cAAM,MAAM;AAAA,MACd;AAAA,IAAA,OACK;AACE,aAAA,cAAc,KAAK,KAAK;AACzB,YAAA;AAAA,QACJ,SACE,YAAO,QAAQ,oBAAf,mBAAgC,cAAa,uBAC7C,MAAM,KAAK;AAAA,QACb,iBAAiB;AAAA,MAAA;AAAA,IAErB;AAAA,EACF;AAEO,SAAA,cAAc,KAAK,KAAK;AAExB,SAAA,CAAC,MAAM,IAAI;AACpB;AAEO,SAAS,MACd,OAGA;AACM,QAAA,UAAU,WAAW,KAAK;AACzB,SAAA,MAAM,SAAS,GAAG,OAAO;AAClC;"}
|