@hyper-fetch/react 5.0.2 → 5.1.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.
@@ -1,4 +1,5 @@
1
1
  import { useRef } from "react";
2
+ import { useDidUpdate } from "@better-hooks/lifecycle";
2
3
  import { getRequestDispatcher, RequestInstance, Request, getRequestKey } from "@hyper-fetch/core";
3
4
 
4
5
  import { UseCacheOptionsType, useCacheDefaultOptions, UseCacheReturnType } from "hooks/use-cache";
@@ -14,6 +15,7 @@ export const useCache = <T extends RequestInstance>(
14
15
  const { cache, loggerManager } = client;
15
16
  const logger = useRef(loggerManager.init("useCache")).current;
16
17
  const [dispatcher] = getRequestDispatcher(request);
18
+ const updateKey = JSON.stringify(request.toJSON());
17
19
 
18
20
  // Build the configuration options
19
21
  const [globalConfig] = useConfigProvider();
@@ -38,7 +40,7 @@ export const useCache = <T extends RequestInstance>(
38
40
  /**
39
41
  * Handles the data exchange with the core logic - responses, loading, downloading etc
40
42
  */
41
- const [callbacks] = useRequestEvents({
43
+ const [callbacks, listeners] = useRequestEvents({
42
44
  logger,
43
45
  actions,
44
46
  request,
@@ -46,6 +48,15 @@ export const useCache = <T extends RequestInstance>(
46
48
  setCacheData,
47
49
  });
48
50
 
51
+ const { addDataListener, addLifecycleListeners } = listeners;
52
+
53
+ const handleMountEvents = () => {
54
+ addDataListener(request);
55
+ addLifecycleListeners(request);
56
+ };
57
+
58
+ useDidUpdate(handleMountEvents, [updateKey], true);
59
+
49
60
  const refetch = (invalidateKey?: string | RequestInstance | RegExp) => {
50
61
  if (invalidateKey instanceof Request) {
51
62
  cache.invalidate(getRequestKey(invalidateKey, true));
@@ -17,6 +17,12 @@ export const useListener = <ListenerType extends ListenerInstance>(
17
17
  ) => {
18
18
  const [globalConfig] = useConfigProvider();
19
19
  const { dependencyTracking } = { ...globalConfig.useListener, ...options };
20
+ const [state, actions, callbacks, { setRenderKey }] = useSocketState(listener.socket, { dependencyTracking });
21
+ const removeListenerRef = useRef<ReturnType<typeof listener.listen> | null>(null);
22
+
23
+ /**
24
+ * Callbacks
25
+ */
20
26
 
21
27
  const onEventCallback = useRef<
22
28
  | null
@@ -25,8 +31,10 @@ export const useListener = <ListenerType extends ListenerInstance>(
25
31
  extra: ExtractSocketExtraType<ExtractListenerAdapterType<ListenerType>>;
26
32
  }) => void)
27
33
  >(null);
28
- const removeListenerRef = useRef<ReturnType<typeof listener.listen> | null>(null);
29
- const [state, actions, callbacks, { setRenderKey }] = useSocketState(listener.socket, { dependencyTracking });
34
+
35
+ /**
36
+ * Actions
37
+ */
30
38
 
31
39
  const stopListener = () => {
32
40
  removeListenerRef.current?.();
@@ -43,11 +51,21 @@ export const useListener = <ListenerType extends ListenerInstance>(
43
51
  });
44
52
  };
45
53
 
54
+ const additionalCallbacks = {
55
+ onEvent: (callback: NonNullable<typeof onEventCallback.current>) => {
56
+ onEventCallback.current = callback;
57
+ },
58
+ };
59
+
60
+ /**
61
+ * Lifecycle
62
+ */
63
+
46
64
  useDidUpdate(
47
65
  () => {
48
66
  listen();
49
67
  },
50
- [listener],
68
+ [listener.params, JSON.stringify(listener.options)],
51
69
  true,
52
70
  );
53
71
 
@@ -55,12 +73,6 @@ export const useListener = <ListenerType extends ListenerInstance>(
55
73
  stopListener();
56
74
  });
57
75
 
58
- const additionalCallbacks = {
59
- onEvent: (callback: NonNullable<typeof onEventCallback.current>) => {
60
- onEventCallback.current = callback;
61
- },
62
- };
63
-
64
76
  return {
65
77
  get data() {
66
78
  setRenderKey("data");