@tanstack/solid-router 2.0.0-alpha.2 → 2.0.0-alpha.3
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/Asset.cjs +124 -167
- package/dist/cjs/Asset.cjs.map +1 -1
- package/dist/cjs/CatchBoundary.cjs +52 -68
- package/dist/cjs/CatchBoundary.cjs.map +1 -1
- package/dist/cjs/ClientOnly.cjs +61 -39
- package/dist/cjs/ClientOnly.cjs.map +1 -1
- package/dist/cjs/HeadContent.cjs +35 -27
- package/dist/cjs/HeadContent.cjs.map +1 -1
- package/dist/cjs/HeadContent.dev.cjs +48 -41
- package/dist/cjs/HeadContent.dev.cjs.map +1 -1
- package/dist/cjs/Match.cjs +367 -442
- package/dist/cjs/Match.cjs.map +1 -1
- package/dist/cjs/Matches.cjs +114 -158
- package/dist/cjs/Matches.cjs.map +1 -1
- package/dist/cjs/RouterProvider.cjs +29 -41
- package/dist/cjs/RouterProvider.cjs.map +1 -1
- package/dist/cjs/SafeFragment.cjs +7 -5
- package/dist/cjs/SafeFragment.cjs.map +1 -1
- package/dist/cjs/ScriptOnce.cjs +20 -22
- package/dist/cjs/ScriptOnce.cjs.map +1 -1
- package/dist/cjs/Scripts.cjs +43 -58
- package/dist/cjs/Scripts.cjs.map +1 -1
- package/dist/cjs/ScrollRestoration.cjs +26 -28
- package/dist/cjs/ScrollRestoration.cjs.map +1 -1
- package/dist/cjs/Transitioner.cjs +91 -124
- package/dist/cjs/Transitioner.cjs.map +1 -1
- package/dist/cjs/_virtual/_rolldown/runtime.cjs +23 -0
- package/dist/cjs/awaited.cjs +31 -53
- package/dist/cjs/awaited.cjs.map +1 -1
- package/dist/cjs/fileRoute.cjs +96 -91
- package/dist/cjs/fileRoute.cjs.map +1 -1
- package/dist/cjs/fileRoute.d.cts +2 -2
- package/dist/cjs/headContentUtils.cjs +132 -170
- package/dist/cjs/headContentUtils.cjs.map +1 -1
- package/dist/cjs/index.cjs +245 -176
- package/dist/cjs/index.dev.cjs +245 -176
- package/dist/cjs/lazyRouteComponent.cjs +48 -54
- package/dist/cjs/lazyRouteComponent.cjs.map +1 -1
- package/dist/cjs/link.cjs +310 -345
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/matchContext.cjs +9 -23
- package/dist/cjs/matchContext.cjs.map +1 -1
- package/dist/cjs/not-found.cjs +26 -34
- package/dist/cjs/not-found.cjs.map +1 -1
- package/dist/cjs/renderRouteNotFound.cjs +23 -16
- package/dist/cjs/renderRouteNotFound.cjs.map +1 -1
- package/dist/cjs/route.cjs +200 -215
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/router.cjs +18 -16
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/routerContext.cjs +8 -22
- package/dist/cjs/routerContext.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.cjs +25 -35
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/ssr/RouterClient.cjs +18 -23
- package/dist/cjs/ssr/RouterClient.cjs.map +1 -1
- package/dist/cjs/ssr/RouterServer.cjs +10 -10
- package/dist/cjs/ssr/RouterServer.cjs.map +1 -1
- package/dist/cjs/ssr/client.cjs +2 -4
- package/dist/cjs/ssr/defaultRenderHandler.cjs +12 -16
- package/dist/cjs/ssr/defaultRenderHandler.cjs.map +1 -1
- package/dist/cjs/ssr/defaultStreamHandler.cjs +13 -18
- package/dist/cjs/ssr/defaultStreamHandler.cjs.map +1 -1
- package/dist/cjs/ssr/renderRouterToStream.cjs +26 -54
- package/dist/cjs/ssr/renderRouterToStream.cjs.map +1 -1
- package/dist/cjs/ssr/renderRouterToString.cjs +33 -57
- package/dist/cjs/ssr/renderRouterToString.cjs.map +1 -1
- package/dist/cjs/ssr/server.cjs +18 -18
- package/dist/cjs/useBlocker.cjs +140 -177
- package/dist/cjs/useBlocker.cjs.map +1 -1
- package/dist/cjs/useBlocker.d.cts +8 -5
- package/dist/cjs/useCanGoBack.cjs +6 -5
- package/dist/cjs/useCanGoBack.cjs.map +1 -1
- package/dist/cjs/useLoaderData.cjs +12 -11
- package/dist/cjs/useLoaderData.cjs.map +1 -1
- package/dist/cjs/useLoaderDeps.cjs +12 -14
- package/dist/cjs/useLoaderDeps.cjs.map +1 -1
- package/dist/cjs/useLocation.cjs +6 -7
- package/dist/cjs/useLocation.cjs.map +1 -1
- package/dist/cjs/useMatch.cjs +25 -46
- package/dist/cjs/useMatch.cjs.map +1 -1
- package/dist/cjs/useNavigate.cjs +20 -38
- package/dist/cjs/useNavigate.cjs.map +1 -1
- package/dist/cjs/useParams.cjs +14 -13
- package/dist/cjs/useParams.cjs.map +1 -1
- package/dist/cjs/useRouteContext.cjs +9 -8
- package/dist/cjs/useRouteContext.cjs.map +1 -1
- package/dist/cjs/useRouter.cjs +13 -26
- package/dist/cjs/useRouter.cjs.map +1 -1
- package/dist/cjs/useRouterState.cjs +38 -45
- package/dist/cjs/useRouterState.cjs.map +1 -1
- package/dist/cjs/useSearch.cjs +13 -12
- package/dist/cjs/useSearch.cjs.map +1 -1
- package/dist/cjs/utils.cjs +57 -49
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/esm/Asset.js +122 -166
- package/dist/esm/Asset.js.map +1 -1
- package/dist/esm/CatchBoundary.js +48 -50
- package/dist/esm/CatchBoundary.js.map +1 -1
- package/dist/esm/ClientOnly.js +58 -22
- package/dist/esm/ClientOnly.js.map +1 -1
- package/dist/esm/HeadContent.dev.js +46 -40
- package/dist/esm/HeadContent.dev.js.map +1 -1
- package/dist/esm/HeadContent.js +33 -26
- package/dist/esm/HeadContent.js.map +1 -1
- package/dist/esm/Match.js +359 -422
- package/dist/esm/Match.js.map +1 -1
- package/dist/esm/Matches.js +107 -142
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/RouterProvider.js +26 -40
- package/dist/esm/RouterProvider.js.map +1 -1
- package/dist/esm/SafeFragment.js +6 -5
- package/dist/esm/SafeFragment.js.map +1 -1
- package/dist/esm/ScriptOnce.js +18 -21
- package/dist/esm/ScriptOnce.js.map +1 -1
- package/dist/esm/Scripts.js +42 -58
- package/dist/esm/Scripts.js.map +1 -1
- package/dist/esm/ScrollRestoration.js +25 -29
- package/dist/esm/ScrollRestoration.js.map +1 -1
- package/dist/esm/Transitioner.js +87 -105
- package/dist/esm/Transitioner.js.map +1 -1
- package/dist/esm/awaited.js +28 -36
- package/dist/esm/awaited.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +2 -2
- package/dist/esm/fileRoute.js +90 -92
- package/dist/esm/fileRoute.js.map +1 -1
- package/dist/esm/headContentUtils.js +129 -152
- package/dist/esm/headContentUtils.js.map +1 -1
- package/dist/esm/index.dev.js +15 -115
- package/dist/esm/index.js +17 -116
- package/dist/esm/lazyRouteComponent.js +46 -53
- package/dist/esm/lazyRouteComponent.js.map +1 -1
- package/dist/esm/link.js +306 -329
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/matchContext.js +7 -7
- package/dist/esm/matchContext.js.map +1 -1
- package/dist/esm/not-found.js +23 -33
- package/dist/esm/not-found.js.map +1 -1
- package/dist/esm/renderRouteNotFound.js +20 -15
- package/dist/esm/renderRouteNotFound.js.map +1 -1
- package/dist/esm/route.js +193 -218
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.js +17 -17
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/routerContext.js +6 -5
- package/dist/esm/routerContext.js.map +1 -1
- package/dist/esm/scroll-restoration.js +23 -34
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/ssr/RouterClient.js +16 -22
- package/dist/esm/ssr/RouterClient.js.map +1 -1
- package/dist/esm/ssr/RouterServer.js +9 -10
- package/dist/esm/ssr/RouterServer.js.map +1 -1
- package/dist/esm/ssr/client.js +1 -4
- package/dist/esm/ssr/defaultRenderHandler.js +11 -15
- package/dist/esm/ssr/defaultRenderHandler.js.map +1 -1
- package/dist/esm/ssr/defaultStreamHandler.js +12 -17
- package/dist/esm/ssr/defaultStreamHandler.js.map +1 -1
- package/dist/esm/ssr/renderRouterToStream.js +23 -36
- package/dist/esm/ssr/renderRouterToStream.js.map +1 -1
- package/dist/esm/ssr/renderRouterToString.js +31 -40
- package/dist/esm/ssr/renderRouterToString.js.map +1 -1
- package/dist/esm/ssr/server.js +3 -10
- package/dist/esm/useBlocker.d.ts +8 -5
- package/dist/esm/useBlocker.js +136 -159
- package/dist/esm/useBlocker.js.map +1 -1
- package/dist/esm/useCanGoBack.js +6 -5
- package/dist/esm/useCanGoBack.js.map +1 -1
- package/dist/esm/useLoaderData.js +12 -11
- package/dist/esm/useLoaderData.js.map +1 -1
- package/dist/esm/useLoaderDeps.js +12 -14
- package/dist/esm/useLoaderDeps.js.map +1 -1
- package/dist/esm/useLocation.js +6 -7
- package/dist/esm/useLocation.js.map +1 -1
- package/dist/esm/useMatch.js +21 -28
- package/dist/esm/useMatch.js.map +1 -1
- package/dist/esm/useNavigate.js +18 -22
- package/dist/esm/useNavigate.js.map +1 -1
- package/dist/esm/useParams.js +14 -13
- package/dist/esm/useParams.js.map +1 -1
- package/dist/esm/useRouteContext.js +9 -8
- package/dist/esm/useRouteContext.js.map +1 -1
- package/dist/esm/useRouter.js +9 -8
- package/dist/esm/useRouter.js.map +1 -1
- package/dist/esm/useRouterState.js +36 -44
- package/dist/esm/useRouterState.js.map +1 -1
- package/dist/esm/useSearch.js +13 -12
- package/dist/esm/useSearch.js.map +1 -1
- package/dist/esm/utils.js +55 -33
- package/dist/esm/utils.js.map +1 -1
- package/dist/source/fileRoute.d.ts +2 -2
- package/dist/source/useBlocker.d.ts +8 -5
- package/dist/source/useBlocker.jsx +2 -2
- package/dist/source/useBlocker.jsx.map +1 -1
- package/package.json +3 -3
- package/src/fileRoute.ts +2 -2
- package/src/useBlocker.tsx +15 -10
- package/dist/cjs/index.cjs.map +0 -1
- package/dist/cjs/index.dev.cjs.map +0 -1
- package/dist/cjs/ssr/client.cjs.map +0 -1
- package/dist/cjs/ssr/server.cjs.map +0 -1
- package/dist/esm/index.dev.js.map +0 -1
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/ssr/client.js.map +0 -1
- package/dist/esm/ssr/server.js.map +0 -1
package/dist/cjs/link.cjs
CHANGED
|
@@ -1,361 +1,326 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (e) {
|
|
14
|
-
for (const k in e) {
|
|
15
|
-
if (k !== "default") {
|
|
16
|
-
const d = Object.getOwnPropertyDescriptor(e, k);
|
|
17
|
-
Object.defineProperty(n, k, d.get ? d : {
|
|
18
|
-
enumerable: true,
|
|
19
|
-
get: () => e[k]
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
n.default = e;
|
|
25
|
-
return Object.freeze(n);
|
|
26
|
-
}
|
|
27
|
-
const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
|
|
28
|
-
var _tmpl$ = /* @__PURE__ */ Solid$1.template(`<svg><a>`);
|
|
1
|
+
const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
|
|
2
|
+
const require_ClientOnly = require("./ClientOnly.cjs");
|
|
3
|
+
const require_useRouter = require("./useRouter.cjs");
|
|
4
|
+
const require_useRouterState = require("./useRouterState.cjs");
|
|
5
|
+
const require_utils = require("./utils.cjs");
|
|
6
|
+
let _tanstack_router_core = require("@tanstack/router-core");
|
|
7
|
+
let _solidjs_web = require("@solidjs/web");
|
|
8
|
+
let solid_js = require("solid-js");
|
|
9
|
+
solid_js = require_runtime.__toESM(solid_js);
|
|
10
|
+
let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
|
|
11
|
+
//#region src/link.tsx
|
|
12
|
+
var _tmpl$ = /* @__PURE__ */ (0, _solidjs_web.template)(`<svg><a>`);
|
|
29
13
|
function mergeRefs(...refs) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
ref(el);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
};
|
|
14
|
+
return (el) => {
|
|
15
|
+
for (const ref of refs) if (typeof ref === "function") ref(el);
|
|
16
|
+
};
|
|
37
17
|
}
|
|
38
18
|
function splitProps(props, keys) {
|
|
39
|
-
|
|
19
|
+
return [props, solid_js.omit(props, ...keys)];
|
|
40
20
|
}
|
|
41
|
-
|
|
21
|
+
var timeoutMap = /* @__PURE__ */ new WeakMap();
|
|
42
22
|
function useLinkProps(options) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
...isActive() && {
|
|
300
|
-
"data-status": "active",
|
|
301
|
-
"aria-current": "page"
|
|
302
|
-
},
|
|
303
|
-
...isTransitioning() && {
|
|
304
|
-
"data-transitioning": "transitioning"
|
|
305
|
-
}
|
|
306
|
-
};
|
|
307
|
-
});
|
|
23
|
+
const router = require_useRouter.useRouter();
|
|
24
|
+
const [isTransitioning, setIsTransitioning] = solid_js.createSignal(false);
|
|
25
|
+
const shouldHydrateHash = !_tanstack_router_core_isServer.isServer && !!router.options.ssr;
|
|
26
|
+
const hasHydrated = require_ClientOnly.useHydrated();
|
|
27
|
+
let hasRenderFetched = false;
|
|
28
|
+
const [local, rest] = splitProps(solid_js.merge({
|
|
29
|
+
activeProps: () => ({ class: "active" }),
|
|
30
|
+
inactiveProps: () => ({})
|
|
31
|
+
}, options), [
|
|
32
|
+
"activeProps",
|
|
33
|
+
"inactiveProps",
|
|
34
|
+
"activeOptions",
|
|
35
|
+
"to",
|
|
36
|
+
"preload",
|
|
37
|
+
"preloadDelay",
|
|
38
|
+
"hashScrollIntoView",
|
|
39
|
+
"replace",
|
|
40
|
+
"startTransition",
|
|
41
|
+
"resetScroll",
|
|
42
|
+
"viewTransition",
|
|
43
|
+
"target",
|
|
44
|
+
"disabled",
|
|
45
|
+
"style",
|
|
46
|
+
"class",
|
|
47
|
+
"onClick",
|
|
48
|
+
"onBlur",
|
|
49
|
+
"onFocus",
|
|
50
|
+
"onMouseEnter",
|
|
51
|
+
"onMouseLeave",
|
|
52
|
+
"onMouseOver",
|
|
53
|
+
"onMouseOut",
|
|
54
|
+
"onTouchStart",
|
|
55
|
+
"ignoreBlocker"
|
|
56
|
+
]);
|
|
57
|
+
const [_, propsSafeToSpread] = splitProps(rest, [
|
|
58
|
+
"params",
|
|
59
|
+
"search",
|
|
60
|
+
"hash",
|
|
61
|
+
"state",
|
|
62
|
+
"mask",
|
|
63
|
+
"reloadDocument",
|
|
64
|
+
"unsafeRelative"
|
|
65
|
+
]);
|
|
66
|
+
const currentLocation = require_useRouterState.useRouterState({ select: (s) => s.location });
|
|
67
|
+
const buildLocationKey = require_useRouterState.useRouterState({ select: (s) => {
|
|
68
|
+
const leaf = s.matches[s.matches.length - 1];
|
|
69
|
+
return {
|
|
70
|
+
search: leaf?.search,
|
|
71
|
+
hash: s.location.hash,
|
|
72
|
+
path: leaf?.pathname
|
|
73
|
+
};
|
|
74
|
+
} });
|
|
75
|
+
const from = options.from;
|
|
76
|
+
const _options = () => {
|
|
77
|
+
return {
|
|
78
|
+
...options,
|
|
79
|
+
from
|
|
80
|
+
};
|
|
81
|
+
};
|
|
82
|
+
const next = solid_js.createMemo(() => {
|
|
83
|
+
buildLocationKey();
|
|
84
|
+
return router.buildLocation(_options());
|
|
85
|
+
});
|
|
86
|
+
const hrefOption = solid_js.createMemo(() => {
|
|
87
|
+
if (_options().disabled) return void 0;
|
|
88
|
+
const location = next().maskedLocation ?? next();
|
|
89
|
+
const publicHref = location.publicHref;
|
|
90
|
+
if (location.external) return {
|
|
91
|
+
href: publicHref,
|
|
92
|
+
external: true
|
|
93
|
+
};
|
|
94
|
+
return {
|
|
95
|
+
href: router.history.createHref(publicHref) || "/",
|
|
96
|
+
external: false
|
|
97
|
+
};
|
|
98
|
+
});
|
|
99
|
+
const externalLink = solid_js.createMemo(() => {
|
|
100
|
+
const _href = hrefOption();
|
|
101
|
+
if (_href?.external) {
|
|
102
|
+
if ((0, _tanstack_router_core.isDangerousProtocol)(_href.href, router.protocolAllowlist)) {
|
|
103
|
+
if (process.env.NODE_ENV !== "production") console.warn(`Blocked Link with dangerous protocol: ${_href.href}`);
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
return _href.href;
|
|
107
|
+
}
|
|
108
|
+
const to = _options().to;
|
|
109
|
+
if (typeof to === "string" && to.charCodeAt(0) === 47 && to.charCodeAt(1) !== 47) return void 0;
|
|
110
|
+
try {
|
|
111
|
+
new URL(to);
|
|
112
|
+
if ((0, _tanstack_router_core.isDangerousProtocol)(to, router.protocolAllowlist)) {
|
|
113
|
+
if (process.env.NODE_ENV !== "production") console.warn(`Blocked Link with dangerous protocol: ${to}`);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
return to;
|
|
117
|
+
} catch {}
|
|
118
|
+
});
|
|
119
|
+
const preload = solid_js.createMemo(() => {
|
|
120
|
+
if (_options().reloadDocument || externalLink()) return false;
|
|
121
|
+
return local.preload ?? router.options.defaultPreload;
|
|
122
|
+
});
|
|
123
|
+
const preloadDelay = () => local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0;
|
|
124
|
+
const isActive = solid_js.createMemo(() => {
|
|
125
|
+
if (externalLink()) return false;
|
|
126
|
+
if (local.activeOptions?.exact) {
|
|
127
|
+
if (!(0, _tanstack_router_core.exactPathTest)(currentLocation().pathname, next().pathname, router.basepath)) return false;
|
|
128
|
+
} else {
|
|
129
|
+
const currentPathSplit = (0, _tanstack_router_core.removeTrailingSlash)(currentLocation().pathname, router.basepath).split("/");
|
|
130
|
+
if (!((0, _tanstack_router_core.removeTrailingSlash)(next()?.pathname, router.basepath)?.split("/"))?.every((d, i) => d === currentPathSplit[i])) return false;
|
|
131
|
+
}
|
|
132
|
+
if (local.activeOptions?.includeSearch ?? true) {
|
|
133
|
+
if (!(0, _tanstack_router_core.deepEqual)(currentLocation().search, next().search, {
|
|
134
|
+
partial: !local.activeOptions?.exact,
|
|
135
|
+
ignoreUndefined: !local.activeOptions?.explicitUndefined
|
|
136
|
+
})) return false;
|
|
137
|
+
}
|
|
138
|
+
if (local.activeOptions?.includeHash) return (shouldHydrateHash && !hasHydrated() ? "" : currentLocation().hash) === next().hash;
|
|
139
|
+
return true;
|
|
140
|
+
});
|
|
141
|
+
const doPreload = () => router.preloadRoute(_options()).catch((err) => {
|
|
142
|
+
console.warn(err);
|
|
143
|
+
console.warn(_tanstack_router_core.preloadWarning);
|
|
144
|
+
});
|
|
145
|
+
const preloadViewportIoCallback = (entry) => {
|
|
146
|
+
if (entry?.isIntersecting) doPreload();
|
|
147
|
+
};
|
|
148
|
+
const [ref, setRefSignal] = solid_js.createSignal(null);
|
|
149
|
+
const setRef = (el) => {
|
|
150
|
+
solid_js.runWithOwner(null, () => {
|
|
151
|
+
setRefSignal(el);
|
|
152
|
+
});
|
|
153
|
+
};
|
|
154
|
+
require_utils.useIntersectionObserver(ref, preloadViewportIoCallback, { rootMargin: "100px" }, { disabled: !!local.disabled || !(solid_js.untrack(preload) === "viewport") });
|
|
155
|
+
solid_js.createEffect(preload, (preloadValue) => {
|
|
156
|
+
if (hasRenderFetched) return;
|
|
157
|
+
if (!local.disabled && preloadValue === "render") {
|
|
158
|
+
doPreload();
|
|
159
|
+
hasRenderFetched = true;
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
if (solid_js.untrack(externalLink)) return solid_js.merge(propsSafeToSpread, { href: externalLink() }, splitProps(local, [
|
|
163
|
+
"target",
|
|
164
|
+
"disabled",
|
|
165
|
+
"style",
|
|
166
|
+
"class",
|
|
167
|
+
"onClick",
|
|
168
|
+
"onBlur",
|
|
169
|
+
"onFocus",
|
|
170
|
+
"onMouseEnter",
|
|
171
|
+
"onMouseLeave",
|
|
172
|
+
"onMouseOut",
|
|
173
|
+
"onMouseOver",
|
|
174
|
+
"onTouchStart"
|
|
175
|
+
])[0]);
|
|
176
|
+
const handleClick = (e) => {
|
|
177
|
+
const elementTarget = e.currentTarget.getAttribute("target");
|
|
178
|
+
const effectiveTarget = local.target !== void 0 ? local.target : elementTarget;
|
|
179
|
+
if (!local.disabled && !isCtrlEvent(e) && !e.defaultPrevented && (!effectiveTarget || effectiveTarget === "_self") && e.button === 0) {
|
|
180
|
+
e.preventDefault();
|
|
181
|
+
setIsTransitioning(true);
|
|
182
|
+
const unsub = router.subscribe("onResolved", () => {
|
|
183
|
+
unsub();
|
|
184
|
+
setIsTransitioning(false);
|
|
185
|
+
});
|
|
186
|
+
router.navigate({
|
|
187
|
+
..._options(),
|
|
188
|
+
replace: local.replace,
|
|
189
|
+
resetScroll: local.resetScroll,
|
|
190
|
+
hashScrollIntoView: local.hashScrollIntoView,
|
|
191
|
+
startTransition: local.startTransition,
|
|
192
|
+
viewTransition: local.viewTransition,
|
|
193
|
+
ignoreBlocker: local.ignoreBlocker
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
const enqueueIntentPreload = (e) => {
|
|
198
|
+
if (local.disabled || preload() !== "intent") return;
|
|
199
|
+
if (!preloadDelay()) {
|
|
200
|
+
doPreload();
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
const eventTarget = e.currentTarget || e.target;
|
|
204
|
+
if (!eventTarget || timeoutMap.has(eventTarget)) return;
|
|
205
|
+
timeoutMap.set(eventTarget, setTimeout(() => {
|
|
206
|
+
timeoutMap.delete(eventTarget);
|
|
207
|
+
doPreload();
|
|
208
|
+
}, preloadDelay()));
|
|
209
|
+
};
|
|
210
|
+
const handleTouchStart = (_) => {
|
|
211
|
+
if (local.disabled || preload() !== "intent") return;
|
|
212
|
+
doPreload();
|
|
213
|
+
};
|
|
214
|
+
const handleLeave = (e) => {
|
|
215
|
+
if (local.disabled) return;
|
|
216
|
+
const eventTarget = e.currentTarget || e.target;
|
|
217
|
+
if (eventTarget) {
|
|
218
|
+
const id = timeoutMap.get(eventTarget);
|
|
219
|
+
clearTimeout(id);
|
|
220
|
+
timeoutMap.delete(eventTarget);
|
|
221
|
+
}
|
|
222
|
+
};
|
|
223
|
+
/** Call a JSX.EventHandlerUnion with the event. */
|
|
224
|
+
function callHandler(event, handler) {
|
|
225
|
+
if (handler) if (typeof handler === "function") handler(event);
|
|
226
|
+
else handler[0](handler[1], event);
|
|
227
|
+
return event.defaultPrevented;
|
|
228
|
+
}
|
|
229
|
+
function composeEventHandlers(handlers) {
|
|
230
|
+
return (event) => {
|
|
231
|
+
for (const handler of handlers) callHandler(event, handler);
|
|
232
|
+
};
|
|
233
|
+
}
|
|
234
|
+
const resolvedActiveProps = () => isActive() ? (0, _tanstack_router_core.functionalUpdate)(local.activeProps, {}) ?? {} : {};
|
|
235
|
+
const resolvedInactiveProps = () => isActive() ? {} : (0, _tanstack_router_core.functionalUpdate)(local.inactiveProps, {});
|
|
236
|
+
const resolvedClassName = () => [
|
|
237
|
+
local.class,
|
|
238
|
+
resolvedActiveProps().class,
|
|
239
|
+
resolvedInactiveProps().class
|
|
240
|
+
].filter(Boolean).join(" ");
|
|
241
|
+
const resolvedStyle = () => ({
|
|
242
|
+
...local.style,
|
|
243
|
+
...resolvedActiveProps().style,
|
|
244
|
+
...resolvedInactiveProps().style
|
|
245
|
+
});
|
|
246
|
+
return solid_js.merge(propsSafeToSpread, resolvedActiveProps, resolvedInactiveProps, () => {
|
|
247
|
+
return {
|
|
248
|
+
href: hrefOption()?.href,
|
|
249
|
+
ref: mergeRefs(setRef, _options().ref),
|
|
250
|
+
onClick: composeEventHandlers([local.onClick, handleClick]),
|
|
251
|
+
onBlur: composeEventHandlers([local.onBlur, handleLeave]),
|
|
252
|
+
onFocus: composeEventHandlers([local.onFocus, enqueueIntentPreload]),
|
|
253
|
+
onMouseEnter: composeEventHandlers([local.onMouseEnter, enqueueIntentPreload]),
|
|
254
|
+
onMouseOver: composeEventHandlers([local.onMouseOver, enqueueIntentPreload]),
|
|
255
|
+
onMouseLeave: composeEventHandlers([local.onMouseLeave, handleLeave]),
|
|
256
|
+
onMouseOut: composeEventHandlers([local.onMouseOut, handleLeave]),
|
|
257
|
+
onTouchStart: composeEventHandlers([local.onTouchStart, handleTouchStart]),
|
|
258
|
+
disabled: !!local.disabled,
|
|
259
|
+
target: local.target,
|
|
260
|
+
...(() => {
|
|
261
|
+
const s = resolvedStyle();
|
|
262
|
+
return Object.keys(s).length ? { style: s } : {};
|
|
263
|
+
})(),
|
|
264
|
+
...(() => {
|
|
265
|
+
const c = resolvedClassName();
|
|
266
|
+
return c ? { class: c } : {};
|
|
267
|
+
})(),
|
|
268
|
+
...local.disabled && {
|
|
269
|
+
role: "link",
|
|
270
|
+
"aria-disabled": "true"
|
|
271
|
+
},
|
|
272
|
+
...isActive() && {
|
|
273
|
+
"data-status": "active",
|
|
274
|
+
"aria-current": "page"
|
|
275
|
+
},
|
|
276
|
+
...isTransitioning() && { "data-transitioning": "transitioning" }
|
|
277
|
+
};
|
|
278
|
+
});
|
|
308
279
|
}
|
|
309
280
|
function createLink(Comp) {
|
|
310
|
-
|
|
311
|
-
_asChild: Comp
|
|
312
|
-
}));
|
|
281
|
+
return (props) => (0, _solidjs_web.createComponent)(Link, (0, _solidjs_web.mergeProps)(props, { _asChild: Comp }));
|
|
313
282
|
}
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
}
|
|
345
|
-
}, linkProps, {
|
|
346
|
-
get children() {
|
|
347
|
-
return children();
|
|
348
|
-
}
|
|
349
|
-
}));
|
|
283
|
+
var Link = (props) => {
|
|
284
|
+
const [local, rest] = splitProps(props, ["_asChild", "children"]);
|
|
285
|
+
const [_, linkProps] = splitProps(useLinkProps(rest), ["type"]);
|
|
286
|
+
const resolvedChildren = solid_js.children(() => local.children);
|
|
287
|
+
const children = () => {
|
|
288
|
+
const ch = resolvedChildren();
|
|
289
|
+
if (typeof ch === "function") return ch({
|
|
290
|
+
get isActive() {
|
|
291
|
+
return linkProps["data-status"] === "active";
|
|
292
|
+
},
|
|
293
|
+
get isTransitioning() {
|
|
294
|
+
return linkProps["data-transitioning"] === "transitioning";
|
|
295
|
+
}
|
|
296
|
+
});
|
|
297
|
+
return ch;
|
|
298
|
+
};
|
|
299
|
+
if (local._asChild === "svg") {
|
|
300
|
+
const [_, svgLinkProps] = splitProps(linkProps, ["class"]);
|
|
301
|
+
return (() => {
|
|
302
|
+
var _el$ = _tmpl$(), _el$2 = _el$.firstChild;
|
|
303
|
+
(0, _solidjs_web.spread)(_el$2, svgLinkProps, false, true);
|
|
304
|
+
(0, _solidjs_web.insert)(_el$2, children);
|
|
305
|
+
return _el$;
|
|
306
|
+
})();
|
|
307
|
+
}
|
|
308
|
+
return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, (0, _solidjs_web.mergeProps)({ get component() {
|
|
309
|
+
return (0, _solidjs_web.memo)(() => !!local._asChild)() ? local._asChild : "a";
|
|
310
|
+
} }, linkProps, { get children() {
|
|
311
|
+
return children();
|
|
312
|
+
} }));
|
|
350
313
|
};
|
|
351
314
|
function isCtrlEvent(e) {
|
|
352
|
-
|
|
315
|
+
return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
|
|
353
316
|
}
|
|
354
|
-
|
|
355
|
-
|
|
317
|
+
var linkOptions = (options) => {
|
|
318
|
+
return options;
|
|
356
319
|
};
|
|
320
|
+
//#endregion
|
|
357
321
|
exports.Link = Link;
|
|
358
322
|
exports.createLink = createLink;
|
|
359
323
|
exports.linkOptions = linkOptions;
|
|
360
324
|
exports.useLinkProps = useLinkProps;
|
|
361
|
-
|
|
325
|
+
|
|
326
|
+
//# sourceMappingURL=link.cjs.map
|