From 7e337581096c0f88371c473e912c7eb19eaeed5d Mon Sep 17 00:00:00 2001
From: Ronny Hsieh <46809311+ronny1020@users.noreply.github.com>
Date: Fri, 5 Aug 2022 23:35:12 +0800
Subject: [PATCH 1/2] feat(react-query): `isLoading` of type
 `DefinedUseQueryResult` is always false

---
 packages/react-query/src/types.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts
index c83bb5b26a..7172518c79 100644
--- a/packages/react-query/src/types.ts
+++ b/packages/react-query/src/types.ts
@@ -65,10 +65,10 @@ export type UseQueryResult<
   TError = unknown,
 > = UseBaseQueryResult<TData, TError>
 
-export type DefinedUseQueryResult<TData = unknown, TError = unknown> = Omit<
-  UseQueryResult<TData, TError>,
-  'data'
-> & { data: TData }
+export type DefinedUseQueryResult<
+  TData = unknown,
+  TError = unknown,
+> = UseQueryResult<TData, TError> & { data: TData; isLoading: false }
 
 export type UseInfiniteQueryResult<
   TData = unknown,

From 1f9b6264d0b3297674c0d3e37564496785d74b05 Mon Sep 17 00:00:00 2001
From: Ronny Hsieh <46809311+ronny1020@users.noreply.github.com>
Date: Sat, 13 Aug 2022 16:29:19 +0800
Subject: [PATCH 2/2] feat(definedusequeryresult): get the proper loading
 related property types

---
 packages/query-core/src/types.ts  | 7 +++++--
 packages/react-query/src/types.ts | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts
index ad8188e9f0..bca4c23605 100644
--- a/packages/query-core/src/types.ts
+++ b/packages/query-core/src/types.ts
@@ -425,11 +425,14 @@ export interface QueryObserverSuccessResult<TData = unknown, TError = unknown>
   status: 'success'
 }
 
+export type DefinedQueryObserverResult<TData = unknown, TError = unknown> =
+  | QueryObserverRefetchErrorResult<TData, TError>
+  | QueryObserverSuccessResult<TData, TError>
+
 export type QueryObserverResult<TData = unknown, TError = unknown> =
+  | DefinedQueryObserverResult<TData, TError>
   | QueryObserverLoadingErrorResult<TData, TError>
   | QueryObserverLoadingResult<TData, TError>
-  | QueryObserverRefetchErrorResult<TData, TError>
-  | QueryObserverSuccessResult<TData, TError>
 
 export interface InfiniteQueryObserverBaseResult<
   TData = unknown,
diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts
index 7172518c79..cd626fc3e1 100644
--- a/packages/react-query/src/types.ts
+++ b/packages/react-query/src/types.ts
@@ -8,6 +8,7 @@ import {
   QueryKey,
   MutationObserverOptions,
   MutateFunction,
+  DefinedQueryObserverResult,
 } from '@tanstack/query-core'
 import type { QueryClient } from '@tanstack/query-core'
 
@@ -65,10 +66,15 @@ export type UseQueryResult<
   TError = unknown,
 > = UseBaseQueryResult<TData, TError>
 
+export type DefinedUseBaseQueryResult<
+  TData = unknown,
+  TError = unknown,
+> = DefinedQueryObserverResult<TData, TError>
+
 export type DefinedUseQueryResult<
   TData = unknown,
   TError = unknown,
-> = UseQueryResult<TData, TError> & { data: TData; isLoading: false }
+> = DefinedUseBaseQueryResult<TData, TError>
 
 export type UseInfiniteQueryResult<
   TData = unknown,