Skip to content

fix(react-query): allow passing options to useQuery without initialData #3873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 21, 2022
Merged

fix(react-query): allow passing options to useQuery without initialData #3873

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b4c444
fix(react-query): allow passing options to useQuery without initialData
Jul 19, 2022
06c1e3d
fix: switch DefinedUseQueryResult for UseQueryResult
Jul 19, 2022
b755ce2
fix: add function overload that returns DefinedUseQueryResult
Jul 19, 2022
8c7f1c8
fix: move new overload functions to the end
Jul 20, 2022
1d3b9ec
chore: add new overloads to the other versions of the useQuery hook
Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions packages/react-query/src/useQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ export function useQuery<
> & { initialData: TQueryFnData | (() => TQueryFnData) },
): DefinedUseQueryResult<TData, TError>

export function useQuery<
TQueryFnData = unknown,
TError = unknown,
TData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
>(
options: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
): UseQueryResult<TData, TError>

export function useQuery<
TQueryFnData = unknown,
TError = unknown,
Expand All @@ -59,6 +68,19 @@ export function useQuery<
> & { initialData: TQueryFnData | (() => TQueryFnData) },
): DefinedUseQueryResult<TData, TError>

export function useQuery<
TQueryFnData = unknown,
TError = unknown,
TData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
>(
queryKey: TQueryKey,
options?: Omit<
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
'queryKey'
>,
): UseQueryResult<TData, TError>

export function useQuery<
TQueryFnData = unknown,
TError = unknown,
Expand Down Expand Up @@ -87,6 +109,20 @@ export function useQuery<
> & { initialData: TQueryFnData | (() => TQueryFnData) },
): DefinedUseQueryResult<TData, TError>

export function useQuery<
TQueryFnData = unknown,
TError = unknown,
TData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
>(
queryKey: TQueryKey,
queryFn: QueryFunction<TQueryFnData, TQueryKey>,
options?: Omit<
UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
'queryKey' | 'queryFn'
>,
): UseQueryResult<TData, TError>

export function useQuery<
TQueryFnData,
TError,
Expand Down