@trebired/frontend 11.6.4 → 11.7.1
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/CHANGELOG.md +14 -0
- package/dist/http/index.d.ts +6 -0
- package/dist/http/index.d.ts.map +1 -1
- package/dist/http/index.js +46 -17
- package/dist/http/index.js.map +1 -1
- package/dist/progress/index.d.ts +9 -3
- package/dist/progress/index.d.ts.map +1 -1
- package/dist/progress/index.js +77 -8
- package/dist/progress/index.js.map +1 -1
- package/dist/spa/navigate.d.ts.map +1 -1
- package/dist/spa/navigate.js +23 -11
- package/dist/spa/navigate.js.map +1 -1
- package/dist/src/http/index.d.ts +6 -0
- package/dist/src/http/index.d.ts.map +1 -1
- package/dist/src/http/index.js +46 -17
- package/dist/src/http/index.js.map +1 -1
- package/dist/src/progress/index.d.ts +9 -3
- package/dist/src/progress/index.d.ts.map +1 -1
- package/dist/src/progress/index.js +77 -8
- package/dist/src/progress/index.js.map +1 -1
- package/dist/src/spa/navigate.d.ts.map +1 -1
- package/dist/src/spa/navigate.js +23 -11
- package/dist/src/spa/navigate.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,20 @@ All notable changes to `@trebired/frontend` will be documented here.
|
|
|
4
4
|
|
|
5
5
|
This project follows semantic versioning once published.
|
|
6
6
|
|
|
7
|
+
## 11.7.1
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- The top progress bar now starts during full page loads through the normal frontend runtime binding.
|
|
12
|
+
- Browser `fetch()` requests are wrapped once by the progress runtime, so ordinary GET/POST requests show the same top loader. `csrfFetch()` and `requestJson()` still support `progress: false` and strip that internal option before calling the native fetch implementation.
|
|
13
|
+
|
|
14
|
+
## 11.7.0
|
|
15
|
+
|
|
16
|
+
### Fixed
|
|
17
|
+
|
|
18
|
+
- Soft navigation shows the progress bar. `softRedirect()`, `softReload()`, and `softRefresh()` fetch a document and swap the page in place, but never touched the progress handle, so replacing a full page load also removed all of its loading feedback. They now drive the same bar a document load would.
|
|
19
|
+
- JSON requests show the progress bar by default. `progress.begin()`/`end()` was called from exactly one place, `actions/request.ts`, so anything going through `requestJson()` directly — every non-action fetch in an app — ran with no indication. `requestJson()` now drives it, with `progress: false` to opt out. The handle is refcounted, so callers that already wrap a request do not double-count and overlapping requests keep the bar up until the last one settles.
|
|
20
|
+
|
|
7
21
|
## 11.6.4
|
|
8
22
|
|
|
9
23
|
### Fixed
|
package/dist/http/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
type CsrfFetchOptions = RequestInit & {
|
|
2
2
|
csrfHeaderName?: string;
|
|
3
3
|
csrfMetaName?: string;
|
|
4
|
+
progress?: boolean;
|
|
4
5
|
};
|
|
5
6
|
type JsonRequestOptions = Omit<CsrfFetchOptions, "body"> & {
|
|
6
7
|
body?: BodyInit | Record<string, unknown> | null;
|
|
@@ -21,6 +22,11 @@ declare function fallbackJsonFromStatus(status: number, ok: boolean): {
|
|
|
21
22
|
status: number;
|
|
22
23
|
status_code: string;
|
|
23
24
|
};
|
|
25
|
+
/**
|
|
26
|
+
* Every JSON request shows the progress bar unless the caller opts out with
|
|
27
|
+
* `progress: false`. The handle is refcounted, so a caller that already wrapped
|
|
28
|
+
* the request does not double-count and the bar clears when the last one ends.
|
|
29
|
+
*/
|
|
24
30
|
declare function requestJson(input: RequestInfo | URL, options?: JsonRequestOptions): Promise<{
|
|
25
31
|
json: any;
|
|
26
32
|
response: Response;
|
package/dist/http/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"AAEA,KAAK,gBAAgB,GAAG,WAAW,GAAE;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAE;IACxD,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAC,IAAI,CAAC;CAChD,CAAC;AAEF,iBAAS,aAAa,CAAC,QAAQ,SAAe,UAK7C;AAED,iBAAS,mBAAmB,CAC1B,IAAI,EAAE,eAAe,GAAG,IAAI,EAC5B,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,WAmBxD;AAED,iBAAe,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,GAAE,gBAAqB,qBAuB7E;AAsBD,iBAAS,2BAA2B,CAAC,OAAO,GAAE,kBAAuB,eAkBpE;AAED,iBAAe,YAAY,CAAC,QAAQ,EAAE,QAAQ,gBAM7C;AAED,iBAAS,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO;;;;;;;EAS1D;AAED;;;;GAIG;AACH,iBAAe,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,OAAO,GAAE,kBAAuB;;;GAiBpF;AAED,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,CAAC;AACF,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;AACrD,cAAa,YAAY,CAAC"}
|
package/dist/http/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { progress as progressHandle } from "../progress/index.js";
|
|
1
2
|
function readCsrfToken(metaName = "csrf-token") {
|
|
2
3
|
if (typeof document === "undefined")
|
|
3
4
|
return "";
|
|
@@ -24,17 +25,28 @@ function ensureFormCsrfToken(form, options = {}) {
|
|
|
24
25
|
form.appendChild(input);
|
|
25
26
|
return true;
|
|
26
27
|
}
|
|
27
|
-
function csrfFetch(input, init = {}) {
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const
|
|
28
|
+
async function csrfFetch(input, init = {}) {
|
|
29
|
+
const { csrfHeaderName, csrfMetaName, progress: progressOption, ...fetchInit } = init;
|
|
30
|
+
const headers = new Headers(fetchInit.headers || {});
|
|
31
|
+
const token = readCsrfToken(csrfMetaName);
|
|
32
|
+
const headerName = csrfHeaderName || "X-CSRF-Token";
|
|
31
33
|
if (token)
|
|
32
34
|
headers.set(headerName, token);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
const showProgress = progressOption !== false;
|
|
36
|
+
if (showProgress)
|
|
37
|
+
progressHandle.begin();
|
|
38
|
+
try {
|
|
39
|
+
return await fetch(input, {
|
|
40
|
+
...fetchInit,
|
|
41
|
+
credentials: fetchInit.credentials || "same-origin",
|
|
42
|
+
headers,
|
|
43
|
+
progress: false,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
if (showProgress)
|
|
48
|
+
progressHandle.end();
|
|
49
|
+
}
|
|
38
50
|
}
|
|
39
51
|
function isFormDataBody(value) {
|
|
40
52
|
return Boolean(value &&
|
|
@@ -90,15 +102,32 @@ function fallbackJsonFromStatus(status, ok) {
|
|
|
90
102
|
status_code: "",
|
|
91
103
|
};
|
|
92
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* Every JSON request shows the progress bar unless the caller opts out with
|
|
107
|
+
* `progress: false`. The handle is refcounted, so a caller that already wrapped
|
|
108
|
+
* the request does not double-count and the bar clears when the last one ends.
|
|
109
|
+
*/
|
|
93
110
|
async function requestJson(input, options = {}) {
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
111
|
+
const showProgress = options.progress !== false;
|
|
112
|
+
if (showProgress)
|
|
113
|
+
progressHandle.begin();
|
|
114
|
+
try {
|
|
115
|
+
const response = await csrfFetch(input, {
|
|
116
|
+
...normalizeJsonRequestOptions(options),
|
|
117
|
+
progress: false,
|
|
118
|
+
});
|
|
119
|
+
const json = await readJsonSafe(response);
|
|
120
|
+
if (json && typeof json.ok === "boolean")
|
|
121
|
+
return { json, response };
|
|
122
|
+
return {
|
|
123
|
+
json: fallbackJsonFromStatus(response.status, response.ok),
|
|
124
|
+
response,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
finally {
|
|
128
|
+
if (showProgress)
|
|
129
|
+
progressHandle.end();
|
|
130
|
+
}
|
|
102
131
|
}
|
|
103
132
|
export { csrfFetch, ensureFormCsrfToken, fallbackJsonFromStatus, normalizeJsonRequestOptions, readCsrfToken, readJsonSafe, requestJson, };
|
|
104
133
|
export * from "./paged.js";
|
package/dist/http/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"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"}
|
package/dist/progress/index.d.ts
CHANGED
|
@@ -10,14 +10,20 @@ type ProgressHandle = {
|
|
|
10
10
|
type PageLoadProgressOptions = {
|
|
11
11
|
minVisibleMs?: number;
|
|
12
12
|
};
|
|
13
|
+
type ProgressFetchInit = RequestInit & {
|
|
14
|
+
progress?: boolean;
|
|
15
|
+
tbfProgress?: boolean;
|
|
16
|
+
};
|
|
13
17
|
declare function setProgress(value: number): number;
|
|
14
18
|
declare function beginProgress(): number;
|
|
15
19
|
declare function endProgress(force?: boolean): number;
|
|
16
20
|
declare function setProgressFromEvent(event: ProgressEvent): number;
|
|
17
|
-
declare function bindProgress(): ProgressHandle;
|
|
18
21
|
declare function bootPageLoadProgress(options?: PageLoadProgressOptions): boolean;
|
|
22
|
+
declare function stripProgressFetchOptions(init: RequestInit | undefined): RequestInit;
|
|
23
|
+
declare function bindFetchProgress(): boolean;
|
|
24
|
+
declare function bindProgress(): ProgressHandle;
|
|
19
25
|
declare const progress: ProgressHandle;
|
|
20
|
-
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, };
|
|
21
|
-
export type { PageLoadProgressOptions, ProgressHandle };
|
|
26
|
+
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindFetchProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, stripProgressFetchOptions, };
|
|
27
|
+
export type { PageLoadProgressOptions, ProgressFetchInit, ProgressHandle };
|
|
22
28
|
export * from "./bars.js";
|
|
23
29
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,iBAAgC,CAAC;AAClD,QAAA,MAAM,mBAAmB,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,iBAAgC,CAAC;AAClD,QAAA,MAAM,mBAAmB,OAAO,CAAC;AAGjC,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IACjC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAC/B,oBAAoB,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,MAAM,CAAC;CACxD,CAAC;AACF,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,KAAK,iBAAiB,GAAG,WAAW,GAAE;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AA8BF,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,UAUjC;AAED,iBAAS,aAAa,WAQrB;AAED,iBAAS,WAAW,CAAC,KAAK,UAAQ,UAwBjC;AAED,iBAAS,oBAAoB,CAAC,KAAK,EAAE,aAAa,UAMjD;AAED,iBAAS,oBAAoB,CAAC,OAAO,GAAE,uBAA4B,WA6ClE;AAQD,iBAAS,yBAAyB,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,eAM/D;AAED,iBAAS,iBAAiB,YA6BzB;AAED,iBAAS,YAAY,mBAKpB;AAED,QAAA,MAAM,QAAQ,EAAE,cAMd,CAAC;AAEH,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,WAAW,EACX,oBAAoB,EACpB,yBAAyB,GAC1B,CAAC;AACF,YAAY,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC;AAC3E,cAAa,WAAW,CAAC"}
|
package/dist/progress/index.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { FRONTEND_PREFIX, frontendClassName, frontendDataAttr, frontendElementClass } from "../namespace/index.js";
|
|
2
2
|
const PROGRESS_ID = `${FRONTEND_PREFIX}_progress`;
|
|
3
3
|
const MAX_UPLOAD_PROGRESS = 0.95;
|
|
4
|
+
const FETCH_PROGRESS_WRAPPED = "__tbfProgressWrapped";
|
|
4
5
|
let activeRequests = 0;
|
|
6
|
+
let pageLoadProgressBooted = false;
|
|
7
|
+
let installedFetch = null;
|
|
5
8
|
function canRenderProgress() {
|
|
6
9
|
return typeof document !== "undefined" && Boolean(document.body);
|
|
7
10
|
}
|
|
@@ -54,7 +57,12 @@ function endProgress(force = false) {
|
|
|
54
57
|
const bar = progressBar();
|
|
55
58
|
if (bar)
|
|
56
59
|
bar.style.transform = "scaleX(1)";
|
|
57
|
-
window.setTimeout
|
|
60
|
+
const schedule = typeof window !== "undefined" && typeof window.setTimeout === "function"
|
|
61
|
+
? window.setTimeout.bind(window)
|
|
62
|
+
: typeof setTimeout === "function"
|
|
63
|
+
? setTimeout
|
|
64
|
+
: null;
|
|
65
|
+
const finish = () => {
|
|
58
66
|
const root = ensureProgressElement();
|
|
59
67
|
if (root && activeRequests === 0) {
|
|
60
68
|
root.removeAttribute(frontendDataAttr("progress-active"));
|
|
@@ -62,7 +70,11 @@ function endProgress(force = false) {
|
|
|
62
70
|
if (nextBar)
|
|
63
71
|
nextBar.style.transform = "scaleX(0)";
|
|
64
72
|
}
|
|
65
|
-
}
|
|
73
|
+
};
|
|
74
|
+
if (schedule)
|
|
75
|
+
schedule(finish, 160);
|
|
76
|
+
else
|
|
77
|
+
finish();
|
|
66
78
|
}
|
|
67
79
|
return activeRequests;
|
|
68
80
|
}
|
|
@@ -75,14 +87,13 @@ function setProgressFromEvent(event) {
|
|
|
75
87
|
return 0;
|
|
76
88
|
return setProgress(loaded / total);
|
|
77
89
|
}
|
|
78
|
-
function bindProgress() {
|
|
79
|
-
ensureProgressElement();
|
|
80
|
-
return progress;
|
|
81
|
-
}
|
|
82
90
|
function bootPageLoadProgress(options = {}) {
|
|
83
91
|
if (typeof document === "undefined" || typeof window === "undefined") {
|
|
84
92
|
return false;
|
|
85
93
|
}
|
|
94
|
+
if (pageLoadProgressBooted)
|
|
95
|
+
return false;
|
|
96
|
+
pageLoadProgressBooted = true;
|
|
86
97
|
const minVisibleMs = Math.max(0, Number(options.minVisibleMs) || 0);
|
|
87
98
|
let startedAtMs = 0;
|
|
88
99
|
let started = false;
|
|
@@ -100,8 +111,10 @@ function bootPageLoadProgress(options = {}) {
|
|
|
100
111
|
function startPageLoadProgress() {
|
|
101
112
|
if (started)
|
|
102
113
|
return;
|
|
103
|
-
if (!document.body || !document.documentElement)
|
|
114
|
+
if (!document.body || !document.documentElement) {
|
|
115
|
+
window.addEventListener("load", startPageLoadProgress, { once: true });
|
|
104
116
|
return;
|
|
117
|
+
}
|
|
105
118
|
started = true;
|
|
106
119
|
startedAtMs = Date.now();
|
|
107
120
|
progress.begin();
|
|
@@ -121,6 +134,62 @@ function bootPageLoadProgress(options = {}) {
|
|
|
121
134
|
}
|
|
122
135
|
return true;
|
|
123
136
|
}
|
|
137
|
+
function progressFetchOption(init) {
|
|
138
|
+
if (!init || typeof init !== "object")
|
|
139
|
+
return true;
|
|
140
|
+
const options = init;
|
|
141
|
+
return options.progress !== false && options.tbfProgress !== false;
|
|
142
|
+
}
|
|
143
|
+
function stripProgressFetchOptions(init) {
|
|
144
|
+
if (!init || typeof init !== "object")
|
|
145
|
+
return init;
|
|
146
|
+
const options = init;
|
|
147
|
+
if (!("progress" in options) && !("tbfProgress" in options))
|
|
148
|
+
return init;
|
|
149
|
+
const { progress: _progress, tbfProgress: _tbfProgress, ...nativeInit } = options;
|
|
150
|
+
return nativeInit;
|
|
151
|
+
}
|
|
152
|
+
function bindFetchProgress() {
|
|
153
|
+
if (typeof globalThis.fetch !== "function")
|
|
154
|
+
return false;
|
|
155
|
+
const currentFetch = globalThis.fetch;
|
|
156
|
+
if (currentFetch[FETCH_PROGRESS_WRAPPED]) {
|
|
157
|
+
installedFetch = currentFetch;
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
if (installedFetch && globalThis.fetch === installedFetch)
|
|
161
|
+
return false;
|
|
162
|
+
const originalFetch = currentFetch.bind(globalThis);
|
|
163
|
+
const wrappedFetch = ((input, init) => {
|
|
164
|
+
const nativeInit = stripProgressFetchOptions(init);
|
|
165
|
+
if (!progressFetchOption(init))
|
|
166
|
+
return originalFetch(input, nativeInit);
|
|
167
|
+
progress.begin();
|
|
168
|
+
try {
|
|
169
|
+
return Promise.resolve(originalFetch(input, nativeInit)).finally(() => {
|
|
170
|
+
progress.end();
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
progress.end();
|
|
175
|
+
throw error;
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
Object.defineProperty(wrappedFetch, FETCH_PROGRESS_WRAPPED, {
|
|
179
|
+
value: true,
|
|
180
|
+
});
|
|
181
|
+
globalThis.fetch = wrappedFetch;
|
|
182
|
+
if (typeof window !== "undefined")
|
|
183
|
+
window.fetch = wrappedFetch;
|
|
184
|
+
installedFetch = wrappedFetch;
|
|
185
|
+
return true;
|
|
186
|
+
}
|
|
187
|
+
function bindProgress() {
|
|
188
|
+
ensureProgressElement();
|
|
189
|
+
bindFetchProgress();
|
|
190
|
+
bootPageLoadProgress();
|
|
191
|
+
return progress;
|
|
192
|
+
}
|
|
124
193
|
const progress = Object.freeze({
|
|
125
194
|
begin: beginProgress,
|
|
126
195
|
boot: ensureProgressElement,
|
|
@@ -128,6 +197,6 @@ const progress = Object.freeze({
|
|
|
128
197
|
set: setProgress,
|
|
129
198
|
setFromProgressEvent: setProgressFromEvent,
|
|
130
199
|
});
|
|
131
|
-
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, };
|
|
200
|
+
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindFetchProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, stripProgressFetchOptions, };
|
|
132
201
|
export * from "./bars.js";
|
|
133
202
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE3G,MAAM,WAAW,GAAG,GAAG,eAAe,WAAW,CAAC;AAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAW9C,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,WAAW,CAAC;AASnB,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,QAAA,MAAM,oBAAoB,QAAsC,CAAC;AAKjE,iBAAS,iBAAiB,SAKzB;AAcD,iBAAS,WAAW,CAAC,IAAI,EAAE,QAAQ,eAGlC;AAsDD,iBAAS,SAAS,CAAC,IAAI,GAAE,QAAmB,QAM3C;AAuED,iBAAe,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,oBAqBzE;AAED,iBAAS,UAAU,CAAC,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAO,oBAM5D;AA0CD,iBAAe,WAAW,CAAC,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,oBAUxD;AAED,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,UAAU,GACX,CAAC;AACF,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
package/dist/spa/navigate.js
CHANGED
|
@@ -3,6 +3,7 @@ import { frontendDataAttr, frontendDataSelector, frontendEventName, frontendToke
|
|
|
3
3
|
import { PORTALED_SELECTOR, runSpaRebind, spaConfig } from "./config.js";
|
|
4
4
|
import { runPageCleanups } from "./cleanup.js";
|
|
5
5
|
import { removeStalePortaledOverlaysFromRoot } from "./overlay-dom.js";
|
|
6
|
+
import { progress } from "../progress/index.js";
|
|
6
7
|
import { beginNavigation, emitPageChange, retargetNavigation, } from "./page.js";
|
|
7
8
|
import { captureFormState, captureWizardSteps, importChildNodes, restoreFormState, restoreWizardSteps, } from "./state.js";
|
|
8
9
|
const LIVE_REGION_SELECTOR = frontendDataSelector("live-region");
|
|
@@ -131,18 +132,29 @@ function fallbackNavigate(url, updateUrl) {
|
|
|
131
132
|
window.location.reload();
|
|
132
133
|
return false;
|
|
133
134
|
}
|
|
135
|
+
/**
|
|
136
|
+
* Soft navigation replaces a full page load, so it shows the same progress bar
|
|
137
|
+
* a document load would. The handle is refcounted, so overlapping requests
|
|
138
|
+
* keep the bar up until the last one settles.
|
|
139
|
+
*/
|
|
134
140
|
async function fetchDocument(url, token) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
141
|
+
progress.begin();
|
|
142
|
+
try {
|
|
143
|
+
const response = await fetch(url, {
|
|
144
|
+
credentials: "same-origin",
|
|
145
|
+
headers: { Accept: "text/html", "X-Requested-With": frontendToken(token) },
|
|
146
|
+
});
|
|
147
|
+
if (!response.ok)
|
|
148
|
+
return null;
|
|
149
|
+
const html = await response.text();
|
|
150
|
+
return {
|
|
151
|
+
doc: new DOMParser().parseFromString(html, "text/html"),
|
|
152
|
+
url: response.url || url,
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
finally {
|
|
156
|
+
progress.end();
|
|
157
|
+
}
|
|
146
158
|
}
|
|
147
159
|
async function softRedirect(url, options = {}) {
|
|
148
160
|
if (navigationInflight || typeof window === "undefined")
|
package/dist/spa/navigate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"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"}
|
package/dist/src/http/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
type CsrfFetchOptions = RequestInit & {
|
|
2
2
|
csrfHeaderName?: string;
|
|
3
3
|
csrfMetaName?: string;
|
|
4
|
+
progress?: boolean;
|
|
4
5
|
};
|
|
5
6
|
type JsonRequestOptions = Omit<CsrfFetchOptions, "body"> & {
|
|
6
7
|
body?: BodyInit | Record<string, unknown> | null;
|
|
@@ -21,6 +22,11 @@ declare function fallbackJsonFromStatus(status: number, ok: boolean): {
|
|
|
21
22
|
status: number;
|
|
22
23
|
status_code: string;
|
|
23
24
|
};
|
|
25
|
+
/**
|
|
26
|
+
* Every JSON request shows the progress bar unless the caller opts out with
|
|
27
|
+
* `progress: false`. The handle is refcounted, so a caller that already wrapped
|
|
28
|
+
* the request does not double-count and the bar clears when the last one ends.
|
|
29
|
+
*/
|
|
24
30
|
declare function requestJson(input: RequestInfo | URL, options?: JsonRequestOptions): Promise<{
|
|
25
31
|
json: any;
|
|
26
32
|
response: Response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"AAEA,KAAK,gBAAgB,GAAG,WAAW,GAAE;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAE;IACxD,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAC,IAAI,CAAC;CAChD,CAAC;AAEF,iBAAS,aAAa,CAAC,QAAQ,SAAe,UAK7C;AAED,iBAAS,mBAAmB,CAC1B,IAAI,EAAE,eAAe,GAAG,IAAI,EAC5B,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,WAmBxD;AAED,iBAAe,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,GAAE,gBAAqB,qBAuB7E;AAsBD,iBAAS,2BAA2B,CAAC,OAAO,GAAE,kBAAuB,eAkBpE;AAED,iBAAe,YAAY,CAAC,QAAQ,EAAE,QAAQ,gBAM7C;AAED,iBAAS,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO;;;;;;;EAS1D;AAED;;;;GAIG;AACH,iBAAe,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,OAAO,GAAE,kBAAuB;;;GAiBpF;AAED,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,CAAC;AACF,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;AACrD,cAAa,YAAY,CAAC"}
|
package/dist/src/http/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { progress as progressHandle } from "../../progress/index.js";
|
|
1
2
|
function readCsrfToken(metaName = "csrf-token") {
|
|
2
3
|
if (typeof document === "undefined")
|
|
3
4
|
return "";
|
|
@@ -24,17 +25,28 @@ function ensureFormCsrfToken(form, options = {}) {
|
|
|
24
25
|
form.appendChild(input);
|
|
25
26
|
return true;
|
|
26
27
|
}
|
|
27
|
-
function csrfFetch(input, init = {}) {
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const
|
|
28
|
+
async function csrfFetch(input, init = {}) {
|
|
29
|
+
const { csrfHeaderName, csrfMetaName, progress: progressOption, ...fetchInit } = init;
|
|
30
|
+
const headers = new Headers(fetchInit.headers || {});
|
|
31
|
+
const token = readCsrfToken(csrfMetaName);
|
|
32
|
+
const headerName = csrfHeaderName || "X-CSRF-Token";
|
|
31
33
|
if (token)
|
|
32
34
|
headers.set(headerName, token);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
const showProgress = progressOption !== false;
|
|
36
|
+
if (showProgress)
|
|
37
|
+
progressHandle.begin();
|
|
38
|
+
try {
|
|
39
|
+
return await fetch(input, {
|
|
40
|
+
...fetchInit,
|
|
41
|
+
credentials: fetchInit.credentials || "same-origin",
|
|
42
|
+
headers,
|
|
43
|
+
progress: false,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
if (showProgress)
|
|
48
|
+
progressHandle.end();
|
|
49
|
+
}
|
|
38
50
|
}
|
|
39
51
|
function isFormDataBody(value) {
|
|
40
52
|
return Boolean(value &&
|
|
@@ -90,15 +102,32 @@ function fallbackJsonFromStatus(status, ok) {
|
|
|
90
102
|
status_code: "",
|
|
91
103
|
};
|
|
92
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* Every JSON request shows the progress bar unless the caller opts out with
|
|
107
|
+
* `progress: false`. The handle is refcounted, so a caller that already wrapped
|
|
108
|
+
* the request does not double-count and the bar clears when the last one ends.
|
|
109
|
+
*/
|
|
93
110
|
async function requestJson(input, options = {}) {
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
111
|
+
const showProgress = options.progress !== false;
|
|
112
|
+
if (showProgress)
|
|
113
|
+
progressHandle.begin();
|
|
114
|
+
try {
|
|
115
|
+
const response = await csrfFetch(input, {
|
|
116
|
+
...normalizeJsonRequestOptions(options),
|
|
117
|
+
progress: false,
|
|
118
|
+
});
|
|
119
|
+
const json = await readJsonSafe(response);
|
|
120
|
+
if (json && typeof json.ok === "boolean")
|
|
121
|
+
return { json, response };
|
|
122
|
+
return {
|
|
123
|
+
json: fallbackJsonFromStatus(response.status, response.ok),
|
|
124
|
+
response,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
finally {
|
|
128
|
+
if (showProgress)
|
|
129
|
+
progressHandle.end();
|
|
130
|
+
}
|
|
102
131
|
}
|
|
103
132
|
export { csrfFetch, ensureFormCsrfToken, fallbackJsonFromStatus, normalizeJsonRequestOptions, readCsrfToken, readJsonSafe, requestJson, };
|
|
104
133
|
export * from "./paged.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,14 +10,20 @@ type ProgressHandle = {
|
|
|
10
10
|
type PageLoadProgressOptions = {
|
|
11
11
|
minVisibleMs?: number;
|
|
12
12
|
};
|
|
13
|
+
type ProgressFetchInit = RequestInit & {
|
|
14
|
+
progress?: boolean;
|
|
15
|
+
tbfProgress?: boolean;
|
|
16
|
+
};
|
|
13
17
|
declare function setProgress(value: number): number;
|
|
14
18
|
declare function beginProgress(): number;
|
|
15
19
|
declare function endProgress(force?: boolean): number;
|
|
16
20
|
declare function setProgressFromEvent(event: ProgressEvent): number;
|
|
17
|
-
declare function bindProgress(): ProgressHandle;
|
|
18
21
|
declare function bootPageLoadProgress(options?: PageLoadProgressOptions): boolean;
|
|
22
|
+
declare function stripProgressFetchOptions(init: RequestInit | undefined): RequestInit;
|
|
23
|
+
declare function bindFetchProgress(): boolean;
|
|
24
|
+
declare function bindProgress(): ProgressHandle;
|
|
19
25
|
declare const progress: ProgressHandle;
|
|
20
|
-
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, };
|
|
21
|
-
export type { PageLoadProgressOptions, ProgressHandle };
|
|
26
|
+
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindFetchProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, stripProgressFetchOptions, };
|
|
27
|
+
export type { PageLoadProgressOptions, ProgressFetchInit, ProgressHandle };
|
|
22
28
|
export * from "./bars.js";
|
|
23
29
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,iBAAgC,CAAC;AAClD,QAAA,MAAM,mBAAmB,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,iBAAgC,CAAC;AAClD,QAAA,MAAM,mBAAmB,OAAO,CAAC;AAGjC,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IACjC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAC/B,oBAAoB,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,MAAM,CAAC;CACxD,CAAC;AACF,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,KAAK,iBAAiB,GAAG,WAAW,GAAE;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AA8BF,iBAAS,WAAW,CAAC,KAAK,EAAE,MAAM,UAUjC;AAED,iBAAS,aAAa,WAQrB;AAED,iBAAS,WAAW,CAAC,KAAK,UAAQ,UAwBjC;AAED,iBAAS,oBAAoB,CAAC,KAAK,EAAE,aAAa,UAMjD;AAED,iBAAS,oBAAoB,CAAC,OAAO,GAAE,uBAA4B,WA6ClE;AAQD,iBAAS,yBAAyB,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,eAM/D;AAED,iBAAS,iBAAiB,YA6BzB;AAED,iBAAS,YAAY,mBAKpB;AAED,QAAA,MAAM,QAAQ,EAAE,cAMd,CAAC;AAEH,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,WAAW,EACX,oBAAoB,EACpB,yBAAyB,GAC1B,CAAC;AACF,YAAY,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC;AAC3E,cAAa,WAAW,CAAC"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { FRONTEND_PREFIX, frontendClassName, frontendDataAttr, frontendElementClass } from "../../namespace/index.js";
|
|
2
2
|
const PROGRESS_ID = `${FRONTEND_PREFIX}_progress`;
|
|
3
3
|
const MAX_UPLOAD_PROGRESS = 0.95;
|
|
4
|
+
const FETCH_PROGRESS_WRAPPED = "__tbfProgressWrapped";
|
|
4
5
|
let activeRequests = 0;
|
|
6
|
+
let pageLoadProgressBooted = false;
|
|
7
|
+
let installedFetch = null;
|
|
5
8
|
function canRenderProgress() {
|
|
6
9
|
return typeof document !== "undefined" && Boolean(document.body);
|
|
7
10
|
}
|
|
@@ -54,7 +57,12 @@ function endProgress(force = false) {
|
|
|
54
57
|
const bar = progressBar();
|
|
55
58
|
if (bar)
|
|
56
59
|
bar.style.transform = "scaleX(1)";
|
|
57
|
-
window.setTimeout
|
|
60
|
+
const schedule = typeof window !== "undefined" && typeof window.setTimeout === "function"
|
|
61
|
+
? window.setTimeout.bind(window)
|
|
62
|
+
: typeof setTimeout === "function"
|
|
63
|
+
? setTimeout
|
|
64
|
+
: null;
|
|
65
|
+
const finish = () => {
|
|
58
66
|
const root = ensureProgressElement();
|
|
59
67
|
if (root && activeRequests === 0) {
|
|
60
68
|
root.removeAttribute(frontendDataAttr("progress-active"));
|
|
@@ -62,7 +70,11 @@ function endProgress(force = false) {
|
|
|
62
70
|
if (nextBar)
|
|
63
71
|
nextBar.style.transform = "scaleX(0)";
|
|
64
72
|
}
|
|
65
|
-
}
|
|
73
|
+
};
|
|
74
|
+
if (schedule)
|
|
75
|
+
schedule(finish, 160);
|
|
76
|
+
else
|
|
77
|
+
finish();
|
|
66
78
|
}
|
|
67
79
|
return activeRequests;
|
|
68
80
|
}
|
|
@@ -75,14 +87,13 @@ function setProgressFromEvent(event) {
|
|
|
75
87
|
return 0;
|
|
76
88
|
return setProgress(loaded / total);
|
|
77
89
|
}
|
|
78
|
-
function bindProgress() {
|
|
79
|
-
ensureProgressElement();
|
|
80
|
-
return progress;
|
|
81
|
-
}
|
|
82
90
|
function bootPageLoadProgress(options = {}) {
|
|
83
91
|
if (typeof document === "undefined" || typeof window === "undefined") {
|
|
84
92
|
return false;
|
|
85
93
|
}
|
|
94
|
+
if (pageLoadProgressBooted)
|
|
95
|
+
return false;
|
|
96
|
+
pageLoadProgressBooted = true;
|
|
86
97
|
const minVisibleMs = Math.max(0, Number(options.minVisibleMs) || 0);
|
|
87
98
|
let startedAtMs = 0;
|
|
88
99
|
let started = false;
|
|
@@ -100,8 +111,10 @@ function bootPageLoadProgress(options = {}) {
|
|
|
100
111
|
function startPageLoadProgress() {
|
|
101
112
|
if (started)
|
|
102
113
|
return;
|
|
103
|
-
if (!document.body || !document.documentElement)
|
|
114
|
+
if (!document.body || !document.documentElement) {
|
|
115
|
+
window.addEventListener("load", startPageLoadProgress, { once: true });
|
|
104
116
|
return;
|
|
117
|
+
}
|
|
105
118
|
started = true;
|
|
106
119
|
startedAtMs = Date.now();
|
|
107
120
|
progress.begin();
|
|
@@ -121,6 +134,62 @@ function bootPageLoadProgress(options = {}) {
|
|
|
121
134
|
}
|
|
122
135
|
return true;
|
|
123
136
|
}
|
|
137
|
+
function progressFetchOption(init) {
|
|
138
|
+
if (!init || typeof init !== "object")
|
|
139
|
+
return true;
|
|
140
|
+
const options = init;
|
|
141
|
+
return options.progress !== false && options.tbfProgress !== false;
|
|
142
|
+
}
|
|
143
|
+
function stripProgressFetchOptions(init) {
|
|
144
|
+
if (!init || typeof init !== "object")
|
|
145
|
+
return init;
|
|
146
|
+
const options = init;
|
|
147
|
+
if (!("progress" in options) && !("tbfProgress" in options))
|
|
148
|
+
return init;
|
|
149
|
+
const { progress: _progress, tbfProgress: _tbfProgress, ...nativeInit } = options;
|
|
150
|
+
return nativeInit;
|
|
151
|
+
}
|
|
152
|
+
function bindFetchProgress() {
|
|
153
|
+
if (typeof globalThis.fetch !== "function")
|
|
154
|
+
return false;
|
|
155
|
+
const currentFetch = globalThis.fetch;
|
|
156
|
+
if (currentFetch[FETCH_PROGRESS_WRAPPED]) {
|
|
157
|
+
installedFetch = currentFetch;
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
if (installedFetch && globalThis.fetch === installedFetch)
|
|
161
|
+
return false;
|
|
162
|
+
const originalFetch = currentFetch.bind(globalThis);
|
|
163
|
+
const wrappedFetch = ((input, init) => {
|
|
164
|
+
const nativeInit = stripProgressFetchOptions(init);
|
|
165
|
+
if (!progressFetchOption(init))
|
|
166
|
+
return originalFetch(input, nativeInit);
|
|
167
|
+
progress.begin();
|
|
168
|
+
try {
|
|
169
|
+
return Promise.resolve(originalFetch(input, nativeInit)).finally(() => {
|
|
170
|
+
progress.end();
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
progress.end();
|
|
175
|
+
throw error;
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
Object.defineProperty(wrappedFetch, FETCH_PROGRESS_WRAPPED, {
|
|
179
|
+
value: true,
|
|
180
|
+
});
|
|
181
|
+
globalThis.fetch = wrappedFetch;
|
|
182
|
+
if (typeof window !== "undefined")
|
|
183
|
+
window.fetch = wrappedFetch;
|
|
184
|
+
installedFetch = wrappedFetch;
|
|
185
|
+
return true;
|
|
186
|
+
}
|
|
187
|
+
function bindProgress() {
|
|
188
|
+
ensureProgressElement();
|
|
189
|
+
bindFetchProgress();
|
|
190
|
+
bootPageLoadProgress();
|
|
191
|
+
return progress;
|
|
192
|
+
}
|
|
124
193
|
const progress = Object.freeze({
|
|
125
194
|
begin: beginProgress,
|
|
126
195
|
boot: ensureProgressElement,
|
|
@@ -128,6 +197,6 @@ const progress = Object.freeze({
|
|
|
128
197
|
set: setProgress,
|
|
129
198
|
setFromProgressEvent: setProgressFromEvent,
|
|
130
199
|
});
|
|
131
|
-
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, };
|
|
200
|
+
export { MAX_UPLOAD_PROGRESS, PROGRESS_ID, beginProgress, bindFetchProgress, bindProgress, bootPageLoadProgress, endProgress, progress, setProgress, setProgressFromEvent, stripProgressFetchOptions, };
|
|
132
201
|
export * from "./bars.js";
|
|
133
202
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE3G,MAAM,WAAW,GAAG,GAAG,eAAe,WAAW,CAAC;AAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/progress/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAW9C,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,WAAW,CAAC;AASnB,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,QAAA,MAAM,oBAAoB,QAAsC,CAAC;AAKjE,iBAAS,iBAAiB,SAKzB;AAcD,iBAAS,WAAW,CAAC,IAAI,EAAE,QAAQ,eAGlC;AAsDD,iBAAS,SAAS,CAAC,IAAI,GAAE,QAAmB,QAM3C;AAuED,iBAAe,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,oBAqBzE;AAED,iBAAS,UAAU,CAAC,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAO,oBAM5D;AA0CD,iBAAe,WAAW,CAAC,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,oBAUxD;AAED,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,UAAU,GACX,CAAC;AACF,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
package/dist/src/spa/navigate.js
CHANGED
|
@@ -3,6 +3,7 @@ import { frontendDataAttr, frontendDataSelector, frontendEventName, frontendToke
|
|
|
3
3
|
import { PORTALED_SELECTOR, runSpaRebind, spaConfig } from "./config.js";
|
|
4
4
|
import { runPageCleanups } from "./cleanup.js";
|
|
5
5
|
import { removeStalePortaledOverlaysFromRoot } from "./overlay-dom.js";
|
|
6
|
+
import { progress } from "../../progress/index.js";
|
|
6
7
|
import { beginNavigation, emitPageChange, retargetNavigation, } from "./page.js";
|
|
7
8
|
import { captureFormState, captureWizardSteps, importChildNodes, restoreFormState, restoreWizardSteps, } from "./state.js";
|
|
8
9
|
const LIVE_REGION_SELECTOR = frontendDataSelector("live-region");
|
|
@@ -131,18 +132,29 @@ function fallbackNavigate(url, updateUrl) {
|
|
|
131
132
|
window.location.reload();
|
|
132
133
|
return false;
|
|
133
134
|
}
|
|
135
|
+
/**
|
|
136
|
+
* Soft navigation replaces a full page load, so it shows the same progress bar
|
|
137
|
+
* a document load would. The handle is refcounted, so overlapping requests
|
|
138
|
+
* keep the bar up until the last one settles.
|
|
139
|
+
*/
|
|
134
140
|
async function fetchDocument(url, token) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
141
|
+
progress.begin();
|
|
142
|
+
try {
|
|
143
|
+
const response = await fetch(url, {
|
|
144
|
+
credentials: "same-origin",
|
|
145
|
+
headers: { Accept: "text/html", "X-Requested-With": frontendToken(token) },
|
|
146
|
+
});
|
|
147
|
+
if (!response.ok)
|
|
148
|
+
return null;
|
|
149
|
+
const html = await response.text();
|
|
150
|
+
return {
|
|
151
|
+
doc: new DOMParser().parseFromString(html, "text/html"),
|
|
152
|
+
url: response.url || url,
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
finally {
|
|
156
|
+
progress.end();
|
|
157
|
+
}
|
|
146
158
|
}
|
|
147
159
|
async function softRedirect(url, options = {}) {
|
|
148
160
|
if (navigationInflight || typeof window === "undefined")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../src/spa/navigate.ts"],"names":[],"mappings":"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"}
|