From e7ea54980531083868ba13edc1a48b1499ee31b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=83=E1=85=A9=E1=86=A8=E1=84=80=E1=85=A9=E1=84=92?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <dkh0324@midasin.com>
Date: Thu, 25 Sep 2025 14:48:50 +0900
Subject: [PATCH] fix(types): ensure non-undefined `data` on isSuccess with
 exactOptionalPropertyTypes

---
 packages/toolkit/src/query/react/buildHooks.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/toolkit/src/query/react/buildHooks.ts b/packages/toolkit/src/query/react/buildHooks.ts
index 37b081454d..49024015f2 100644
--- a/packages/toolkit/src/query/react/buildHooks.ts
+++ b/packages/toolkit/src/query/react/buildHooks.ts
@@ -734,17 +734,22 @@ type UseQueryStateDefaultResult<D extends QueryDefinition<any, any, any, any>> =
             isSuccess: true
             isFetching: true
             error: undefined
+          } & {
+            data: ResultTypeFrom<D>
           } & Required<
-            Pick<UseQueryStateBaseResult<D>, 'data' | 'fulfilledTimeStamp'>
+            Pick<UseQueryStateBaseResult<D>, 'fulfilledTimeStamp'>
           >)
         | ({
             isSuccess: true
             isFetching: false
             error: undefined
+          } & {
+            data: ResultTypeFrom<D>
+            currentData: ResultTypeFrom<D>
           } & Required<
             Pick<
               UseQueryStateBaseResult<D>,
-              'data' | 'fulfilledTimeStamp' | 'currentData'
+              'fulfilledTimeStamp'
             >
           >)
         | ({ isError: true } & Required<