@tanstack/react-query 5.0.0-alpha.19 → 5.0.0-alpha.21

package/src/useBaseQuery.ts

@@ -41,25 +41,6 @@ export function useBaseQuery<
     ? 'isRestoring'
     : 'optimistic'
 
-  // Include callbacks in batch renders
-  if (defaultedOptions.onError) {
-    defaultedOptions.onError = notifyManager.batchCalls(
-      defaultedOptions.onError,
-    )
-  }
-
-  if (defaultedOptions.onSuccess) {
-    defaultedOptions.onSuccess = notifyManager.batchCalls(
-      defaultedOptions.onSuccess,
-    )
-  }
-
-  if (defaultedOptions.onSettled) {
-    defaultedOptions.onSettled = notifyManager.batchCalls(
-      defaultedOptions.onSettled,
-    )
-  }
-
   ensureStaleTime(defaultedOptions)
   ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary)
 

package/src/useQueries.ts

@@ -166,6 +166,7 @@ export function useQueries<T extends any[]>(
 ): QueriesResults<T> {
   const client = useQueryClient(queryClient)
   const isRestoring = useIsRestoring()
+  const errorResetBoundary = useQueryErrorResetBoundary()
 
   const defaultedQueries = React.useMemo(
     () =>
@@ -182,6 +183,13 @@ export function useQueries<T extends any[]>(
     [queries, client, isRestoring],
   )
 
+  defaultedQueries.forEach((query) => {
+    ensureStaleTime(query)
+    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)
+  })
+
+  useClearResetErrorBoundary(errorResetBoundary)
+
   const [observer] = React.useState(
     () => new QueriesObserver(client, defaultedQueries),
   )
@@ -206,15 +214,6 @@ export function useQueries<T extends any[]>(
     observer.setQueries(defaultedQueries, { listeners: false })
   }, [defaultedQueries, observer])
 
-  const errorResetBoundary = useQueryErrorResetBoundary()
-
-  defaultedQueries.forEach((query) => {
-    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)
-    ensureStaleTime(query)
-  })
-
-  useClearResetErrorBoundary(errorResetBoundary)
-
   const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>
     shouldSuspend(defaultedQueries[index], result, isRestoring),
   )
@@ -238,14 +237,14 @@ export function useQueries<T extends any[]>(
   if (suspensePromises.length > 0) {
     throw Promise.all(suspensePromises)
   }
-
+  const observerQueries = observer.getQueries()
   const firstSingleResultWhichShouldThrow = optimisticResult.find(
     (result, index) =>
       getHasError({
         result,
         errorResetBoundary,
         throwErrors: defaultedQueries[index]?.throwErrors ?? false,
-        query: observer.getQueries()[index]!,
+        query: observerQueries[index]!,
       }),
   )