@vertesia/ui 1.3.0-dev.20260620.091720Z → 1.3.0-dev.20260621.091702Z
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/lib/router/Router.d.ts.map +1 -1
- package/lib/router/Router.js +7 -3
- package/lib/router/Router.js.map +1 -1
- package/lib/session/UserSession.d.ts.map +1 -1
- package/lib/session/UserSession.js +15 -7
- package/lib/session/UserSession.js.map +1 -1
- package/lib/session/auth/domainRouting.d.ts +10 -0
- package/lib/session/auth/domainRouting.d.ts.map +1 -1
- package/lib/session/auth/domainRouting.js +15 -0
- package/lib/session/auth/domainRouting.js.map +1 -1
- package/lib/shell/login/SigninScreen.js +9 -1
- package/lib/shell/login/SigninScreen.js.map +1 -1
- package/lib/vertesia-ui-router.js +1 -1
- package/lib/vertesia-ui-router.js.map +1 -1
- package/lib/vertesia-ui-session.js +1 -1
- package/lib/vertesia-ui-session.js.map +1 -1
- package/lib/vertesia-ui-shell.js +1 -1
- package/lib/vertesia-ui-shell.js.map +1 -1
- package/package.json +6 -6
- package/src/router/Router.tsx +7 -3
- package/src/session/UserSession.ts +15 -7
- package/src/session/auth/domainRouting.test.ts +28 -1
- package/src/session/auth/domainRouting.ts +16 -0
- package/src/shell/login/SigninScreen.tsx +9 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../src/router/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,KAAK,mBAAmB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAE,KAAK,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../src/router/Router.tsx"],"names":[],"mappings":"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"}
|
package/lib/router/Router.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createContext, useContext, useEffect } from 'react';
|
|
2
2
|
import { HistoryNavigator } from './HistoryNavigator';
|
|
3
3
|
import { PathMatcher } from './PathMatcher';
|
|
4
|
-
import { isRootPath, joinPath, stripMountBasename } from './path';
|
|
4
|
+
import { getMountBasename, isRootPath, joinPath, stripMountBasename } from './path';
|
|
5
5
|
export class BaseRouter {
|
|
6
6
|
// the path to use when navigating to the root of the router
|
|
7
7
|
index;
|
|
@@ -131,8 +131,12 @@ export function useNavigate() {
|
|
|
131
131
|
return navigate;
|
|
132
132
|
}
|
|
133
133
|
export function useRouterBasePath() {
|
|
134
|
-
const {
|
|
135
|
-
|
|
134
|
+
const { router } = useRouterContext();
|
|
135
|
+
// For a nested router the base is its mount segment within the parent. For a top-level router the
|
|
136
|
+
// base is the served `<base href>` mount prefix (empty for the origin-served Studio UI) — NOT the
|
|
137
|
+
// matched route, so apps can build mount-correct sibling links (e.g. `${base}/assistant`) and
|
|
138
|
+
// compare them against the full `useLocation().pathname`, which carries the mount.
|
|
139
|
+
return router instanceof NestedRouter ? router.basePath : getMountBasename();
|
|
136
140
|
}
|
|
137
141
|
export function useParams(arg) {
|
|
138
142
|
const { params } = useRouterContext();
|
package/lib/router/Router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAkD,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAwB,kBAAkB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/Router.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSession.d.ts","sourceRoot":"","sources":["../../src/session/UserSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AASzD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAEnF,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAIhE,MAAM,WAAW,uBAAuB;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,cAAM,WAAW;IACb,SAAS,UAAQ;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;gBAEjB,MAAM,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI;IAkBhF,IAAI,KAAK,0CAER;IAED,IAAI,IAAI,iCAGP;IAED,IAAI,OAAO,sDAGV;IAED,IAAI,OAAO,sDAEV;IAED,IAAI,QAAQ,wDAGX;IAED,IAAI,YAAY,oBAEf;IAED,IAAI,YAAY,oBASf;IAED;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAWnD,OAAO;IAKP,UAAU;IAIJ,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,uBAA4B;IAyBhE,UAAU;IAIV,MAAM;
|
|
1
|
+
{"version":3,"file":"UserSession.d.ts","sourceRoot":"","sources":["../../src/session/UserSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AASzD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAEnF,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAIhE,MAAM,WAAW,uBAAuB;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,cAAM,WAAW;IACb,SAAS,UAAQ;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;gBAEjB,MAAM,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI;IAkBhF,IAAI,KAAK,0CAER;IAED,IAAI,IAAI,iCAGP;IAED,IAAI,OAAO,sDAGV;IAED,IAAI,OAAO,sDAEV;IAED,IAAI,QAAQ,wDAGX;IAED,IAAI,YAAY,oBAEf;IAED,IAAI,YAAY,oBASf;IAED;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAWnD,OAAO;IAKP,UAAU;IAIJ,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,uBAA4B;IAyBhE,UAAU;IAIV,MAAM;IAyCA,aAAa,CAAC,eAAe,EAAE,MAAM;IAerC,aAAa,CAAC,eAAe,EAAE,MAAM;IAarC,aAAa;IAgBb,aAAa,CAAC,SAAS,EAAE,MAAM;IA2B/B,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB/C,KAAK;CAWR;AAED,QAAA,MAAM,kBAAkB,kDAAoD,CAAC;AAE7E,wBAAgB,cAAc,gBAO7B;AAED,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { Env } from '@vertesia/ui/env';
|
|
|
3
3
|
import { jwtDecode } from 'jwt-decode';
|
|
4
4
|
import { createContext, useContext } from 'react';
|
|
5
5
|
import { getComposableToken } from './auth/composable';
|
|
6
|
-
import { authReturnUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
|
|
6
|
+
import { authReturnUrl, mountRootUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
|
|
7
7
|
import { getFirebaseAuth } from './auth/firebase';
|
|
8
8
|
import { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY } from './constants';
|
|
9
9
|
export { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY };
|
|
@@ -134,12 +134,13 @@ class UserSession {
|
|
|
134
134
|
this.authToken = undefined;
|
|
135
135
|
this.setSession = undefined;
|
|
136
136
|
this.client.withAuthCallback(undefined);
|
|
137
|
-
// Navigate to root to avoid React rendering errors when
|
|
137
|
+
// Navigate to the app root to avoid React rendering errors when
|
|
138
138
|
// unmounting deeply nested route components during logout.
|
|
139
|
-
//
|
|
140
|
-
//
|
|
139
|
+
// Use the mount root (not bare '/') so a gateway-mounted app stays
|
|
140
|
+
// on its mount. Only navigate if user was actually logged in to
|
|
141
|
+
// avoid an infinite reload loop on fresh/incognito sessions.
|
|
141
142
|
if (wasLoggedIn) {
|
|
142
|
-
location.replace(
|
|
143
|
+
location.replace(mountRootUrl().toString());
|
|
143
144
|
}
|
|
144
145
|
}
|
|
145
146
|
}
|
|
@@ -153,13 +154,20 @@ class UserSession {
|
|
|
153
154
|
localStorage.removeItem(`${LastSelectedProjectId_KEY}-${this.account.id}`);
|
|
154
155
|
}
|
|
155
156
|
}
|
|
156
|
-
|
|
157
|
+
const url = mountRootUrl();
|
|
158
|
+
url.searchParams.set('a', targetAccountId);
|
|
159
|
+
window.location.replace(url.toString());
|
|
157
160
|
}
|
|
158
161
|
async switchProject(targetProjectId) {
|
|
159
162
|
if (this.account) {
|
|
160
163
|
localStorage.setItem(`${LastSelectedProjectId_KEY}-${this.account.id}`, targetProjectId);
|
|
161
164
|
}
|
|
162
|
-
|
|
165
|
+
const url = mountRootUrl();
|
|
166
|
+
if (this.account?.id) {
|
|
167
|
+
url.searchParams.set('a', this.account.id);
|
|
168
|
+
}
|
|
169
|
+
url.searchParams.set('p', targetProjectId);
|
|
170
|
+
window.location.replace(url.toString());
|
|
163
171
|
}
|
|
164
172
|
async fetchAccounts() {
|
|
165
173
|
return this.client.accounts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSession.js","sourceRoot":"","sources":["../../src/session/UserSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserSession.js","sourceRoot":"","sources":["../../src/session/UserSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,4 +20,14 @@ export declare function shouldRedirectToCentralAuth(_hostname?: string): boolean
|
|
|
20
20
|
* prefix of the live location, so the live URL is used unchanged — no behavior change there.
|
|
21
21
|
*/
|
|
22
22
|
export declare function authReturnUrl(): URL;
|
|
23
|
+
/**
|
|
24
|
+
* The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
|
|
25
|
+
*
|
|
26
|
+
* Used for full-reload navigations that intentionally reset to the app root (logout, account /
|
|
27
|
+
* project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
|
|
28
|
+
* lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
|
|
29
|
+
* the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
|
|
30
|
+
* behavior is unchanged.
|
|
31
|
+
*/
|
|
32
|
+
export declare function mountRootUrl(): URL;
|
|
23
33
|
//# sourceMappingURL=domainRouting.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domainRouting.d.ts","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KACtC;CACJ;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,WAEvD;AAED,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE,MAAM,WAE7D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAMnC"}
|
|
1
|
+
{"version":3,"file":"domainRouting.d.ts","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KACtC;CACJ;AAED,wBAAgB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,WAEvD;AAED,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE,MAAM,WAE7D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,IAAI,GAAG,CAKlC"}
|
|
@@ -25,4 +25,19 @@ export function authReturnUrl() {
|
|
|
25
25
|
target.hash = '';
|
|
26
26
|
return target;
|
|
27
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
* The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
|
|
30
|
+
*
|
|
31
|
+
* Used for full-reload navigations that intentionally reset to the app root (logout, account /
|
|
32
|
+
* project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
|
|
33
|
+
* lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
|
|
34
|
+
* the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
|
|
35
|
+
* behavior is unchanged.
|
|
36
|
+
*/
|
|
37
|
+
export function mountRootUrl() {
|
|
38
|
+
const url = new URL(document.baseURI);
|
|
39
|
+
url.hash = '';
|
|
40
|
+
url.search = '';
|
|
41
|
+
return url;
|
|
42
|
+
}
|
|
28
43
|
//# sourceMappingURL=domainRouting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domainRouting.js","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,qBAAqB,CAAC,SAAkB;IACpD,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,SAAkB;IAC1D,OAAO,CAAC,qBAAqB,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"domainRouting.js","sourceRoot":"","sources":["../../../src/session/auth/domainRouting.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,qBAAqB,CAAC,SAAkB;IACpD,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,SAAkB;IAC1D,OAAO,CAAC,qBAAqB,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa;IACzB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;IACjB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY;IACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;IACd,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;IAChB,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -41,7 +41,15 @@ function SigninScreenImpl({ isNested = false, lightLogo, darkLogo, preservePath,
|
|
|
41
41
|
const [pendingProvider, setPendingProvider] = useState(null);
|
|
42
42
|
useEffect(() => {
|
|
43
43
|
if (!preservePath) {
|
|
44
|
-
|
|
44
|
+
// Reset to the app's mount root, not the bare origin. A gateway-mounted app carries a
|
|
45
|
+
// served `<base href>` deep mount; collapsing to '/' drops the app off that mount (the
|
|
46
|
+
// bare origin serves no app) and the address bar can no longer be reloaded. This effect
|
|
47
|
+
// also flashes briefly for already-authenticated users during the loading transition, so
|
|
48
|
+
// a bare '/' here loses the URL even on a normal login. Deriving the root from
|
|
49
|
+
// `document.baseURI` keeps it inside the mount; for the origin-served Studio UI the
|
|
50
|
+
// pathname is '/', so the behavior is unchanged.
|
|
51
|
+
const mountRoot = new URL(document.baseURI).pathname || '/';
|
|
52
|
+
history.replaceState({}, '', mountRoot);
|
|
45
53
|
}
|
|
46
54
|
}, [preservePath]);
|
|
47
55
|
// Route based on authError surfaced by the session.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SigninScreen.js","sourceRoot":"","sources":["../../../src/shell/login/SigninScreen.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SigninScreen.js","sourceRoot":"","sources":["../../../src/shell/login/SigninScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{jsx as t,jsxs as e}from"react/jsx-runtime";import{useRef as n,useEffect as a,createContext as r,useContext as i,useState as s,useMemo as o}from"react";import{useSafeLayoutEffect as h}from"@vertesia/ui/core";class c{path;params;hash;constructor(t){let e=t.lastIndexOf("#");e>-1?(this.hash=t.substring(e),t=t.substring(0,e)):this.hash="",e=t.indexOf("?"),e>-1?(this.path=t.substring(0,e),this.params=new URLSearchParams(t.substring(e+1))):(this.path=t,this.params=new URLSearchParams)}add(t){for(const[e,n]of Object.entries(t))this.params.set(e,n);return this}toString(){return`${this.path}?${this.params.toString()}${this.hash}`}}function l(t){return"/"===t||""===t}function u(t,e){return e=t.endsWith("/")&&e.startsWith("/")?t+e.substring(1):t.endsWith("/")||e.startsWith("/")?t+e:`${t}/${e}`}function d(){if("undefined"==typeof document)return"";const t=document.querySelector("base[href]");if(!t)return"";try{return new URL(t.href,document.URL).pathname.replace(/\/+$/,"")}catch{return""}}function f(t){const e=d();return e&&t.startsWith("/")?t===e||t.startsWith(`${e}/`)?t:u(e,t):t}function m(t){const e=d();return e?t===e?"/":t.startsWith(`${e}/`)?t.slice(e.length)||"/":t:t}function p(t){if(""===t)return[];if("/"===t)return[""];let e=0,n=t.length;return t.startsWith("./")?e=2:t.startsWith("/")&&(e=1),t.endsWith("/")&&(n=t.length-1),(e>0||n<t.length?t.substring(e,n):t).split("/")}function w(t){if("string"==typeof t)return p(t);if(Array.isArray(t))return t;throw new Error(`Unsupported path object: ${t}`)}var g=Object.freeze({__proto__:null,getMountBasename:d,getPathSegments:p,isRootPath:l,joinPath:u,stripMountBasename:m,toSegments:w,withMountBasename:f});const v=Symbol("BASE_PATH");class P{name;type;location;state;_canceled=!1;constructor(t,e,n,a){this.name=t,this.type=e,this.location=n,this.state=a}get isPageLoad(){return"initial"===this.type}get isBackForward(){return"popState"===this.type}get isLinkClick(){return"linkClick"===this.type}get isNavigation(){return"navigate"===this.type}get isCancelable(){return"beforeChange"===this.name}cancel(){if("afterChange"===this.name)throw new Error("Cannot cancel afterChange event");this._canceled=!0}}class b extends P{constructor(t,e,n){super("beforeChange",t,e,n)}}class L extends P{constructor(t,e,n){super("afterChange",t,e,n)}}class y{stickyParams;_popStateListener;_linkNavListener;_listeners=[];addListener(t){this._listeners.push(t)}fireLocationChange(t){for(const e of this._listeners)e(t)}firePageLoad(){this.fireLocationChange(new L("initial",new URL(window.location.href)))}addStickyParams(t){return this.stickyParams?new c(t).add(this.stickyParams).toString():t}normalizeCurrentUrl(){if("undefined"==typeof window||!this.stickyParams)return;const t=window.location.pathname+window.location.search+window.location.hash,e=this.addStickyParams(t);if(e!==t){const t=new URL(e,window.location.href);window.history.replaceState(window.history.state,"",t.href)}}navigate(t,e={}){if(e.stepsBack&&e.stepsBack>0)this.stepBack(e.stepsBack,e);else{if(e.basePath){let n=e.basePath;n.startsWith("/")||(n=`/${n}`),t=u(n,t)}t=f(t=this.addStickyParams(t)),this._navigate(new URL(t,window.location.href),"navigate",e)}}stepBack(t,e={}){const n=window.history.state.historyChain||[],a=n.length>=t?new URL(n[n.length-t].href,window.location.href):new URL(window.location.origin,window.location.href);this._navigate(a,"popState",e);const r={from:window.location.href,historyChain:n.slice(0,-t),data:e.state||void 0,title:e.title||document.title};window.history.replaceState(r,"",a.href),this.fireLocationChange(new L("popState",a,e.state))}_navigate(t,e,n){const a=new b(e,t,n.state);if(this.fireLocationChange(a),a._canceled)return;const r=window.history.state,i={title:n.title||document.title,href:window.location.pathname+window.location.search+window.location.hash};let s=[];!n.replace&&r?.historyChain&&(s=[...r.historyChain]),n.replace||(s.push(i),s.length>10&&(s=s.slice(-10)));const o={from:window.location.href,historyChain:s,data:n.state||void 0,title:n.title||document.title};window.history[n.replace?"replaceState":"pushState"](o,"",t.href),this.fireLocationChange(new L(e,t,n.state))}start(){if("undefined"==typeof window)return;const t=t=>{let e;const n=new URL(window.location.href);let a;t.state?(e="popState",a=t.state.data):e="linkClick",this.fireLocationChange(new L(e,n,a))};this._popStateListener=t,this._linkNavListener=t=>{const e=t.target;if("a"===e.tagName.toLowerCase()&&(e.hasAttribute("download")||e.href?.startsWith("blob:")))return;const n=function(t){if(t&&"a"===t.tagName.toLowerCase()){const e=t?.href.trim();if("string"==typeof e&&e.length>0)return new URL(e)}return null}(e);if(n&&n.origin===window.location.origin){t.preventDefault();const e=new URL(this.addStickyParams(n.href)),a=t[v]||t.target[v];a&&(e.pathname=u(a,e.pathname)),this._navigate(e,"linkClick",{})}},window.addEventListener("popstate",t),document.body.addEventListener("click",this._linkNavListener)}stop(){this._popStateListener&&window.removeEventListener("popstate",this._popStateListener),this._linkNavListener&&document.body.removeEventListener("click",this._linkNavListener)}}function k({basePath:e,children:r}){const i=n(null);return a(()=>{if(i.current){const t=i.current,n=t=>{"a"===t.target.tagName.toLowerCase()&&(t[v]=e)};return t.addEventListener("click",n),()=>{t.removeEventListener("click",n)}}},[e]),t("div",{ref:i,className:"h-full w-full",children:r})}class S{tree=new _;loadMapping(t){for(const[e,n]of Object.entries(t))this.addSegments(p(e),n)}addPath(t,e){this.addSegments(p(t),e)}addSegments(t,e){let n=this.tree;for(let a=0,r=t.length;a<r;a++){const i=t[a];if(":"===i[0]){let e=n.wildcard;if(e){if(!(e instanceof x))throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard ":" segment will overwrite an existing wildcard segment at path: /${t.slice(0,a).join("/")}`)}else e=new x(i),n.wildcard=e;n=e}else{if("*"===i){if(n.wildcard)throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard "*" segment already exists at path: /${t.slice(0,a).join("/")}`);if(n.wildcard=new $(i,e),a<r-1)throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard segment must be the last segment`);return}{let t=n.children[i];t||(t=new R(i),n.children[i]=t),n=t}}}if(void 0!==n.value)throw new Error(`Failed to index path segments: ${t.join("/")}. A value already exists at path: /${t.join("/")}`);n.value=e}match(t){const e=w(t);if(0===e.length)return null;const n={};let a,r,i=this.tree;for(const t of e){const e=i.match(t,n);if(!e)return null;i=e}if(!i.value){if(i instanceof C&&i.wildcard instanceof $&&(i=i.wildcard.match("",n),!i.value))throw new Error("Wildcard segment node `*` must have a value");if(!i.value)return null}return n._&&n._.length>0?(a=e.slice(0,-n._.length),r=n._):a=e,{params:n,matchedSegments:a,remainingSegments:r,value:i.value}}}class C{name;value;children={};wildcard;constructor(t,e){this.name=t,this.value=e}match(t,e){const n=this.children[t];if(n)return n;if(this.wildcard){if(this.wildcard instanceof $)return this.wildcard.match(t,e);if(this.wildcard instanceof x)return e[this.wildcard.paramName]=t,this.wildcard;throw new Error(`Unknown wildcard segment node type: ${this.wildcard.constructor.name}`)}return null}}class _ extends C{constructor(){super("#root")}}class R extends C{}class x extends C{paramName;constructor(t,e){super(t,e),this.paramName=t.substring(1)}}class ${name;value;constructor(t,e){this.name=t,this.value=e}match(t,e){return e._?t&&e._.push(t):e._=t?[t]:[],this}}class E{index;matcher=new S;constructor(t,e){this.index=e;for(const e of t)this.matcher.addPath(e.path,e)}match(t){const e=l(t)&&this.index;return this.matcher.match(e?this.index:t)}}class N extends E{prompt;observer;navigator=new y;constructor(t,e){super(t),this.navigator.addListener(t=>{if((!t.isCancelable||!this.prompt?.when||window.confirm(this.prompt.message))&&(this.observer&&this.observer(t),"afterChange"===t.name)){const n=this.match(m(t.location.pathname));e(n?.value?{...n,state:t.state}:null)}})}getTopRouter(){return this}setStickyParams(t){this.navigator.stickyParams=null!=t?t:void 0,this.navigator.normalizeCurrentUrl()}withObserver(t){return this.observer=t,this}start(){this.navigator.start(),this.navigator.firePageLoad()}stop(){this.navigator.stop()}navigate(t,e){this.navigator.navigate(t,e)}}class j extends E{parent;basePath;constructor(t,e,n){super(n),this.parent=t,this.basePath=e}getTopRouter(){return this.parent instanceof N?this.parent:this.parent.getTopRouter()}navigate(t,e){let n;if(e?.isBasePathNested??!0){const a=e?.basePath;n=a?u(this.basePath,a):this.basePath,this.parent.navigate(t,{...e,basePath:n})}else this.parent.navigate(t,{...e,basePath:e?.basePath})}}const U=r(void 0);function W(){const t=i(U);if(!t)throw new Error("useRouter must be used within a RouterProvider");return t}function B(){const{navigate:t}=W();return t}function A(){const{matchedRoutePath:t,router:e}=W();return e instanceof j?e.basePath:t}function z(t){const{params:e}=W();return t?e[t]:e}function O(){const{location:t}=W();return t}function T(t){a(()=>{const e=document.title;return document.title=t,()=>{document.title=e}},[t])}function F(t){const{router:e}=W(),n=e.getTopRouter();a(()=>(n.prompt=t,()=>{n.prompt=void 0}),[t,n]),a(()=>{if(t.when){const e=t.when,n=t=>{e&&(t.preventDefault(),t.returnValue="")};return window.addEventListener("beforeunload",n),()=>{window.removeEventListener("beforeunload",n)}}},[t.when])}function D({children:e,to:n,onClick:a,replace:r=!0}){const i=B();return t("span",{onClick:t=>{const e=t.target.closest("a"),s=e?.getAttribute("href"),o=n??s;e&&o&&(t.stopPropagation(),t.preventDefault(),i(o,{replace:r}),a?.(t))},children:e})}function M({children:e,href:n,className:a,target:r,topLevelNav:i,clearBreadcrumbs:s=!1,replace:o,skipStickyParams:h}){const{router:c}=W(),l=!n||n.startsWith("#"),u=/^[a-z][a-z0-9+.-]*:/i.test(n)||n.startsWith("//")||!!r&&"_self"!==r,d=!l&&!u,m=d?f(h?n:c.getTopRouter().navigator.addStickyParams(n)):n;return t("a",{href:m,className:a,target:r,onClick:t=>{if(t.defaultPrevented||!d)return;t.stopPropagation(),t.preventDefault();(i?c.getTopRouter():c).navigate(n,{replace:o??s})},children:e})}function I({spinner:e}){const n=W(),a=n.route;if(a.Component){const e=a.Component;return t(e,{...n.params})}if(a.LazyComponent)return t(q,{route:a,spinner:e});throw new Error(`Invalid route for ${a.path}. Either Component or LazyCOmponent must be specified.`)}function q({route:e,spinner:n}){const[r,i]=s(null);return a(()=>{e.LazyComponent().then(t=>{if(!t.default)throw new Error(`Lazy module for ${e.path} does not have a default export`);i(()=>t.default)})},[e]),r?t(r,{}):n||null}function H({basePath:e,fixLinks:n=!1,children:a}){const r=W(),i=n?e=>t(k,{basePath:r.matchedRoutePath,children:e}):t=>t;return t(U.Provider,{value:{...r,navigate:(t,n)=>{if(!1===n?.isBasePathNested)return r.navigate(t,n);const a=n?.basePath?u(e,n.basePath):e;return r.navigate(t,{...n,basePath:a})}},children:i(a||t(I,{}))})}function V(){const t=W();return e("div",{children:["Route not found for path ",t.matchedRoutePath]})}function G(){return{params:{},matchedSegments:[],state:null,value:{path:"virtual:404",Component:()=>t(V,{})}}}function J({routes:e,index:a,children:r,fixLinks:i=!1}){const s=W(),h=n(s.matchedRoutePath),c=o(()=>{if("undefined"==typeof window)return null;const t=new j(s.router,h.current,e);return t.index=a,t},[s.router,a,e]),l=o(()=>{if(c&&s.matchedRoutePath===c.basePath)return c.match(s.remainingPath||"/")||G()},[s.matchedRoutePath,s.remainingPath,c]),u=i?e=>t(k,{basePath:s.matchedRoutePath,children:e}):t=>t;return l&&t(U.Provider,{value:{...s,router:c,route:l.value,params:l.params,matchedRoutePath:`/${l.matchedSegments.join("/")}`,remainingPath:l.remainingSegments?`/${l.remainingSegments.join("/")}`:void 0,navigate:(t,e)=>{if(c)return c.navigate(t,e)}},children:u(r||t(I,{}))})}function K({routes:e,index:n,onChange:a,children:r}){const[i,c]=s(void 0),l=o(()=>{if("undefined"==typeof window)return null;const t=new N(e,e=>{null===e&&(e=G()),c({location:window.location,route:e.value,params:e.params,state:e.state,router:t,matchedRoutePath:`/${e.matchedSegments.join("/")}`,remainingPath:e.remainingSegments?`/${e.remainingSegments.join("/")}`:void 0,navigate:(e,n)=>t.navigate(e,n)})}).withObserver(a);return t.index=n,t},[n,a,e]);return h(()=>(l?.start(),()=>{l?.stop()}),[l]),i&&t(U.Provider,{value:i,children:r||t(I,{})})}export{L as AfterLocationChangeEvent,v as BASE_PATH,E as BaseRouter,b as BeforeLocationChangeEvent,k as FixLinks,y as HistoryNavigator,P as LocationChangeEvent,D as Nav,M as NavLink,H as NestedNavigationContext,j as NestedRouter,J as NestedRouterProvider,g as Path,S as PathMatcher,U as ReactRouterContext,I as RouteComponent,N as Router,K as RouterProvider,O as useLocation,B as useNavigate,F as useNavigationPrompt,T as usePageTitle,z as useParams,A as useRouterBasePath,W as useRouterContext};
|
|
1
|
+
import{jsx as t,jsxs as e}from"react/jsx-runtime";import{useRef as n,useEffect as a,createContext as r,useContext as i,useState as s,useMemo as o}from"react";import{useSafeLayoutEffect as h}from"@vertesia/ui/core";class c{path;params;hash;constructor(t){let e=t.lastIndexOf("#");e>-1?(this.hash=t.substring(e),t=t.substring(0,e)):this.hash="",e=t.indexOf("?"),e>-1?(this.path=t.substring(0,e),this.params=new URLSearchParams(t.substring(e+1))):(this.path=t,this.params=new URLSearchParams)}add(t){for(const[e,n]of Object.entries(t))this.params.set(e,n);return this}toString(){return`${this.path}?${this.params.toString()}${this.hash}`}}function l(t){return"/"===t||""===t}function u(t,e){return e=t.endsWith("/")&&e.startsWith("/")?t+e.substring(1):t.endsWith("/")||e.startsWith("/")?t+e:`${t}/${e}`}function d(){if("undefined"==typeof document)return"";const t=document.querySelector("base[href]");if(!t)return"";try{return new URL(t.href,document.URL).pathname.replace(/\/+$/,"")}catch{return""}}function f(t){const e=d();return e&&t.startsWith("/")?t===e||t.startsWith(`${e}/`)?t:u(e,t):t}function m(t){const e=d();return e?t===e?"/":t.startsWith(`${e}/`)?t.slice(e.length)||"/":t:t}function p(t){if(""===t)return[];if("/"===t)return[""];let e=0,n=t.length;return t.startsWith("./")?e=2:t.startsWith("/")&&(e=1),t.endsWith("/")&&(n=t.length-1),(e>0||n<t.length?t.substring(e,n):t).split("/")}function w(t){if("string"==typeof t)return p(t);if(Array.isArray(t))return t;throw new Error(`Unsupported path object: ${t}`)}var g=Object.freeze({__proto__:null,getMountBasename:d,getPathSegments:p,isRootPath:l,joinPath:u,stripMountBasename:m,toSegments:w,withMountBasename:f});const v=Symbol("BASE_PATH");class P{name;type;location;state;_canceled=!1;constructor(t,e,n,a){this.name=t,this.type=e,this.location=n,this.state=a}get isPageLoad(){return"initial"===this.type}get isBackForward(){return"popState"===this.type}get isLinkClick(){return"linkClick"===this.type}get isNavigation(){return"navigate"===this.type}get isCancelable(){return"beforeChange"===this.name}cancel(){if("afterChange"===this.name)throw new Error("Cannot cancel afterChange event");this._canceled=!0}}class b extends P{constructor(t,e,n){super("beforeChange",t,e,n)}}class L extends P{constructor(t,e,n){super("afterChange",t,e,n)}}class y{stickyParams;_popStateListener;_linkNavListener;_listeners=[];addListener(t){this._listeners.push(t)}fireLocationChange(t){for(const e of this._listeners)e(t)}firePageLoad(){this.fireLocationChange(new L("initial",new URL(window.location.href)))}addStickyParams(t){return this.stickyParams?new c(t).add(this.stickyParams).toString():t}normalizeCurrentUrl(){if("undefined"==typeof window||!this.stickyParams)return;const t=window.location.pathname+window.location.search+window.location.hash,e=this.addStickyParams(t);if(e!==t){const t=new URL(e,window.location.href);window.history.replaceState(window.history.state,"",t.href)}}navigate(t,e={}){if(e.stepsBack&&e.stepsBack>0)this.stepBack(e.stepsBack,e);else{if(e.basePath){let n=e.basePath;n.startsWith("/")||(n=`/${n}`),t=u(n,t)}t=f(t=this.addStickyParams(t)),this._navigate(new URL(t,window.location.href),"navigate",e)}}stepBack(t,e={}){const n=window.history.state.historyChain||[],a=n.length>=t?new URL(n[n.length-t].href,window.location.href):new URL(window.location.origin,window.location.href);this._navigate(a,"popState",e);const r={from:window.location.href,historyChain:n.slice(0,-t),data:e.state||void 0,title:e.title||document.title};window.history.replaceState(r,"",a.href),this.fireLocationChange(new L("popState",a,e.state))}_navigate(t,e,n){const a=new b(e,t,n.state);if(this.fireLocationChange(a),a._canceled)return;const r=window.history.state,i={title:n.title||document.title,href:window.location.pathname+window.location.search+window.location.hash};let s=[];!n.replace&&r?.historyChain&&(s=[...r.historyChain]),n.replace||(s.push(i),s.length>10&&(s=s.slice(-10)));const o={from:window.location.href,historyChain:s,data:n.state||void 0,title:n.title||document.title};window.history[n.replace?"replaceState":"pushState"](o,"",t.href),this.fireLocationChange(new L(e,t,n.state))}start(){if("undefined"==typeof window)return;const t=t=>{let e;const n=new URL(window.location.href);let a;t.state?(e="popState",a=t.state.data):e="linkClick",this.fireLocationChange(new L(e,n,a))};this._popStateListener=t,this._linkNavListener=t=>{const e=t.target;if("a"===e.tagName.toLowerCase()&&(e.hasAttribute("download")||e.href?.startsWith("blob:")))return;const n=function(t){if(t&&"a"===t.tagName.toLowerCase()){const e=t?.href.trim();if("string"==typeof e&&e.length>0)return new URL(e)}return null}(e);if(n&&n.origin===window.location.origin){t.preventDefault();const e=new URL(this.addStickyParams(n.href)),a=t[v]||t.target[v];a&&(e.pathname=u(a,e.pathname)),this._navigate(e,"linkClick",{})}},window.addEventListener("popstate",t),document.body.addEventListener("click",this._linkNavListener)}stop(){this._popStateListener&&window.removeEventListener("popstate",this._popStateListener),this._linkNavListener&&document.body.removeEventListener("click",this._linkNavListener)}}function k({basePath:e,children:r}){const i=n(null);return a(()=>{if(i.current){const t=i.current,n=t=>{"a"===t.target.tagName.toLowerCase()&&(t[v]=e)};return t.addEventListener("click",n),()=>{t.removeEventListener("click",n)}}},[e]),t("div",{ref:i,className:"h-full w-full",children:r})}class S{tree=new _;loadMapping(t){for(const[e,n]of Object.entries(t))this.addSegments(p(e),n)}addPath(t,e){this.addSegments(p(t),e)}addSegments(t,e){let n=this.tree;for(let a=0,r=t.length;a<r;a++){const i=t[a];if(":"===i[0]){let e=n.wildcard;if(e){if(!(e instanceof x))throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard ":" segment will overwrite an existing wildcard segment at path: /${t.slice(0,a).join("/")}`)}else e=new x(i),n.wildcard=e;n=e}else{if("*"===i){if(n.wildcard)throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard "*" segment already exists at path: /${t.slice(0,a).join("/")}`);if(n.wildcard=new $(i,e),a<r-1)throw new Error(`Failed to index path segments: ${t.join("/")}. A wildcard segment must be the last segment`);return}{let t=n.children[i];t||(t=new R(i),n.children[i]=t),n=t}}}if(void 0!==n.value)throw new Error(`Failed to index path segments: ${t.join("/")}. A value already exists at path: /${t.join("/")}`);n.value=e}match(t){const e=w(t);if(0===e.length)return null;const n={};let a,r,i=this.tree;for(const t of e){const e=i.match(t,n);if(!e)return null;i=e}if(!i.value){if(i instanceof C&&i.wildcard instanceof $&&(i=i.wildcard.match("",n),!i.value))throw new Error("Wildcard segment node `*` must have a value");if(!i.value)return null}return n._&&n._.length>0?(a=e.slice(0,-n._.length),r=n._):a=e,{params:n,matchedSegments:a,remainingSegments:r,value:i.value}}}class C{name;value;children={};wildcard;constructor(t,e){this.name=t,this.value=e}match(t,e){const n=this.children[t];if(n)return n;if(this.wildcard){if(this.wildcard instanceof $)return this.wildcard.match(t,e);if(this.wildcard instanceof x)return e[this.wildcard.paramName]=t,this.wildcard;throw new Error(`Unknown wildcard segment node type: ${this.wildcard.constructor.name}`)}return null}}class _ extends C{constructor(){super("#root")}}class R extends C{}class x extends C{paramName;constructor(t,e){super(t,e),this.paramName=t.substring(1)}}class ${name;value;constructor(t,e){this.name=t,this.value=e}match(t,e){return e._?t&&e._.push(t):e._=t?[t]:[],this}}class E{index;matcher=new S;constructor(t,e){this.index=e;for(const e of t)this.matcher.addPath(e.path,e)}match(t){const e=l(t)&&this.index;return this.matcher.match(e?this.index:t)}}class N extends E{prompt;observer;navigator=new y;constructor(t,e){super(t),this.navigator.addListener(t=>{if((!t.isCancelable||!this.prompt?.when||window.confirm(this.prompt.message))&&(this.observer&&this.observer(t),"afterChange"===t.name)){const n=this.match(m(t.location.pathname));e(n?.value?{...n,state:t.state}:null)}})}getTopRouter(){return this}setStickyParams(t){this.navigator.stickyParams=null!=t?t:void 0,this.navigator.normalizeCurrentUrl()}withObserver(t){return this.observer=t,this}start(){this.navigator.start(),this.navigator.firePageLoad()}stop(){this.navigator.stop()}navigate(t,e){this.navigator.navigate(t,e)}}class j extends E{parent;basePath;constructor(t,e,n){super(n),this.parent=t,this.basePath=e}getTopRouter(){return this.parent instanceof N?this.parent:this.parent.getTopRouter()}navigate(t,e){let n;if(e?.isBasePathNested??!0){const a=e?.basePath;n=a?u(this.basePath,a):this.basePath,this.parent.navigate(t,{...e,basePath:n})}else this.parent.navigate(t,{...e,basePath:e?.basePath})}}const U=r(void 0);function W(){const t=i(U);if(!t)throw new Error("useRouter must be used within a RouterProvider");return t}function B(){const{navigate:t}=W();return t}function A(){const{router:t}=W();return t instanceof j?t.basePath:d()}function z(t){const{params:e}=W();return t?e[t]:e}function O(){const{location:t}=W();return t}function T(t){a(()=>{const e=document.title;return document.title=t,()=>{document.title=e}},[t])}function F(t){const{router:e}=W(),n=e.getTopRouter();a(()=>(n.prompt=t,()=>{n.prompt=void 0}),[t,n]),a(()=>{if(t.when){const e=t.when,n=t=>{e&&(t.preventDefault(),t.returnValue="")};return window.addEventListener("beforeunload",n),()=>{window.removeEventListener("beforeunload",n)}}},[t.when])}function D({children:e,to:n,onClick:a,replace:r=!0}){const i=B();return t("span",{onClick:t=>{const e=t.target.closest("a"),s=e?.getAttribute("href"),o=n??s;e&&o&&(t.stopPropagation(),t.preventDefault(),i(o,{replace:r}),a?.(t))},children:e})}function M({children:e,href:n,className:a,target:r,topLevelNav:i,clearBreadcrumbs:s=!1,replace:o,skipStickyParams:h}){const{router:c}=W(),l=!n||n.startsWith("#"),u=/^[a-z][a-z0-9+.-]*:/i.test(n)||n.startsWith("//")||!!r&&"_self"!==r,d=!l&&!u,m=d?f(h?n:c.getTopRouter().navigator.addStickyParams(n)):n;return t("a",{href:m,className:a,target:r,onClick:t=>{if(t.defaultPrevented||!d)return;t.stopPropagation(),t.preventDefault();(i?c.getTopRouter():c).navigate(n,{replace:o??s})},children:e})}function I({spinner:e}){const n=W(),a=n.route;if(a.Component){const e=a.Component;return t(e,{...n.params})}if(a.LazyComponent)return t(q,{route:a,spinner:e});throw new Error(`Invalid route for ${a.path}. Either Component or LazyCOmponent must be specified.`)}function q({route:e,spinner:n}){const[r,i]=s(null);return a(()=>{e.LazyComponent().then(t=>{if(!t.default)throw new Error(`Lazy module for ${e.path} does not have a default export`);i(()=>t.default)})},[e]),r?t(r,{}):n||null}function H({basePath:e,fixLinks:n=!1,children:a}){const r=W(),i=n?e=>t(k,{basePath:r.matchedRoutePath,children:e}):t=>t;return t(U.Provider,{value:{...r,navigate:(t,n)=>{if(!1===n?.isBasePathNested)return r.navigate(t,n);const a=n?.basePath?u(e,n.basePath):e;return r.navigate(t,{...n,basePath:a})}},children:i(a||t(I,{}))})}function V(){const t=W();return e("div",{children:["Route not found for path ",t.matchedRoutePath]})}function G(){return{params:{},matchedSegments:[],state:null,value:{path:"virtual:404",Component:()=>t(V,{})}}}function J({routes:e,index:a,children:r,fixLinks:i=!1}){const s=W(),h=n(s.matchedRoutePath),c=o(()=>{if("undefined"==typeof window)return null;const t=new j(s.router,h.current,e);return t.index=a,t},[s.router,a,e]),l=o(()=>{if(c&&s.matchedRoutePath===c.basePath)return c.match(s.remainingPath||"/")||G()},[s.matchedRoutePath,s.remainingPath,c]),u=i?e=>t(k,{basePath:s.matchedRoutePath,children:e}):t=>t;return l&&t(U.Provider,{value:{...s,router:c,route:l.value,params:l.params,matchedRoutePath:`/${l.matchedSegments.join("/")}`,remainingPath:l.remainingSegments?`/${l.remainingSegments.join("/")}`:void 0,navigate:(t,e)=>{if(c)return c.navigate(t,e)}},children:u(r||t(I,{}))})}function K({routes:e,index:n,onChange:a,children:r}){const[i,c]=s(void 0),l=o(()=>{if("undefined"==typeof window)return null;const t=new N(e,e=>{null===e&&(e=G()),c({location:window.location,route:e.value,params:e.params,state:e.state,router:t,matchedRoutePath:`/${e.matchedSegments.join("/")}`,remainingPath:e.remainingSegments?`/${e.remainingSegments.join("/")}`:void 0,navigate:(e,n)=>t.navigate(e,n)})}).withObserver(a);return t.index=n,t},[n,a,e]);return h(()=>(l?.start(),()=>{l?.stop()}),[l]),i&&t(U.Provider,{value:i,children:r||t(I,{})})}export{L as AfterLocationChangeEvent,v as BASE_PATH,E as BaseRouter,b as BeforeLocationChangeEvent,k as FixLinks,y as HistoryNavigator,P as LocationChangeEvent,D as Nav,M as NavLink,H as NestedNavigationContext,j as NestedRouter,J as NestedRouterProvider,g as Path,S as PathMatcher,U as ReactRouterContext,I as RouteComponent,N as Router,K as RouterProvider,O as useLocation,B as useNavigate,F as useNavigationPrompt,T as usePageTitle,z as useParams,A as useRouterBasePath,W as useRouterContext};
|
|
2
2
|
//# sourceMappingURL=vertesia-ui-router.js.map
|