Merge branch 'develop' into menu-radix-pubInfo

edrlab · Oct 25, 2023 · 0b3e2cc · 0b3e2cc
2 parents c8d37c8 + 1f0deca
commit 0b3e2cc
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/renderer/common/hooks/useApi.ts b/src/renderer/common/hooks/useApi.ts
@@ -16,22 +16,23 @@ import { ApiResponse } from "readium-desktop/common/redux/states/api";
 import { TReturnPromiseOrGeneratorType } from "readium-desktop/typings/api";
 import { useSyncExternalStore } from "./useSyncExternalStore";
 
-export function useApi<T extends TApiMethodName>(_requestId: string | undefined, apiPath: T, ...requestData: Parameters<TApiMethod[T]>):
-    [ApiResponse<TReturnPromiseOrGeneratorType<TApiMethod[T]>>, () => void]
+export function useApi<T extends TApiMethodName>(_requestId: string | undefined, apiPath: T):
+    [ApiResponse<TReturnPromiseOrGeneratorType<TApiMethod[T]>>, (...requestData: Parameters<TApiMethod[T]>) => void]
 {
 
     const requestId = _requestId || React.useMemo(() => uuidv4(), []);
     const { store } = React.useContext(ReactReduxContext);
-    const apiAction = React.useCallback(() => {
+    React.useEffect(() => {
+        return () => {
+            store.dispatch(apiActions.clean.build(requestId));
+        };
+    }, []);
+    const apiAction = (...requestData: Parameters<TApiMethod[T]>) => {
         const splitPath = apiPath.split("/");
         const moduleId = splitPath[0] as TModuleApi;
         const methodId = splitPath[1] as TMethodApi;
         store.dispatch(apiActions.request.build(requestId, moduleId, methodId, requestData));
-
-        return () => {
-            store.dispatch(apiActions.clean.build(requestId));
-        };
-    }, []); // componentDidMount
+    };
 
     const apiResult = useSyncExternalStore(store.subscribe, () => store.getState().api[requestId]);
     return [apiResult, apiAction];