fix: param variables in enabled function

HuolalaTech · Apr 26, 2023 · 0743f47 · 0743f47
1 parent c37d3ed
commit 0743f47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/createBaseQuery.ts b/src/createBaseQuery.ts
@@ -5,6 +5,7 @@ import type {
   AdditionalQueryHookOptions,
   Updater,
 } from './types'
+import { isUndefined } from './utils'
 
 interface CreateQueryOptions
   extends Omit<UseBaseQueryOptions, 'queryKey' | 'queryFn' | 'enabled'>,
@@ -34,10 +35,10 @@ export function createBaseQuery(
   const getPrimaryKey = () => primaryKey
 
   const getKey = (variables?: any) =>
-    typeof variables === 'undefined' ? [primaryKey] : [primaryKey, variables]
+    isUndefined(variables) ? [primaryKey] : [primaryKey, variables]
 
   const useGeneratedQuery = ({
-    variables,
+    variables: currVariables,
     ...currOptions
   }: QueryBaseHookOptions = {}) => {
     const {
@@ -49,7 +50,9 @@ export function createBaseQuery(
       ...useDefaultOptions?.(),
     } as QueryBaseHookOptions
 
-    const queryKey = getKey(variables ?? prevVariables)
+    const variables = isUndefined(currVariables) ? prevVariables : currVariables
+
+    const queryKey = getKey(variables)
 
     const { enabled, ...mergedOptions } = {
       ...prevOptions,

diff --git a/src/utils.ts b/src/utils.ts
@@ -0,0 +1,3 @@
+export function isUndefined(value: any): value is undefined {
+  return typeof value === 'undefined'
+}