@vertesia/ui 1.3.0-dev.20260620.061059Z → 1.3.0-dev.20260621.071017Z
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/HistoryNavigator.d.ts.map +1 -1
- package/lib/router/HistoryNavigator.js +4 -1
- package/lib/router/HistoryNavigator.js.map +1 -1
- package/lib/router/Nav.d.ts.map +1 -1
- package/lib/router/Nav.js +7 -1
- package/lib/router/Nav.js.map +1 -1
- package/lib/router/Router.d.ts.map +1 -1
- package/lib/router/Router.js +9 -4
- package/lib/router/Router.js.map +1 -1
- package/lib/router/path.d.ts +15 -0
- package/lib/router/path.d.ts.map +1 -1
- package/lib/router/path.js +43 -0
- package/lib/router/path.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/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/package.json +6 -6
- package/src/router/HistoryNavigator.ts +4 -1
- package/src/router/Nav.tsx +7 -1
- package/src/router/Router.tsx +9 -4
- package/src/router/path.test.ts +87 -0
- package/src/router/path.ts +38 -0
- package/src/session/UserSession.ts +15 -7
- package/src/session/auth/domainRouting.test.ts +28 -1
- package/src/session/auth/domainRouting.ts +16 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HistoryNavigator.d.ts","sourceRoot":"","sources":["../../src/router/HistoryNavigator.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,SAAS,eAAsB,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG,aAAa,CAAC;AACrE,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AACnF,qBAAa,mBAAmB;IAGjB,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE,kBAAkB;IACxB,QAAQ,EAAE,GAAG;IACb,KAAK,CAAC,EAAE,OAAO;IAL1B,SAAS,UAAS;gBAEP,IAAI,EAAE,uBAAuB,EAC7B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,EACb,KAAK,CAAC,EAAE,OAAO,YAAA;IAG1B,IAAI,UAAU,YAEb;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,WAAW,YAEd;IAED,IAAI,YAAY,YAEf;IAED,IAAI,YAAY,YAEf;IAED,MAAM;CAMT;AAED,qBAAa,yBAA0B,SAAQ,mBAAmB;gBAClD,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO;CAGvE;AACD,qBAAa,wBAAyB,SAAQ,mBAAmB;gBACjD,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO;CAGvE;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD,qBAAa,gBAAgB;IAEzB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,CAAC;IAChD,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,IAAI,CAAC;IAC5C,UAAU,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC,EAAE,CAAM;IAE1D,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI;IAI1D,kBAAkB,CAAC,KAAK,EAAE,mBAAmB;IAM7C;;;OAGG;IACH,YAAY;IAIZ,eAAe,CAAC,IAAI,EAAE,MAAM;IAO5B;;;;;;;;OAQG;IACH,mBAAmB;IAYnB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB;
|
|
1
|
+
{"version":3,"file":"HistoryNavigator.d.ts","sourceRoot":"","sources":["../../src/router/HistoryNavigator.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,SAAS,eAAsB,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG,aAAa,CAAC;AACrE,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AACnF,qBAAa,mBAAmB;IAGjB,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE,kBAAkB;IACxB,QAAQ,EAAE,GAAG;IACb,KAAK,CAAC,EAAE,OAAO;IAL1B,SAAS,UAAS;gBAEP,IAAI,EAAE,uBAAuB,EAC7B,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,EACb,KAAK,CAAC,EAAE,OAAO,YAAA;IAG1B,IAAI,UAAU,YAEb;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,WAAW,YAEd;IAED,IAAI,YAAY,YAEf;IAED,IAAI,YAAY,YAEf;IAED,MAAM;CAMT;AAED,qBAAa,yBAA0B,SAAQ,mBAAmB;gBAClD,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO;CAGvE;AACD,qBAAa,wBAAyB,SAAQ,mBAAmB;gBACjD,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO;CAGvE;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD,qBAAa,gBAAgB;IAEzB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,CAAC;IAChD,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,IAAI,CAAC;IAC5C,UAAU,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC,EAAE,CAAM;IAE1D,WAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI;IAI1D,kBAAkB,CAAC,KAAK,EAAE,mBAAmB;IAM7C;;;OAGG;IACH,YAAY;IAIZ,eAAe,CAAC,IAAI,EAAE,MAAM;IAO5B;;;;;;;;OAQG;IACH,mBAAmB;IAYnB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB;IAoBlD,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB;IAmBrD,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,eAAe;IA6CrE,KAAK;IA6CL,IAAI;CAIP"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PathWithParams } from './PathWithParams';
|
|
2
|
-
import { joinPath } from './path';
|
|
2
|
+
import { joinPath, withMountBasename } from './path';
|
|
3
3
|
const BASE_PATH = Symbol('BASE_PATH');
|
|
4
4
|
export { BASE_PATH };
|
|
5
5
|
export class LocationChangeEvent {
|
|
@@ -115,6 +115,9 @@ export class HistoryNavigator {
|
|
|
115
115
|
to = joinPath(basePath, to);
|
|
116
116
|
}
|
|
117
117
|
to = this.addStickyParams(to);
|
|
118
|
+
// Keep absolute app routes under the served `<base href>` mount instead of resolving them
|
|
119
|
+
// against the bare origin (which collapses the URL off the mount). No-op when origin-served.
|
|
120
|
+
to = withMountBasename(to);
|
|
118
121
|
this._navigate(new URL(to, window.location.href), 'navigate', options);
|
|
119
122
|
}
|
|
120
123
|
stepBack(steps, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HistoryNavigator.js","sourceRoot":"","sources":["../../src/router/HistoryNavigator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"HistoryNavigator.js","sourceRoot":"","sources":["../../src/router/HistoryNavigator.ts"],"names":[],"mappings":"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"}
|
package/lib/router/Nav.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Nav.d.ts","sourceRoot":"","sources":["../../src/router/Nav.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Nav.d.ts","sourceRoot":"","sources":["../../src/router/Nav.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAI5C;;GAEG;AACH,UAAU,QAAQ;IACd,QAAQ,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IAC9C;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,IAAI,CAAC;IACvC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AACD,wBAAgB,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAc,EAAE,EAAE,QAAQ,+BAkBtE;AAED;;;GAGG;AACH,UAAU,YAAY;IAClB,QAAQ,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD,wBAAgB,OAAO,CAAC,EACpB,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,MAAM,EACN,WAAW,EACX,gBAAwB,EACxB,OAAO,EACP,gBAAgB,GACnB,EAAE,YAAY,+BA2Bd"}
|
package/lib/router/Nav.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { withMountBasename } from './path';
|
|
2
3
|
import { useNavigate, useRouterContext } from './Router';
|
|
3
4
|
export function Nav({ children, to, onClick, replace = true }) {
|
|
4
5
|
const navigate = useNavigate();
|
|
@@ -22,7 +23,12 @@ export function NavLink({ children, href, className, target, topLevelNav, clearB
|
|
|
22
23
|
const isAnchorOrEmpty = !href || href.startsWith('#');
|
|
23
24
|
const isExternal = /^[a-z][a-z0-9+.-]*:/i.test(href) || href.startsWith('//') || (!!target && target !== '_self');
|
|
24
25
|
const isInternal = !isAnchorOrEmpty && !isExternal;
|
|
25
|
-
|
|
26
|
+
// Keep the rendered href under the served `<base href>` mount (correct middle-click / hover /
|
|
27
|
+
// open-in-new-tab); the onClick navigates via the router which applies the same rule. No-op when
|
|
28
|
+
// origin-served (Studio UI). Click handler below passes the raw `href` — navigate() re-bases it.
|
|
29
|
+
const resolvedHref = isInternal
|
|
30
|
+
? withMountBasename(!skipStickyParams ? router.getTopRouter().navigator.addStickyParams(href) : href)
|
|
31
|
+
: href;
|
|
26
32
|
const _onClick = (ev) => {
|
|
27
33
|
if (ev.defaultPrevented || !isInternal) {
|
|
28
34
|
return;
|
package/lib/router/Nav.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Nav.js","sourceRoot":"","sources":["../../src/router/Nav.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAuBzD,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,EAAY;IACnE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAC,EAAkB,EAAE,EAAE;QACpC,MAAM,IAAI,GAAI,EAAE,CAAC,MAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,EAAE,IAAI,OAAO,CAAC;QAC7B,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YACjB,EAAE,CAAC,eAAe,EAAE,CAAC;YACrB,EAAE,CAAC,cAAc,EAAE,CAAC;YACpB,QAAQ,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACL,CAAC,CAAC;IACF,OAAO,CAGH,eAAM,OAAO,EAAE,QAAQ,YAAG,QAAQ,GAAQ,CAC7C,CAAC;AACN,CAAC;AAmBD,MAAM,UAAU,OAAO,CAAC,EACpB,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,MAAM,EACN,WAAW,EACX,gBAAgB,GAAG,KAAK,EACxB,OAAO,EACP,gBAAgB,GACL;IACX,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACtC,gGAAgG;IAChG,kGAAkG;IAClG,MAAM,eAAe,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC;IAClH,MAAM,UAAU,GAAG,CAAC,eAAe,IAAI,CAAC,UAAU,CAAC;IACnD,MAAM,YAAY,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Nav.js","sourceRoot":"","sources":["../../src/router/Nav.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAuBzD,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,EAAY;IACnE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAC,EAAkB,EAAE,EAAE;QACpC,MAAM,IAAI,GAAI,EAAE,CAAC,MAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,EAAE,IAAI,OAAO,CAAC;QAC7B,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YACjB,EAAE,CAAC,eAAe,EAAE,CAAC;YACrB,EAAE,CAAC,cAAc,EAAE,CAAC;YACpB,QAAQ,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACL,CAAC,CAAC;IACF,OAAO,CAGH,eAAM,OAAO,EAAE,QAAQ,YAAG,QAAQ,GAAQ,CAC7C,CAAC;AACN,CAAC;AAmBD,MAAM,UAAU,OAAO,CAAC,EACpB,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,MAAM,EACN,WAAW,EACX,gBAAgB,GAAG,KAAK,EACxB,OAAO,EACP,gBAAgB,GACL;IACX,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACtC,gGAAgG;IAChG,kGAAkG;IAClG,MAAM,eAAe,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC;IAClH,MAAM,UAAU,GAAG,CAAC,eAAe,IAAI,CAAC,UAAU,CAAC;IACnD,8FAA8F;IAC9F,iGAAiG;IACjG,iGAAiG;IACjG,MAAM,YAAY,GAAG,UAAU;QAC3B,CAAC,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrG,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,QAAQ,GAAG,CAAC,EAAkB,EAAE,EAAE;QACpC,IAAI,EAAE,CAAC,gBAAgB,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,OAAO;QACX,CAAC;QACD,EAAE,CAAC,eAAe,EAAE,CAAC;QACrB,EAAE,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAClE,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC;IACF,OAAO,CACH,YAAG,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,YACzE,QAAQ,GACT,CACP,CAAC;AACN,CAAC"}
|
|
@@ -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 } 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;
|
|
@@ -34,7 +34,8 @@ export class Router extends BaseRouter {
|
|
|
34
34
|
}
|
|
35
35
|
// only process afterChange events
|
|
36
36
|
if (event.name === 'afterChange') {
|
|
37
|
-
|
|
37
|
+
// Match app-relative: strip the served `<base href>` mount prefix (no-op when origin-served).
|
|
38
|
+
const match = this.match(stripMountBasename(event.location.pathname));
|
|
38
39
|
if (match?.value) {
|
|
39
40
|
updateState({
|
|
40
41
|
...match,
|
|
@@ -130,8 +131,12 @@ export function useNavigate() {
|
|
|
130
131
|
return navigate;
|
|
131
132
|
}
|
|
132
133
|
export function useRouterBasePath() {
|
|
133
|
-
const {
|
|
134
|
-
|
|
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();
|
|
135
140
|
}
|
|
136
141
|
export function useParams(arg) {
|
|
137
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,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/router/Router.tsx"],"names":[],"mappings":"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"}
|
package/lib/router/path.d.ts
CHANGED
|
@@ -3,6 +3,21 @@ export type PathMatchParams = Record<string, string> & {
|
|
|
3
3
|
};
|
|
4
4
|
export declare function isRootPath(path: string): path is "" | "/";
|
|
5
5
|
export declare function joinPath(path1: string, path2: string): string;
|
|
6
|
+
/**
|
|
7
|
+
* The mount base path from an explicit `<base href>` element, or `''` when there is none.
|
|
8
|
+
*
|
|
9
|
+
* Apps served under a deep gateway mount carry `<base href="/tenants/.../app/">`, injected at serve
|
|
10
|
+
* time. The router otherwise resolves absolute routes against the origin, which collapses the URL
|
|
11
|
+
* off the mount (and breaks in-app links). This returns the base pathname without a trailing slash
|
|
12
|
+
* so {@link withMountBasename} can keep navigation under the mount and {@link stripMountBasename}
|
|
13
|
+
* can match routes app-relative. The Studio UI has no `<base>` element, so this returns `''` and
|
|
14
|
+
* every caller becomes a no-op there.
|
|
15
|
+
*/
|
|
16
|
+
export declare function getMountBasename(): string;
|
|
17
|
+
/** Prepend the mount basename to an absolute app path (no-op when no mount, path is relative, or already prefixed). */
|
|
18
|
+
export declare function withMountBasename(path: string): string;
|
|
19
|
+
/** Strip the mount basename from a browser path so route patterns match app-relative (no-op when no mount). */
|
|
20
|
+
export declare function stripMountBasename(path: string): string;
|
|
6
21
|
export declare function getPathSegments(path: string): string[];
|
|
7
22
|
export declare function toSegments(path: string | string[]): string[];
|
|
8
23
|
//# sourceMappingURL=path.d.ts.map
|
package/lib/router/path.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/router/path.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnD,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,oBAEtC;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAWpD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,YAkB3C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,YAQjD"}
|
|
1
|
+
{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/router/path.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnD,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,oBAEtC;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAWpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CASzC;AAED,uHAAuH;AACvH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED,+GAA+G;AAC/G,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,YAkB3C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,YAQjD"}
|
package/lib/router/path.js
CHANGED
|
@@ -16,6 +16,49 @@ export function joinPath(path1, path2) {
|
|
|
16
16
|
}
|
|
17
17
|
return path2;
|
|
18
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* The mount base path from an explicit `<base href>` element, or `''` when there is none.
|
|
21
|
+
*
|
|
22
|
+
* Apps served under a deep gateway mount carry `<base href="/tenants/.../app/">`, injected at serve
|
|
23
|
+
* time. The router otherwise resolves absolute routes against the origin, which collapses the URL
|
|
24
|
+
* off the mount (and breaks in-app links). This returns the base pathname without a trailing slash
|
|
25
|
+
* so {@link withMountBasename} can keep navigation under the mount and {@link stripMountBasename}
|
|
26
|
+
* can match routes app-relative. The Studio UI has no `<base>` element, so this returns `''` and
|
|
27
|
+
* every caller becomes a no-op there.
|
|
28
|
+
*/
|
|
29
|
+
export function getMountBasename() {
|
|
30
|
+
if (typeof document === 'undefined')
|
|
31
|
+
return '';
|
|
32
|
+
const base = document.querySelector('base[href]');
|
|
33
|
+
if (!base)
|
|
34
|
+
return '';
|
|
35
|
+
try {
|
|
36
|
+
return new URL(base.href, document.URL).pathname.replace(/\/+$/, '');
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
return '';
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/** Prepend the mount basename to an absolute app path (no-op when no mount, path is relative, or already prefixed). */
|
|
43
|
+
export function withMountBasename(path) {
|
|
44
|
+
const base = getMountBasename();
|
|
45
|
+
if (!base || !path.startsWith('/'))
|
|
46
|
+
return path;
|
|
47
|
+
if (path === base || path.startsWith(`${base}/`))
|
|
48
|
+
return path;
|
|
49
|
+
return joinPath(base, path);
|
|
50
|
+
}
|
|
51
|
+
/** Strip the mount basename from a browser path so route patterns match app-relative (no-op when no mount). */
|
|
52
|
+
export function stripMountBasename(path) {
|
|
53
|
+
const base = getMountBasename();
|
|
54
|
+
if (!base)
|
|
55
|
+
return path;
|
|
56
|
+
if (path === base)
|
|
57
|
+
return '/';
|
|
58
|
+
if (path.startsWith(`${base}/`))
|
|
59
|
+
return path.slice(base.length) || '/';
|
|
60
|
+
return path;
|
|
61
|
+
}
|
|
19
62
|
export function getPathSegments(path) {
|
|
20
63
|
if (path === '') {
|
|
21
64
|
return [];
|
package/lib/router/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/router/path.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/router/path.ts"],"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":"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,YAAY,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAEnF,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEhE,MAAM,qBAAqB,GAAG,qCAAqC,CAAC;AAMpE,MAAM,WAAW;IACb,SAAS,GAAG,IAAI,CAAC;IACjB,MAAM,CAAiB;IACvB,SAAS,CAAS;IAClB,SAAS,CAAoB;IAC7B,UAAU,CAAkC;IAC5C,mBAAmB,CAAiB;IACpC,mBAAmB,CAAiB;IACpC,kBAAkB,CAAW;IAE7B,YAAY,MAAuB,EAAE,UAA2C;QAC5E,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,IAAI,cAAc,CAAC;gBAC7B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM;gBAC/B,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;gBAC5B,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG;aACpC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI;QACJ,eAAe;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO;QACP,eAAe;QACf,OAAO,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACnC,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ;QACR,eAAe;QACf,OAAO,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;IACpC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,GAAG,EAAE,QAAQ,CAAC;YAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAgC,CAAC;YACjE,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB;QAClB,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,GAAG,EAAE,QAAQ,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAgC,CAAC;QACjE,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,eAAe;QACf,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,UAAmC,EAAE;QAC5D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAgC,CAAC;QACjE,OAAO,CAAC,GAAG,CACP,iBAAiB,IAAI,CAAC,SAAS,EAAE,IAAI,iBAAiB,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,iBAAiB,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,GAAG,CACrM,CAAC;QAEF,yCAAyC;QACzC,YAAY,CAAC,OAAO,CAAC,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3E,YAAY,CAAC,OAAO,CAChB,GAAG,yBAAyB,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,EAC3D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CACnC,CAAC;QACF,mCAAmC;QACnC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9B,IAAI,OAAO,CAAC,oBAAoB,IAAI,IAAI,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,UAAU;QACN,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,MAAM;QACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAE3B,IAAI,2BAA2B,EAAE,EAAE,CAAC;YAChC,sCAAsC;YACtC,2CAA2C;YAC3C,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAExC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;YACnC,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC/B,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACJ,+BAA+B;YAC/B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACrC,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YACrC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,KAAK,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACxC,gEAAgE;YAChE,2DAA2D;YAC3D,mEAAmE;YACnE,gEAAgE;YAChE,6DAA6D;YAC7D,IAAI,WAAW,EAAE,CAAC;gBACd,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,eAAuB;QACvC,YAAY,CAAC,OAAO,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;QACjE,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,CAAC,GAAG,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7F,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACtB,YAAY,CAAC,UAAU,CAAC,GAAG,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,eAAuB;QACvC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,YAAY,CAAC,OAAO,CAAC,GAAG,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;QAC7F,CAAC;QAED,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC;YACnB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ;aACtB,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACnC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,GAAG,CAAC;QACd,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ;aACtB,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;aACjB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,SAAS,GAAG;gBACb,GAAG,IAAI,CAAC,SAAS;gBACjB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC/C,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;wBAC3B,OAAO;4BACH,GAAG,OAAO;4BACV,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC;yBACxE,CAAC;oBACN,CAAC;oBACD,OAAO,OAAO,CAAC;gBACnB,CAAC,CAAC;aACL,CAAC;YACF,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,GAAG,CAAC;QACd,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAC/C,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClE,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;YACrF,IAAI,cAAc,KAAK,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC1D,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK;QACD,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACrC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACvD,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC3C,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACrD,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AAED,MAAM,kBAAkB,GAAG,aAAa,CAA0B,SAAS,CAAC,CAAC;AAE7E,MAAM,UAAU,cAAc;IAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAE/C,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -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"}
|
|
@@ -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 d(t,e){return e=t.endsWith("/")&&e.startsWith("/")?t+e.substring(1):t.endsWith("/")||e.startsWith("/")?t+e:`${t}/${e}`}function u(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 m(t){if("string"==typeof t)return u(t);if(Array.isArray(t))return t;throw new Error(`Unsupported path object: ${t}`)}var f=Object.freeze({__proto__:null,getPathSegments:u,isRootPath:l,joinPath:d,toSegments:m});const p=Symbol("BASE_PATH");class w{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 g extends w{constructor(t,e,n){super("beforeChange",t,e,n)}}class v extends w{constructor(t,e,n){super("afterChange",t,e,n)}}class P{stickyParams;_popStateListener;_linkNavListener;_listeners=[];addListener(t){this._listeners.push(t)}fireLocationChange(t){for(const e of this._listeners)e(t)}firePageLoad(){this.fireLocationChange(new v("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=d(n,t)}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 v("popState",a,e.state))}_navigate(t,e,n){const a=new g(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 v(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 v(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[p]||t.target[p];a&&(e.pathname=d(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 b({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[p]=e)};return t.addEventListener("click",n),()=>{t.removeEventListener("click",n)}}},[e]),t("div",{ref:i,className:"h-full w-full",children:r})}class L{tree=new k;loadMapping(t){for(const[e,n]of Object.entries(t))this.addSegments(u(e),n)}addPath(t,e){this.addSegments(u(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 S))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 S(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 C(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=m(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 y&&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 y{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 S)return e[this.wildcard.paramName]=t,this.wildcard;throw new Error(`Unknown wildcard segment node type: ${this.wildcard.constructor.name}`)}return null}}class k extends y{constructor(){super("#root")}}class C extends y{}class S extends y{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 x{index;matcher=new L;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 R extends x{prompt;observer;navigator=new P;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(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 E extends x{parent;basePath;constructor(t,e,n){super(n),this.parent=t,this.basePath=e}getTopRouter(){return this.parent instanceof R?this.parent:this.parent.getTopRouter()}navigate(t,e){let n;if(e?.isBasePathNested??!0){const a=e?.basePath;n=a?d(this.basePath,a):this.basePath,this.parent.navigate(t,{...e,basePath:n})}else this.parent.navigate(t,{...e,basePath:e?.basePath})}}const $=r(void 0);function N(){const t=i($);if(!t)throw new Error("useRouter must be used within a RouterProvider");return t}function j(){const{navigate:t}=N();return t}function U(){const{matchedRoutePath:t,router:e}=N();return e instanceof E?e.basePath:t}function W(t){const{params:e}=N();return t?e[t]:e}function A(){const{location:t}=N();return t}function B(t){a(()=>{const e=document.title;return document.title=t,()=>{document.title=e}},[t])}function z(t){const{router:e}=N(),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 O({children:e,to:n,onClick:a,replace:r=!0}){const i=j();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 T({children:e,href:n,className:a,target:r,topLevelNav:i,clearBreadcrumbs:s=!1,replace:o,skipStickyParams:h}){const{router:c}=N(),l=!n||n.startsWith("#"),d=/^[a-z][a-z0-9+.-]*:/i.test(n)||n.startsWith("//")||!!r&&"_self"!==r,u=!l&&!d,m=!h&&u?c.getTopRouter().navigator.addStickyParams(n):n;return t("a",{href:m,className:a,target:r,onClick:t=>{if(t.defaultPrevented||!u)return;t.stopPropagation(),t.preventDefault();(i?c.getTopRouter():c).navigate(n,{replace:o??s})},children:e})}function F({spinner:e}){const n=N(),a=n.route;if(a.Component){const e=a.Component;return t(e,{...n.params})}if(a.LazyComponent)return t(D,{route:a,spinner:e});throw new Error(`Invalid route for ${a.path}. Either Component or LazyCOmponent must be specified.`)}function D({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 I({basePath:e,fixLinks:n=!1,children:a}){const r=N(),i=n?e=>t(b,{basePath:r.matchedRoutePath,children:e}):t=>t;return t($.Provider,{value:{...r,navigate:(t,n)=>{if(!1===n?.isBasePathNested)return r.navigate(t,n);const a=n?.basePath?d(e,n.basePath):e;return r.navigate(t,{...n,basePath:a})}},children:i(a||t(F,{}))})}function H(){const t=N();return e("div",{children:["Route not found for path ",t.matchedRoutePath]})}function M(){return{params:{},matchedSegments:[],state:null,value:{path:"virtual:404",Component:()=>t(H,{})}}}function V({routes:e,index:a,children:r,fixLinks:i=!1}){const s=N(),h=n(s.matchedRoutePath),c=o(()=>{if("undefined"==typeof window)return null;const t=new E(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||"/")||M()},[s.matchedRoutePath,s.remainingPath,c]),d=i?e=>t(b,{basePath:s.matchedRoutePath,children:e}):t=>t;return l&&t($.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:d(r||t(F,{}))})}function q({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 R(e,e=>{null===e&&(e=M()),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($.Provider,{value:i,children:r||t(F,{})})}export{v as AfterLocationChangeEvent,p as BASE_PATH,x as BaseRouter,g as BeforeLocationChangeEvent,b as FixLinks,P as HistoryNavigator,w as LocationChangeEvent,O as Nav,T as NavLink,I as NestedNavigationContext,E as NestedRouter,V as NestedRouterProvider,f as Path,L as PathMatcher,$ as ReactRouterContext,F as RouteComponent,R as Router,q as RouterProvider,A as useLocation,j as useNavigate,z as useNavigationPrompt,B as usePageTitle,W as useParams,U as useRouterBasePath,N 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
|