@tanstack/solid-router 1.132.0-alpha.1 → 1.132.0-alpha.13
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/HeadContent.cjs +9 -6
- package/dist/cjs/HeadContent.cjs.map +1 -1
- package/dist/cjs/Match.cjs +30 -27
- package/dist/cjs/Match.cjs.map +1 -1
- package/dist/cjs/ScriptOnce.cjs +2 -2
- package/dist/cjs/ScriptOnce.cjs.map +1 -1
- package/dist/cjs/fileRoute.cjs.map +1 -1
- package/dist/cjs/fileRoute.d.cts +2 -2
- package/dist/cjs/index.cjs +2 -10
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +2 -2
- package/dist/cjs/link.cjs +7 -9
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +12 -12
- package/dist/cjs/router.cjs +1 -1
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.cjs +11 -3
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/useBlocker.cjs +1 -1
- package/dist/cjs/useBlocker.cjs.map +1 -1
- package/dist/cjs/useNavigate.cjs +3 -11
- package/dist/cjs/useNavigate.cjs.map +1 -1
- package/dist/esm/HeadContent.js +9 -6
- package/dist/esm/HeadContent.js.map +1 -1
- package/dist/esm/Match.js +31 -28
- package/dist/esm/Match.js.map +1 -1
- package/dist/esm/ScriptOnce.js +2 -2
- package/dist/esm/ScriptOnce.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +2 -2
- package/dist/esm/fileRoute.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -4
- package/dist/esm/link.js +7 -9
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/route.d.ts +12 -12
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.js +1 -1
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/scroll-restoration.js +11 -3
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/useBlocker.js +1 -1
- package/dist/esm/useBlocker.js.map +1 -1
- package/dist/esm/useNavigate.js +3 -11
- package/dist/esm/useNavigate.js.map +1 -1
- package/dist/source/HeadContent.jsx +9 -7
- package/dist/source/HeadContent.jsx.map +1 -1
- package/dist/source/Match.jsx +33 -34
- package/dist/source/Match.jsx.map +1 -1
- package/dist/source/ScriptOnce.jsx +1 -1
- package/dist/source/ScriptOnce.jsx.map +1 -1
- package/dist/source/fileRoute.d.ts +2 -2
- package/dist/source/fileRoute.js.map +1 -1
- package/dist/source/index.d.ts +2 -2
- package/dist/source/index.jsx +1 -1
- package/dist/source/index.jsx.map +1 -1
- package/dist/source/link.jsx +7 -11
- package/dist/source/link.jsx.map +1 -1
- package/dist/source/route.d.ts +12 -12
- package/dist/source/route.jsx.map +1 -1
- package/dist/source/router.js +1 -1
- package/dist/source/router.js.map +1 -1
- package/dist/source/scroll-restoration.jsx +11 -3
- package/dist/source/scroll-restoration.jsx.map +1 -1
- package/dist/source/useBlocker.jsx +1 -1
- package/dist/source/useBlocker.jsx.map +1 -1
- package/dist/source/useNavigate.jsx +3 -10
- package/dist/source/useNavigate.jsx.map +1 -1
- package/package.json +2 -2
- package/src/HeadContent.tsx +9 -6
- package/src/Match.tsx +35 -37
- package/src/ScriptOnce.tsx +2 -2
- package/src/fileRoute.ts +10 -2
- package/src/index.tsx +3 -3
- package/src/link.tsx +7 -11
- package/src/route.tsx +76 -18
- package/src/router.ts +1 -1
- package/src/scroll-restoration.tsx +11 -4
- package/src/useBlocker.tsx +1 -1
- package/src/useNavigate.tsx +3 -12
package/src/useBlocker.tsx
CHANGED
|
@@ -185,7 +185,7 @@ export function useBlocker(
|
|
|
185
185
|
function getLocation(
|
|
186
186
|
location: HistoryLocation,
|
|
187
187
|
): AnyShouldBlockFnLocation {
|
|
188
|
-
const parsedLocation = router.parseLocation(
|
|
188
|
+
const parsedLocation = router.parseLocation(location)
|
|
189
189
|
const matchedRoutes = router.getMatchedRoutes(
|
|
190
190
|
parsedLocation.pathname,
|
|
191
191
|
undefined,
|
package/src/useNavigate.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as Solid from 'solid-js'
|
|
2
2
|
import { useRouter } from './useRouter'
|
|
3
|
-
import { useMatch } from './useMatch'
|
|
4
3
|
import type {
|
|
5
4
|
AnyRouter,
|
|
6
5
|
FromPathOption,
|
|
@@ -15,20 +14,12 @@ export function useNavigate<
|
|
|
15
14
|
>(_defaultOpts?: {
|
|
16
15
|
from?: FromPathOption<TRouter, TDefaultFrom>
|
|
17
16
|
}): UseNavigateResult<TDefaultFrom> {
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
const matchIndex = useMatch({
|
|
21
|
-
strict: false,
|
|
22
|
-
select: (match) => match.index,
|
|
23
|
-
})
|
|
17
|
+
const router = useRouter()
|
|
24
18
|
|
|
25
19
|
return ((options: NavigateOptions) => {
|
|
26
|
-
return navigate({
|
|
20
|
+
return router.navigate({
|
|
27
21
|
...options,
|
|
28
|
-
from:
|
|
29
|
-
options.from ??
|
|
30
|
-
_defaultOpts?.from ??
|
|
31
|
-
state.matches[matchIndex()]!.fullPath,
|
|
22
|
+
from: options.from ?? _defaultOpts?.from,
|
|
32
23
|
})
|
|
33
24
|
}) as UseNavigateResult<TDefaultFrom>
|
|
34
25
|
}
|