@tanstack/solid-router 1.132.0-alpha.8 → 1.132.2

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.
Files changed (90) hide show
  1. package/dist/cjs/Asset.cjs +30 -1
  2. package/dist/cjs/Asset.cjs.map +1 -1
  3. package/dist/cjs/Matches.cjs +22 -18
  4. package/dist/cjs/Matches.cjs.map +1 -1
  5. package/dist/cjs/RouterProvider.cjs +9 -9
  6. package/dist/cjs/RouterProvider.cjs.map +1 -1
  7. package/dist/cjs/ScriptOnce.cjs +12 -2
  8. package/dist/cjs/ScriptOnce.cjs.map +1 -1
  9. package/dist/cjs/fileRoute.cjs.map +1 -1
  10. package/dist/cjs/fileRoute.d.cts +2 -2
  11. package/dist/cjs/index.cjs +8 -4
  12. package/dist/cjs/index.cjs.map +1 -1
  13. package/dist/cjs/index.d.cts +4 -2
  14. package/dist/cjs/link.cjs +46 -31
  15. package/dist/cjs/link.cjs.map +1 -1
  16. package/dist/cjs/route.cjs.map +1 -1
  17. package/dist/cjs/route.d.cts +9 -9
  18. package/dist/cjs/ssr/renderRouterToString.cjs +1 -0
  19. package/dist/cjs/ssr/renderRouterToString.cjs.map +1 -1
  20. package/dist/cjs/useNavigate.cjs +1 -8
  21. package/dist/cjs/useNavigate.cjs.map +1 -1
  22. package/dist/cjs/useParams.cjs +3 -2
  23. package/dist/cjs/useParams.cjs.map +1 -1
  24. package/dist/esm/Asset.js +30 -1
  25. package/dist/esm/Asset.js.map +1 -1
  26. package/dist/esm/Matches.js +16 -12
  27. package/dist/esm/Matches.js.map +1 -1
  28. package/dist/esm/RouterProvider.js +9 -9
  29. package/dist/esm/RouterProvider.js.map +1 -1
  30. package/dist/esm/ScriptOnce.js +13 -3
  31. package/dist/esm/ScriptOnce.js.map +1 -1
  32. package/dist/esm/fileRoute.d.ts +2 -2
  33. package/dist/esm/fileRoute.js.map +1 -1
  34. package/dist/esm/index.d.ts +4 -2
  35. package/dist/esm/index.js +3 -2
  36. package/dist/esm/link.js +46 -31
  37. package/dist/esm/link.js.map +1 -1
  38. package/dist/esm/route.d.ts +9 -9
  39. package/dist/esm/route.js.map +1 -1
  40. package/dist/esm/ssr/renderRouterToString.js +1 -0
  41. package/dist/esm/ssr/renderRouterToString.js.map +1 -1
  42. package/dist/esm/useNavigate.js +1 -8
  43. package/dist/esm/useNavigate.js.map +1 -1
  44. package/dist/esm/useParams.js +3 -2
  45. package/dist/esm/useParams.js.map +1 -1
  46. package/dist/source/Asset.jsx +33 -1
  47. package/dist/source/Asset.jsx.map +1 -1
  48. package/dist/source/Matches.jsx +11 -7
  49. package/dist/source/Matches.jsx.map +1 -1
  50. package/dist/source/RouterProvider.jsx +7 -7
  51. package/dist/source/RouterProvider.jsx.map +1 -1
  52. package/dist/source/ScriptOnce.jsx +4 -2
  53. package/dist/source/ScriptOnce.jsx.map +1 -1
  54. package/dist/source/fileRoute.d.ts +2 -2
  55. package/dist/source/fileRoute.js.map +1 -1
  56. package/dist/source/index.d.ts +4 -2
  57. package/dist/source/index.jsx +2 -1
  58. package/dist/source/index.jsx.map +1 -1
  59. package/dist/source/link.jsx +47 -36
  60. package/dist/source/link.jsx.map +1 -1
  61. package/dist/source/route.d.ts +9 -9
  62. package/dist/source/route.jsx.map +1 -1
  63. package/dist/source/ssr/renderRouterToString.jsx +1 -0
  64. package/dist/source/ssr/renderRouterToString.jsx.map +1 -1
  65. package/dist/source/useNavigate.jsx +1 -5
  66. package/dist/source/useNavigate.jsx.map +1 -1
  67. package/dist/source/useParams.jsx +3 -2
  68. package/dist/source/useParams.jsx.map +1 -1
  69. package/package.json +3 -3
  70. package/src/Asset.tsx +47 -1
  71. package/src/Matches.tsx +18 -16
  72. package/src/RouterProvider.tsx +9 -10
  73. package/src/ScriptOnce.tsx +5 -2
  74. package/src/fileRoute.ts +10 -3
  75. package/src/index.tsx +5 -2
  76. package/src/link.tsx +47 -41
  77. package/src/route.tsx +48 -22
  78. package/src/ssr/renderRouterToString.tsx +1 -0
  79. package/src/useNavigate.tsx +1 -9
  80. package/src/useParams.tsx +6 -4
  81. package/dist/cjs/useActiveLocation.cjs +0 -40
  82. package/dist/cjs/useActiveLocation.cjs.map +0 -1
  83. package/dist/cjs/useActiveLocation.d.cts +0 -8
  84. package/dist/esm/useActiveLocation.d.ts +0 -8
  85. package/dist/esm/useActiveLocation.js +0 -40
  86. package/dist/esm/useActiveLocation.js.map +0 -1
  87. package/dist/source/useActiveLocation.d.ts +0 -8
  88. package/dist/source/useActiveLocation.js +0 -33
  89. package/dist/source/useActiveLocation.js.map +0 -1
  90. package/src/useActiveLocation.ts +0 -61
@@ -1,61 +0,0 @@
1
- import { last } from '@tanstack/router-core'
2
- import { createEffect, createMemo, createSignal } from 'solid-js'
3
- import { useMatch } from './useMatch'
4
- import { useRouter } from './useRouter'
5
- import { useRouterState } from './useRouterState'
6
- import type { Accessor } from 'solid-js'
7
- import type { ParsedLocation } from '@tanstack/router-core'
8
-
9
- export type UseLocationResult = {
10
- activeLocation: Accessor<ParsedLocation>
11
- getFromPath: (from?: string) => Accessor<string>
12
- setActiveLocation: (location?: ParsedLocation) => void
13
- }
14
-
15
- export function useActiveLocation(
16
- location?: ParsedLocation,
17
- ): UseLocationResult {
18
- const router = useRouter()
19
- // we are not using a variable here for router state location since we need to only calculate that if the location is not passed in. It can result in unnecessary history actions if we do that.
20
- const [activeLocation, setActiveLocation] = createSignal<ParsedLocation>(
21
- location ?? useRouterState({ select: (s) => s.location })(),
22
- )
23
- const [customActiveLocation, setCustomActiveLocation] = createSignal<
24
- ParsedLocation | undefined
25
- >(location)
26
-
27
- createEffect(() => {
28
- setActiveLocation(
29
- customActiveLocation() ?? useRouterState({ select: (s) => s.location })(),
30
- )
31
- })
32
-
33
- const matchIndex = useMatch({
34
- strict: false,
35
- select: (match) => match.index,
36
- })
37
-
38
- const getFromPath = (from?: string) =>
39
- createMemo(() => {
40
- const activeLocationMatches = router.matchRoutes(
41
- customActiveLocation() ?? activeLocation(),
42
- {
43
- _buildLocation: false,
44
- },
45
- )
46
-
47
- const activeLocationMatch = last(activeLocationMatches)
48
-
49
- return (
50
- from ??
51
- activeLocationMatch?.fullPath ??
52
- router.state.matches[matchIndex()]!.fullPath
53
- )
54
- })
55
-
56
- return {
57
- activeLocation,
58
- getFromPath,
59
- setActiveLocation: setCustomActiveLocation,
60
- }
61
- }