@hyper-fetch/react 5.7.4 → 5.7.6-beta.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/dist/index.cjs.js +54 -26
- package/dist/index.cjs.js.map +2 -2
- package/dist/index.d.ts +5 -3
- package/dist/index.esm.js +54 -26
- package/dist/index.esm.js.map +2 -2
- package/package.json +1 -1
- package/src/helpers/use-request-events/use-request-events.hooks.ts +16 -9
- package/src/helpers/use-request-events/use-request-events.types.ts +3 -2
- package/src/helpers/use-tracked-state/use-tracked-state.hooks.ts +26 -2
- package/src/helpers/use-tracked-state/use-tracked-state.types.ts +1 -0
- package/src/hooks/use-cache/use-cache.hooks.ts +4 -3
- package/src/hooks/use-fetch/use-fetch.hooks.ts +21 -11
- package/src/hooks/use-submit/use-submit.hooks.ts +5 -4
package/dist/index.cjs.js
CHANGED
|
@@ -107,7 +107,8 @@ var useRequestEvents = ({
|
|
|
107
107
|
dispatcher,
|
|
108
108
|
logger,
|
|
109
109
|
actions,
|
|
110
|
-
setCacheData
|
|
110
|
+
setCacheData,
|
|
111
|
+
getIsDataProcessing
|
|
111
112
|
}) => {
|
|
112
113
|
const { responseMapper } = request;
|
|
113
114
|
const { cache, requestManager } = request.client;
|
|
@@ -154,9 +155,12 @@ var useRequestEvents = ({
|
|
|
154
155
|
}
|
|
155
156
|
(_e = onFinishedCallback.current) == null ? void 0 : _e.call(onFinishedCallback, { response, request: cmd, details });
|
|
156
157
|
};
|
|
157
|
-
const handleGetLoadingEvent = (
|
|
158
|
+
const handleGetLoadingEvent = (req) => {
|
|
158
159
|
return ({ loading }) => {
|
|
159
|
-
const
|
|
160
|
+
const isProcessing = getIsDataProcessing(req.cacheKey);
|
|
161
|
+
if (isProcessing)
|
|
162
|
+
return;
|
|
163
|
+
const canDisableLoading = !loading && !dispatcher.hasRunningRequests(req.queueKey);
|
|
160
164
|
if (loading || canDisableLoading) {
|
|
161
165
|
actions.setLoading(loading, false);
|
|
162
166
|
}
|
|
@@ -197,13 +201,13 @@ var useRequestEvents = ({
|
|
|
197
201
|
const handleRemove = ({ requestId }) => {
|
|
198
202
|
removeLifecycleListener(requestId);
|
|
199
203
|
};
|
|
200
|
-
const
|
|
204
|
+
const clearCacheDataListener = () => {
|
|
201
205
|
var _a;
|
|
202
206
|
(_a = dataEvents.current) == null ? void 0 : _a.unmount();
|
|
203
207
|
dataEvents.current = null;
|
|
204
208
|
};
|
|
205
|
-
const
|
|
206
|
-
const loadingUnmount = requestManager.events.onLoading(req.queueKey, handleGetLoadingEvent(req
|
|
209
|
+
const addCacheDataListener = (req) => {
|
|
210
|
+
const loadingUnmount = requestManager.events.onLoading(req.queueKey, handleGetLoadingEvent(req));
|
|
207
211
|
const getResponseUnmount = cache.events.onData(
|
|
208
212
|
req.cacheKey,
|
|
209
213
|
setCacheData
|
|
@@ -212,7 +216,7 @@ var useRequestEvents = ({
|
|
|
212
216
|
loadingUnmount();
|
|
213
217
|
getResponseUnmount();
|
|
214
218
|
};
|
|
215
|
-
|
|
219
|
+
clearCacheDataListener();
|
|
216
220
|
dataEvents.current = { unmount };
|
|
217
221
|
return unmount;
|
|
218
222
|
};
|
|
@@ -263,7 +267,7 @@ var useRequestEvents = ({
|
|
|
263
267
|
};
|
|
264
268
|
(0, import_lifecycle.useWillUnmount)(() => {
|
|
265
269
|
clearLifecycleListeners();
|
|
266
|
-
|
|
270
|
+
clearCacheDataListener();
|
|
267
271
|
});
|
|
268
272
|
return [
|
|
269
273
|
{
|
|
@@ -297,8 +301,8 @@ var useRequestEvents = ({
|
|
|
297
301
|
}
|
|
298
302
|
},
|
|
299
303
|
{
|
|
300
|
-
|
|
301
|
-
|
|
304
|
+
addCacheDataListener,
|
|
305
|
+
clearCacheDataListener,
|
|
302
306
|
addLifecycleListeners,
|
|
303
307
|
removeLifecycleListener,
|
|
304
308
|
clearLifecycleListeners
|
|
@@ -461,6 +465,7 @@ var useTrackedState = ({
|
|
|
461
465
|
const forceUpdate = (0, import_lifecycle2.useForceUpdate)();
|
|
462
466
|
const state = (0, import_react2.useRef)(getInitialState(initialData, dispatcher, request));
|
|
463
467
|
const renderKeys = (0, import_react2.useRef)([]);
|
|
468
|
+
const isProcessingData = (0, import_react2.useRef)("");
|
|
464
469
|
const getStaleStatus = () => {
|
|
465
470
|
const cacheData = cache.get(cacheKey);
|
|
466
471
|
return !cacheData || isStaleCacheData(cacheTime, cacheData == null ? void 0 : cacheData.timestamp);
|
|
@@ -521,7 +526,7 @@ var useTrackedState = ({
|
|
|
521
526
|
extra: cacheData.extra,
|
|
522
527
|
retries: cacheData.retries,
|
|
523
528
|
timestamp: new Date(cacheData.timestamp),
|
|
524
|
-
loading:
|
|
529
|
+
loading: dispatcher.hasRunningRequests(queueKey)
|
|
525
530
|
};
|
|
526
531
|
const changedKeys = Object.keys(newStateValues).filter((key) => {
|
|
527
532
|
const keyValue = key;
|
|
@@ -532,14 +537,30 @@ var useTrackedState = ({
|
|
|
532
537
|
state.current = __spreadValues(__spreadValues({}, state.current), newStateValues);
|
|
533
538
|
renderKeyTrigger(changedKeys);
|
|
534
539
|
};
|
|
540
|
+
const setIsDataProcessing = ({
|
|
541
|
+
processingCacheKey,
|
|
542
|
+
isProcessing
|
|
543
|
+
}) => {
|
|
544
|
+
if (isProcessing) {
|
|
545
|
+
isProcessingData.current = processingCacheKey;
|
|
546
|
+
} else if (isProcessingData.current === cacheKey) {
|
|
547
|
+
isProcessingData.current = "";
|
|
548
|
+
}
|
|
549
|
+
};
|
|
550
|
+
const getIsDataProcessing = (processingCacheKey) => {
|
|
551
|
+
return isProcessingData.current === processingCacheKey;
|
|
552
|
+
};
|
|
535
553
|
const setCacheData = (cacheData) => {
|
|
554
|
+
setIsDataProcessing({ processingCacheKey: cacheKey, isProcessing: true });
|
|
536
555
|
const data = responseMapper ? responseMapper(cacheData) : cacheData;
|
|
537
556
|
if (data instanceof Promise) {
|
|
538
557
|
return (() => __async(void 0, null, function* () {
|
|
539
558
|
const promiseData = yield data;
|
|
540
559
|
handleCacheData(__spreadValues(__spreadValues({}, cacheData), promiseData));
|
|
560
|
+
setIsDataProcessing({ processingCacheKey: cacheKey, isProcessing: false });
|
|
541
561
|
}))();
|
|
542
562
|
}
|
|
563
|
+
setIsDataProcessing({ processingCacheKey: cacheKey, isProcessing: false });
|
|
543
564
|
return handleCacheData(__spreadValues(__spreadValues({}, cacheData), data));
|
|
544
565
|
};
|
|
545
566
|
const actions = {
|
|
@@ -621,7 +642,7 @@ var useTrackedState = ({
|
|
|
621
642
|
}
|
|
622
643
|
}
|
|
623
644
|
};
|
|
624
|
-
return [state.current, actions, { setRenderKey, setCacheData, getStaleStatus }];
|
|
645
|
+
return [state.current, actions, { setRenderKey, setCacheData, getStaleStatus, getIsDataProcessing }];
|
|
625
646
|
};
|
|
626
647
|
|
|
627
648
|
// src/helpers/use-socket-state/use-socket-state.hooks.ts
|
|
@@ -793,7 +814,7 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
793
814
|
const logger = (0, import_react5.useRef)(loggerManager.init("useFetch")).current;
|
|
794
815
|
const bounceData = bounceType === "throttle" ? requestThrottle : requestDebounce;
|
|
795
816
|
const bounceFunction = bounceType === "throttle" ? requestThrottle.throttle : requestDebounce.debounce;
|
|
796
|
-
const [state, actions, { setRenderKey, setCacheData, getStaleStatus }] = useTrackedState({
|
|
817
|
+
const [state, actions, { setRenderKey, setCacheData, getStaleStatus, getIsDataProcessing }] = useTrackedState({
|
|
797
818
|
logger,
|
|
798
819
|
request,
|
|
799
820
|
dispatcher,
|
|
@@ -806,13 +827,18 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
806
827
|
actions,
|
|
807
828
|
request,
|
|
808
829
|
dispatcher,
|
|
809
|
-
setCacheData
|
|
830
|
+
setCacheData,
|
|
831
|
+
getIsDataProcessing
|
|
810
832
|
});
|
|
811
|
-
const {
|
|
833
|
+
const { addCacheDataListener, addLifecycleListeners, clearCacheDataListener } = listeners;
|
|
812
834
|
const handleFetch = () => {
|
|
813
835
|
if (!disabled) {
|
|
814
836
|
logger.debug(`Fetching data`);
|
|
815
837
|
dispatcher.add(request);
|
|
838
|
+
const queue = dispatcher.getQueue(request.queueKey);
|
|
839
|
+
if (!queue.stopped && queue.requests.length) {
|
|
840
|
+
actions.setLoading(true);
|
|
841
|
+
}
|
|
816
842
|
} else {
|
|
817
843
|
logger.debug(`Cannot add to fetch queue`, { disabled });
|
|
818
844
|
}
|
|
@@ -878,7 +904,7 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
878
904
|
}
|
|
879
905
|
};
|
|
880
906
|
const handleMountEvents = () => {
|
|
881
|
-
|
|
907
|
+
addCacheDataListener(request);
|
|
882
908
|
addLifecycleListeners(request);
|
|
883
909
|
const focusUnmount = appManager.events.onFocus(() => {
|
|
884
910
|
if (refetchOnFocus) {
|
|
@@ -900,7 +926,7 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
900
926
|
});
|
|
901
927
|
const invalidateUnmount = cache.events.onInvalidate(cacheKey, handleFetch);
|
|
902
928
|
const unmount = () => {
|
|
903
|
-
|
|
929
|
+
clearCacheDataListener();
|
|
904
930
|
focusUnmount();
|
|
905
931
|
blurUnmount();
|
|
906
932
|
onlineUnmount();
|
|
@@ -1006,7 +1032,7 @@ var useSubmit = (request, options = useSubmitDefaultOptions) => {
|
|
|
1006
1032
|
const bounceResolver = (0, import_react6.useRef)(() => null);
|
|
1007
1033
|
const bounceData = bounceType === "throttle" ? requestThrottle : requestDebounce;
|
|
1008
1034
|
const bounceFunction = bounceType === "throttle" ? requestThrottle.throttle : requestDebounce.debounce;
|
|
1009
|
-
const [state, actions, { setRenderKey, setCacheData }] = useTrackedState({
|
|
1035
|
+
const [state, actions, { setRenderKey, setCacheData, getIsDataProcessing }] = useTrackedState({
|
|
1010
1036
|
logger,
|
|
1011
1037
|
request,
|
|
1012
1038
|
dispatcher,
|
|
@@ -1019,9 +1045,10 @@ var useSubmit = (request, options = useSubmitDefaultOptions) => {
|
|
|
1019
1045
|
actions,
|
|
1020
1046
|
request,
|
|
1021
1047
|
dispatcher,
|
|
1022
|
-
setCacheData
|
|
1048
|
+
setCacheData,
|
|
1049
|
+
getIsDataProcessing
|
|
1023
1050
|
});
|
|
1024
|
-
const {
|
|
1051
|
+
const { addCacheDataListener, addLifecycleListeners } = listeners;
|
|
1025
1052
|
const handleSubmit = (submitOptions) => {
|
|
1026
1053
|
const requestClone = request.clone(submitOptions);
|
|
1027
1054
|
if (disabled) {
|
|
@@ -1034,7 +1061,7 @@ var useSubmit = (request, options = useSubmitDefaultOptions) => {
|
|
|
1034
1061
|
});
|
|
1035
1062
|
}
|
|
1036
1063
|
const triggerRequest = () => {
|
|
1037
|
-
|
|
1064
|
+
addCacheDataListener(requestClone);
|
|
1038
1065
|
return (0, import_core3.sendRequest)(requestClone, __spreadProps(__spreadValues({
|
|
1039
1066
|
dispatcherType: "submit"
|
|
1040
1067
|
}, submitOptions), {
|
|
@@ -1096,7 +1123,7 @@ var useSubmit = (request, options = useSubmitDefaultOptions) => {
|
|
|
1096
1123
|
onSubmitAbort: callbacks.onAbort
|
|
1097
1124
|
};
|
|
1098
1125
|
(0, import_lifecycle5.useDidMount)(() => {
|
|
1099
|
-
|
|
1126
|
+
addCacheDataListener(request);
|
|
1100
1127
|
});
|
|
1101
1128
|
return __spreadProps(__spreadValues(__spreadValues({
|
|
1102
1129
|
submit: handleSubmit,
|
|
@@ -1230,7 +1257,7 @@ var useCache = (request, options = useCacheDefaultOptions) => {
|
|
|
1230
1257
|
const updateKey = JSON.stringify(request.toJSON());
|
|
1231
1258
|
const [globalConfig] = useConfigProvider();
|
|
1232
1259
|
const { dependencyTracking, initialData, deepCompare } = __spreadValues(__spreadValues(__spreadValues({}, useCacheDefaultOptions), globalConfig.useCacheConfig), options);
|
|
1233
|
-
const [state, actions, { setRenderKey, setCacheData }] = useTrackedState({
|
|
1260
|
+
const [state, actions, { setRenderKey, setCacheData, getIsDataProcessing }] = useTrackedState({
|
|
1234
1261
|
logger,
|
|
1235
1262
|
request,
|
|
1236
1263
|
dispatcher,
|
|
@@ -1243,11 +1270,12 @@ var useCache = (request, options = useCacheDefaultOptions) => {
|
|
|
1243
1270
|
actions,
|
|
1244
1271
|
request,
|
|
1245
1272
|
dispatcher,
|
|
1246
|
-
setCacheData
|
|
1273
|
+
setCacheData,
|
|
1274
|
+
getIsDataProcessing
|
|
1247
1275
|
});
|
|
1248
|
-
const {
|
|
1276
|
+
const { addCacheDataListener, addLifecycleListeners } = listeners;
|
|
1249
1277
|
const handleMountEvents = () => {
|
|
1250
|
-
|
|
1278
|
+
addCacheDataListener(request);
|
|
1251
1279
|
addLifecycleListeners(request);
|
|
1252
1280
|
};
|
|
1253
1281
|
(0, import_lifecycle7.useDidUpdate)(handleMountEvents, [updateKey], true);
|