fix(react-query): improve throwOnError logic with query state validation

- Pass query object to ensurePreventErrorBoundaryRetry for accurate state checking
- Preserve query deduplication behavior while fixing throwOnError function handling
- Fixes issue where throwOnError function couldn't access query error state

Author: Han5991

packages/react-query/src/__tests__/useQuery.test.tsx

@@ -6884,7 +6884,8 @@ describe('useQuery', () => {
 
     const initialFetchCount = fetchCount
 
-    renderWithClient(queryClient, 
+    renderWithClient(
+      queryClient,
       <ErrorBoundary
         fallbackRender={({ error }) => (
           <div>
@@ -6894,7 +6895,7 @@ describe('useQuery', () => {
         )}
       >
         <Component />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     )
 
     await vi.waitFor(() =>

packages/react-query/src/errorBoundaryUtils.ts

@@ -27,17 +27,17 @@ export const ensurePreventErrorBoundaryRetry = <
   errorResetBoundary: QueryErrorResetBoundaryValue,
   query?: Query<TQueryFnData, TError, TQueryData, TQueryKey>,
 ) => {
-  if (
-    options.suspense ||
-    options.experimental_prefetchInRender
-  ) {
+  if (options.suspense || options.experimental_prefetchInRender) {
     // Prevent retrying failed query if the error boundary has not been reset yet
     if (!errorResetBoundary.isReset()) {
       options.retryOnMount = false
     }
   } else if (options.throwOnError && !errorResetBoundary.isReset()) {
     if (typeof options.throwOnError === 'function') {
-      if (query?.state.error && shouldThrowError(options.throwOnError, [query.state.error, query])) {
+      if (
+        query?.state.error &&
+        shouldThrowError(options.throwOnError, [query.state.error, query])
+      ) {
         options.retryOnMount = false
       }
     } else {

packages/react-query/src/useBaseQuery.ts

@@ -53,6 +53,14 @@ export function useBaseQuery<
   const errorResetBoundary = useQueryErrorResetBoundary()
   const client = useQueryClient(queryClient)
   const defaultedOptions = client.defaultQueryOptions(options)
+  const query = client
+    .getQueryCache()
+    .get<
+      TQueryFnData,
+      TError,
+      TQueryData,
+      TQueryKey
+    >(defaultedOptions.queryHash)
 
   ;(client.getDefaultOptions().queries as any)?._experimental_beforeQuery?.(
     defaultedOptions,
@@ -72,8 +80,7 @@ export function useBaseQuery<
     : 'optimistic'
 
   ensureSuspenseTimers(defaultedOptions)
-  ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary)
-
+  ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary, query)
   useClearResetErrorBoundary(errorResetBoundary)
 
   // this needs to be invoked before creating the Observer because that can create a cache entry

packages/react-query/src/useQueries.ts

@@ -242,9 +242,10 @@ export function useQueries<
     [queries, client, isRestoring],
   )
 
-  defaultedQueries.forEach((query) => {
-    ensureSuspenseTimers(query)
-    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)
+  defaultedQueries.forEach((queryOptions) => {
+    ensureSuspenseTimers(queryOptions)
+    const query = client.getQueryCache().get(queryOptions.queryHash)
+    ensurePreventErrorBoundaryRetry(queryOptions, errorResetBoundary, query)
   })
 
   useClearResetErrorBoundary(errorResetBoundary)