docs(changeset): fix(react): do not double fetch if react-query signa…

…l is not used
ecyrbe · Jan 29, 2023 · 806ea83 · 806ea83
1 parent 58b2d0e
commit 806ea83
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/.changeset/gorgeous-dolls-fry.md b/.changeset/gorgeous-dolls-fry.md
@@ -0,0 +1,9 @@
+---
+"@zodios/axios": major
+"@zodios/core": major
+"@zodios/fetch": major
+"@zodios/react": major
+"@zodios/testing": major
+---
+
+fix(react): do not double fetch if react-query signal is not used
diff --git a/packages/react/src/hooks.ts b/packages/react/src/hooks.ts
@@ -257,11 +257,11 @@ export class ZodiosHooksImpl<
       ["params", "queries", "body"]
     );
     const key = [{ api: this.apiName, path }, params] as QueryKey;
-    const query = ({ signal }: { signal?: AbortSignal }) =>
+    const query = (queryParams: QueryFunctionContext) =>
       this.zodios.get(path, {
         ...(config as any),
         signal: this.options.shouldAbortOnUnmount
-          ? combineSignals(signal, (config as any)?.signal)
+          ? combineSignals(queryParams.signal, (config as any)?.signal)
           : (config as any)?.signal,
       });
     const queryClient = useQueryClient();
@@ -306,11 +306,11 @@ export class ZodiosHooksImpl<
       ["params", "queries", "body"]
     );
     const key = [{ api: this.apiName, path }, params] as QueryKey;
-    const query = ({ signal }: { signal?: AbortSignal }) =>
+    const query = (queryParams: QueryFunctionContext) =>
       this.zodios.post(path, {
         ...(config as any),
         signal: this.options.shouldAbortOnUnmount
-          ? combineSignals(signal, (config as any)?.signal)
+          ? combineSignals(queryParams.signal, (config as any)?.signal)
           : (config as any)?.signal,
       });
     const queryClient = useQueryClient();
@@ -392,27 +392,27 @@ export class ZodiosHooksImpl<
       );
     }
     const key = [{ api: this.apiName, path }, params];
-    const query = ({ pageParam = undefined, signal }: QueryFunctionContext) =>
+    const query = (queryParams: QueryFunctionContext) =>
       this.zodios.get(path, {
         ...config,
         queries: {
           ...(config as any)?.queries,
-          ...pageParam?.queries,
+          ...queryParams.pageParam?.queries,
         },
         params: {
           ...(config as any)?.params,
-          ...pageParam?.params,
+          ...queryParams.pageParam?.params,
         },
         body:
           // istanbul ignore next
           hasObjectBody(config)
             ? {
                 ...(config as any)?.body,
-                ...pageParam?.body,
+                ...queryParams.pageParam?.body,
               }
             : (config as any)?.body,
         signal: this.options.shouldAbortOnUnmount
-          ? combineSignals(signal, (config as any)?.signal)
+          ? combineSignals(queryParams.signal, (config as any)?.signal)
           : (config as any)?.signal,
       } as unknown as ReadonlyDeep<TConfig>);
     const queryClient = useQueryClient();
@@ -507,27 +507,27 @@ export class ZodiosHooksImpl<
       );
     }
     const key = [{ api: this.apiName, path }, params];
-    const query = ({ pageParam = undefined, signal }: QueryFunctionContext) =>
+    const query = (queryParams: QueryFunctionContext) =>
       this.zodios.post(path, {
         ...config,
         queries: {
           ...(config as any)?.queries,
-          ...pageParam?.queries,
+          ...queryParams.pageParam?.queries,
         },
         params: {
           ...(config as any)?.params,
-          ...pageParam?.params,
+          ...queryParams.pageParam?.params,
         },
         body:
           // istanbul ignore next
           hasObjectBody(config)
             ? {
                 ...(config as any)?.body,
-                ...pageParam?.body,
+                ...queryParams.pageParam?.body,
               }
             : (config as any)?.body,
         signal: this.options.shouldAbortOnUnmount
-          ? combineSignals(signal, (config as any)?.signal)
+          ? combineSignals(queryParams.signal, (config as any)?.signal)
           : (config as any)?.signal,
       } as unknown as ReadonlyDeep<TConfig>);
     const queryClient = useQueryClient();