@tanstack/react-router 0.0.1-beta.285 → 0.0.1-beta.286
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/build/cjs/Matches.js +11 -3
- package/build/cjs/Matches.js.map +1 -1
- package/build/esm/index.js +534 -527
- package/build/esm/index.js.map +1 -1
- package/build/stats-html.html +1 -1
- package/build/stats-react.json +430 -424
- package/build/umd/index.development.js +534 -527
- package/build/umd/index.development.js.map +1 -1
- package/build/umd/index.production.js +1 -1
- package/build/umd/index.production.js.map +1 -1
- package/package.json +2 -2
- package/src/Matches.tsx +18 -5
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/react-router",
|
|
3
3
|
"author": "Tanner Linsley",
|
|
4
|
-
"version": "0.0.1-beta.
|
|
4
|
+
"version": "0.0.1-beta.286",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": "tanstack/router",
|
|
7
7
|
"homepage": "https://tanstack.com/router",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@tanstack/store": "^0.1.3",
|
|
45
45
|
"tiny-invariant": "^1.3.1",
|
|
46
46
|
"tiny-warning": "^1.0.3",
|
|
47
|
-
"@tanstack/history": "0.0.1-beta.
|
|
47
|
+
"@tanstack/history": "0.0.1-beta.286"
|
|
48
48
|
},
|
|
49
49
|
"scripts": {
|
|
50
50
|
"build": "rollup --config rollup.config.js"
|
package/src/Matches.tsx
CHANGED
|
@@ -289,6 +289,12 @@ function getRenderedMatches(state: RouterState) {
|
|
|
289
289
|
: state.matches
|
|
290
290
|
}
|
|
291
291
|
|
|
292
|
+
function removeUnderscores(s?: string) {
|
|
293
|
+
if (s === rootRouteId) return s
|
|
294
|
+
|
|
295
|
+
return s?.replace(/(^_|_$)/, '').replace(/(\/_|_\/)/, '/')
|
|
296
|
+
}
|
|
297
|
+
|
|
292
298
|
export function useMatch<
|
|
293
299
|
TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
|
|
294
300
|
TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
|
|
@@ -309,11 +315,18 @@ export function useMatch<
|
|
|
309
315
|
|
|
310
316
|
const matchRouteId = (() => {
|
|
311
317
|
const matches = getRenderedMatches(router.state)
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
318
|
+
|
|
319
|
+
if (!opts.from) {
|
|
320
|
+
return matches.find((d) => d.id === nearestMatchId)
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
const from = removeUnderscores(opts.from)
|
|
324
|
+
|
|
325
|
+
return (
|
|
326
|
+
matches.find((d) => d.routeId === from) ??
|
|
327
|
+
matches.find((d) => d.routeId === from?.replace(/\/$/, ''))
|
|
328
|
+
)
|
|
329
|
+
})()?.routeId
|
|
317
330
|
|
|
318
331
|
if (opts?.strict ?? true) {
|
|
319
332
|
invariant(
|