@kwiz/fluentui 1.0.171 → 1.0.172
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,6 +1,6 @@
|
|
|
1
1
|
import { iLoadingProps } from "../controls/loading";
|
|
2
2
|
import { iPleaseWaitProps } from "../controls/please-wait";
|
|
3
|
-
type queueType = "required" | "optional";
|
|
3
|
+
type queueType = "required" | "optional" | "idle";
|
|
4
4
|
type isLoadingType = {
|
|
5
5
|
type: queueType;
|
|
6
6
|
label?: string;
|
|
@@ -13,13 +13,13 @@ export interface iUseReloadTracker<Scope extends string = "global"> {
|
|
|
13
13
|
/** call to reload scope+global, or send global to reload all scopes */
|
|
14
14
|
reload: (scope?: Scope) => void;
|
|
15
15
|
/** state: is there pending promises in the queue */
|
|
16
|
-
isLoading: isLoadingType
|
|
16
|
+
isLoading: isLoadingType;
|
|
17
17
|
/** add a loading promise to the queue */
|
|
18
18
|
queue: <Result>(promise: () => Promise<Result>, info: {
|
|
19
19
|
label: string;
|
|
20
20
|
type?: queueType;
|
|
21
21
|
/** will use promiseOnce if provided, along with the reload key */
|
|
22
|
-
cacheKey
|
|
22
|
+
cacheKey?: string;
|
|
23
23
|
/** switch reloadKey scope for cacheKey. Global will update on any reload. You want to set this if you have a dependency on reloadKey.[scope] that is not global */
|
|
24
24
|
cacheScope?: Scope;
|
|
25
25
|
}) => Promise<Result>;
|
|
@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
11
|
-
import { CommonLogger, debounce, firstIndexOf, firstOrNull, isNotEmptyString, isNullOrEmptyString, isNumber, jsonClone, promiseOnce } from "@kwiz/common";
|
|
12
|
-
import { isValidElement, useCallback, useMemo } from "react";
|
|
11
|
+
import { CommonLogger, debounce, firstIndexOf, firstOrNull, isNotEmptyString, isNullOrEmptyString, isNumber, jsonClone, jsonStringify, promiseOnce } from "@kwiz/common";
|
|
12
|
+
import { isValidElement, useCallback, useMemo, useRef } from "react";
|
|
13
13
|
import { Loading } from "../controls/loading";
|
|
14
14
|
import { PleaseWait } from "../controls/please-wait";
|
|
15
15
|
import { useStateEX } from "./hooks";
|
|
@@ -17,8 +17,8 @@ const logger = new CommonLogger("useReloadTracker");
|
|
|
17
17
|
/** a simple reload marker, can be used as a dependency, and called as a function */
|
|
18
18
|
export function useReloadTracker(props) {
|
|
19
19
|
const [reloadKey, setReload, reloadKeyRef] = useStateEX({ global: 1 });
|
|
20
|
-
const promises = [];
|
|
21
|
-
let counter = 1;
|
|
20
|
+
const promises = useRef([]);
|
|
21
|
+
let counter = useRef(1);
|
|
22
22
|
const reload = useCallback(debounce((scope) => {
|
|
23
23
|
const rk = jsonClone(reloadKey);
|
|
24
24
|
if (scope === "global" || isNullOrEmptyString(scope)) {
|
|
@@ -36,17 +36,16 @@ export function useReloadTracker(props) {
|
|
|
36
36
|
}
|
|
37
37
|
setReload(rk);
|
|
38
38
|
}, 100), [reloadKey]);
|
|
39
|
-
const [isLoading, setLoading, isLoadingRef] = useStateEX(
|
|
39
|
+
const [isLoading, setLoading, isLoadingRef] = useStateEX({ type: "idle" }, { skipUpdateIfSame: true });
|
|
40
40
|
//this does not have dependencies, never changes, so unsafe to use state. use stateRef objects.
|
|
41
41
|
const queue = useCallback((promise, info) => __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
var _a;
|
|
43
42
|
const type = (info === null || info === void 0 ? void 0 : info.type) || "optional";
|
|
44
|
-
if (
|
|
43
|
+
if (isLoadingRef.current.type !== "required") //if its required - do not update this back to optional
|
|
45
44
|
setLoading({ type, label: info.label });
|
|
46
|
-
const myId = counter++;
|
|
47
|
-
promises.push({ id: myId, type, label: info === null || info === void 0 ? void 0 : info.label });
|
|
45
|
+
const myId = counter.current++;
|
|
46
|
+
promises.current.push({ id: myId, type, label: info === null || info === void 0 ? void 0 : info.label });
|
|
48
47
|
try {
|
|
49
|
-
return (isNotEmptyString(info.cacheKey)
|
|
48
|
+
return yield (isNotEmptyString(info.cacheKey)
|
|
50
49
|
? (() => {
|
|
51
50
|
const cache_reloadKey = isNotEmptyString(info.cacheScope) ? `${info.cacheScope}:${reloadKeyRef.current[info.cacheScope] || 0}` : `global:${reloadKeyRef.current.global}`;
|
|
52
51
|
const promiseOnceCacheKey = `${cache_reloadKey}|${info.cacheKey}`;
|
|
@@ -57,26 +56,29 @@ export function useReloadTracker(props) {
|
|
|
57
56
|
}
|
|
58
57
|
finally {
|
|
59
58
|
//remove this promise
|
|
60
|
-
const myIndex = firstIndexOf(promises, p => p.id === myId);
|
|
61
|
-
promises.splice(myIndex, 1);
|
|
59
|
+
const myIndex = firstIndexOf(promises.current, p => p.id === myId);
|
|
60
|
+
promises.current.splice(myIndex, 1);
|
|
62
61
|
//if no more promises - set loading to false
|
|
63
|
-
if (promises.length === 0)
|
|
64
|
-
setLoading(
|
|
62
|
+
if (promises.current.length === 0)
|
|
63
|
+
setLoading({ type: "idle" });
|
|
65
64
|
//else, if it is state required and no more required promiese - drop it to optional
|
|
66
65
|
else {
|
|
67
66
|
//drop the label/type to the next promise in queue, prioritize required ones.
|
|
68
|
-
const nextPromise = firstOrNull(promises, p_1 => p_1.type === "required") || promises[0];
|
|
67
|
+
const nextPromise = firstOrNull(promises.current, p_1 => p_1.type === "required") || promises[0];
|
|
69
68
|
setLoading({ type: nextPromise.type, label: nextPromise.label });
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
}), []);
|
|
73
|
-
const reloadElement = useMemo(() =>
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
72
|
+
const reloadElement = useMemo(() => {
|
|
73
|
+
logger.debug(`reloadElement: ${jsonStringify(isLoading)}`);
|
|
74
|
+
return (isLoading === null || isLoading === void 0 ? void 0 : isLoading.type) === "required"
|
|
75
|
+
? isValidElement(props === null || props === void 0 ? void 0 : props.requiredElement) ? props.requiredElement
|
|
76
|
+
: _jsx(Loading, Object.assign({ fullsize: true, label: isLoading.label }, props === null || props === void 0 ? void 0 : props.requiredElement))
|
|
77
|
+
: (isLoading === null || isLoading === void 0 ? void 0 : isLoading.type) === "optional"
|
|
78
|
+
? isValidElement(props === null || props === void 0 ? void 0 : props.optionalElement) ? props.optionalElement
|
|
79
|
+
: _jsx(PleaseWait, Object.assign({ label: isLoading.label }, props === null || props === void 0 ? void 0 : props.optionalElement))
|
|
80
|
+
: undefined;
|
|
81
|
+
}, [isLoading.type, isLoading.label]);
|
|
80
82
|
return {
|
|
81
83
|
reloadKey, reload, isLoading, queue, reloadElement
|
|
82
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-reload-tracker.js","sourceRoot":"","sources":["../../src/helpers/use-reload-tracker.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"use-reload-tracker.js","sourceRoot":"","sources":["../../src/helpers/use-reload-tracker.tsx"],"names":[],"mappings":"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"}
|