@reidelsaltres/pureper 0.1.66 → 0.1.67
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.
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
declare global {
|
|
2
|
-
interface Window {
|
|
3
|
-
RouterConfig?: {
|
|
4
|
-
ASSET_PATH: string;
|
|
5
|
-
};
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
1
|
import UniHtml from "../component_api/UniHtml.js";
|
|
9
2
|
export interface Route<T extends UniHtml = UniHtml> {
|
|
10
3
|
route: string;
|
|
@@ -23,7 +16,7 @@ export declare abstract class Router {
|
|
|
23
16
|
static getPersistedRoute(): URL | null;
|
|
24
17
|
static clearPersistedRoute(): void;
|
|
25
18
|
static legacyRouteTo(route: string): void;
|
|
26
|
-
static tryRouteTo(url: URL): void;
|
|
19
|
+
static tryRouteTo(url: URL, pushState?: boolean): void;
|
|
27
20
|
static tryFindRoute(url: URL): Route;
|
|
28
21
|
static registerRoute<T extends UniHtml>(path: string, route: string, pageFactory: (search?: URLSearchParams) => T, inheritedRoute?: Route): Promise<Route>;
|
|
29
22
|
private static createPage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../src/foundation/worker/Router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../src/foundation/worker/Router.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,WAAW,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IAEb,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,CAAC,CAAC;CAC9C;AACD,oBAAY,UAAU;IACpB,OAAO,IAAA;IACP,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,EAAO,CAAC;AAClC,eAAO,MAAM,QAAQ,EAAE,MAAM,EAAO,CAAC;AAErC,8BAAsB,MAAM;WACZ,kBAAkB,CAAC,GAAG,EAAE,GAAG;WAO3B,iBAAiB,IAAI,GAAG,GAAG,IAAI;WAS/B,mBAAmB;WASnB,aAAa,CAAC,KAAK,EAAE,MAAM;WAM3B,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,GAAE,OAAc;WAc9C,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;WAQvB,aAAa,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,CAAC,EAC5H,cAAc,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAazC,OAAO,CAAC,MAAM,CAAC,UAAU;CAG1B"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
const globals = self;
|
|
2
1
|
export var AccessType;
|
|
3
2
|
(function (AccessType) {
|
|
4
3
|
AccessType[AccessType["OFFLINE"] = 0] = "OFFLINE";
|
|
@@ -40,12 +39,12 @@ export class Router {
|
|
|
40
39
|
window.location.replace(url.href);
|
|
41
40
|
}
|
|
42
41
|
}
|
|
43
|
-
static tryRouteTo(url) {
|
|
42
|
+
static tryRouteTo(url, pushState = true) {
|
|
44
43
|
try {
|
|
45
44
|
const found = this.tryFindRoute(url);
|
|
46
45
|
const page = this.createPage(found, url.searchParams);
|
|
47
46
|
page.load(document.getElementById('page'));
|
|
48
|
-
if (typeof window !== "undefined" && window.location) {
|
|
47
|
+
if (pushState && typeof window !== "undefined" && window.location) {
|
|
49
48
|
window.history.pushState(page, '', url.href);
|
|
50
49
|
}
|
|
51
50
|
}
|
|
@@ -72,6 +71,7 @@ export class Router {
|
|
|
72
71
|
return route.pageFactory(search);
|
|
73
72
|
}
|
|
74
73
|
}
|
|
74
|
+
//For SPA navigation
|
|
75
75
|
document.addEventListener('click', e => {
|
|
76
76
|
const target = e.target;
|
|
77
77
|
if (target) {
|
|
@@ -83,6 +83,16 @@ document.addEventListener('click', e => {
|
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
});
|
|
86
|
+
//For back/forward navigation
|
|
87
|
+
window.addEventListener('popstate', e => {
|
|
88
|
+
try {
|
|
89
|
+
const url = new URL(window.location.href);
|
|
90
|
+
Router.tryRouteTo(url, false);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
console.error('[Router] (popstate): failed to route to current location', error);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
86
96
|
window.addEventListener('DOMContentLoaded', () => {
|
|
87
97
|
const checkRoutes = () => {
|
|
88
98
|
const routes = ROUTES;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../src/foundation/worker/Router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../src/foundation/worker/Router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
|
-
// Add RouterConfig type to window for TypeScript
|
|
2
|
-
declare global {
|
|
3
|
-
interface Window {
|
|
4
|
-
RouterConfig?: { ASSET_PATH: string };
|
|
5
|
-
}
|
|
6
|
-
}
|
|
7
1
|
import UniHtml from "../component_api/UniHtml.js";
|
|
8
|
-
import { ServiceWorkerGlobalScope } from "./api/ServiceWorkerGlobalScope.js";
|
|
9
|
-
|
|
10
|
-
const globals = self as any as ServiceWorkerGlobalScope;
|
|
11
2
|
|
|
12
3
|
export interface Route<T extends UniHtml = UniHtml> {
|
|
13
4
|
route: string;
|
|
@@ -56,14 +47,14 @@ export abstract class Router {
|
|
|
56
47
|
window.location.replace(url.href);
|
|
57
48
|
}
|
|
58
49
|
}
|
|
59
|
-
public static tryRouteTo(url: URL) {
|
|
50
|
+
public static tryRouteTo(url: URL, pushState: boolean = true) {
|
|
60
51
|
try {
|
|
61
52
|
const found: Route = this.tryFindRoute(url);
|
|
62
53
|
const page: UniHtml = this.createPage(found, url.searchParams);
|
|
63
54
|
|
|
64
55
|
page.load(document.getElementById('page')!);
|
|
65
56
|
|
|
66
|
-
if (typeof window !== "undefined" && window.location) {
|
|
57
|
+
if (pushState && typeof window !== "undefined" && window.location) {
|
|
67
58
|
window.history.pushState(page, '', url.href);
|
|
68
59
|
}
|
|
69
60
|
} catch (error) {
|
|
@@ -92,12 +83,12 @@ export abstract class Router {
|
|
|
92
83
|
return Promise.resolve(routeObj);
|
|
93
84
|
}
|
|
94
85
|
|
|
95
|
-
|
|
96
86
|
private static createPage(route: Route, search?: URLSearchParams): UniHtml {
|
|
97
87
|
return route.pageFactory(search);
|
|
98
88
|
}
|
|
99
89
|
}
|
|
100
90
|
|
|
91
|
+
//For SPA navigation
|
|
101
92
|
document.addEventListener('click', e => {
|
|
102
93
|
const target = e.target as Element | null;
|
|
103
94
|
if (target) {
|
|
@@ -110,6 +101,16 @@ document.addEventListener('click', e => {
|
|
|
110
101
|
}
|
|
111
102
|
});
|
|
112
103
|
|
|
104
|
+
//For back/forward navigation
|
|
105
|
+
window.addEventListener('popstate', e => {
|
|
106
|
+
try {
|
|
107
|
+
const url = new URL(window.location.href);
|
|
108
|
+
Router.tryRouteTo(url, false);
|
|
109
|
+
} catch (error) {
|
|
110
|
+
console.error('[Router] (popstate): failed to route to current location', error);
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
|
|
113
114
|
window.addEventListener('DOMContentLoaded', () => {
|
|
114
115
|
const checkRoutes = () => {
|
|
115
116
|
const routes = ROUTES;
|