Merge branch 'main' into refactor/resolveValueOrFunction

Author: TkDodo

docs/framework/react/react-native.md

@@ -74,13 +74,15 @@ useEffect(() => {
 ## Refresh on Screen focus
 
 In some situations, you may want to refetch the query when a React Native Screen is focused again.
-This custom hook will call the provided `refetch` function when the screen is focused again.
+This custom hook will refetch **all active stale queries** when the screen is focused again.
 
 ```tsx
 import React from 'react'
 import { useFocusEffect } from '@react-navigation/native'
+import { useQueryClient } from '@tanstack/react-query'
 
-export function useRefreshOnFocus<T>(refetch: () => Promise<T>) {
+export function useRefreshOnFocus() {
+  const queryClient = useQueryClient()
   const firstTimeRef = React.useRef(true)
 
   useFocusEffect(
@@ -90,13 +92,18 @@ export function useRefreshOnFocus<T>(refetch: () => Promise<T>) {
         return
       }
 
-      refetch()
-    }, [refetch]),
+      // refetch all stale active queries
+      queryClient.refetchQueries({
+        queryKey: ['posts'],
+        stale: true,
+        type: 'active',
+      })
+    }, [queryClient]),
   )
 }
 ```
 
-In the above code, `refetch` is skipped the first time because `useFocusEffect` calls our callback on mount in addition to screen focus.
+In the above code, the first focus (when the screen is initially mounted) is skipped because `useFocusEffect` calls our callback on mount in addition to screen focus.
 
 ## Disable queries on out of focus screens
 

docs/framework/react/reference/hydration.md

@@ -91,7 +91,7 @@ hydrate(queryClient, dehydratedState, options)
     - `mutations: MutationOptions` The default mutation options to use for the hydrated mutations.
     - `queries: QueryOptions` The default query options to use for the hydrated queries.
     - `deserializeData?: (data: any) => any` A function to transform (deserialize) data before it is put into the cache.
-  - `queryClient?: QueryClient`,
+  - `queryClient?: QueryClient`
     - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 ### Limitations
@@ -122,7 +122,7 @@ function App() {
   - Optional
   - `defaultOptions: QueryOptions`
     - The default query options to use for the hydrated queries.
-  - `queryClient?: QueryClient`,
+  - `queryClient?: QueryClient`
     - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 [//]: # 'HydrationBoundary'

docs/framework/react/reference/useIsFetching.md

@@ -16,7 +16,7 @@ const isFetchingPosts = useIsFetching({ queryKey: ['posts'] })
 **Options**
 
 - `filters?: QueryFilters`: [Query Filters](../../guides/filters.md#query-filters)
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 **Returns**

docs/framework/react/reference/useIsMutating.md

@@ -16,7 +16,7 @@ const isMutatingPosts = useIsMutating({ mutationKey: ['posts'] })
 **Options**
 
 - `filters?: MutationFilters`: [Mutation Filters](../../guides/filters.md#mutation-filters)
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 **Returns**

docs/framework/react/reference/useMutation.md

@@ -103,7 +103,7 @@ mutate(variables, {
 
 **Parameter2 (QueryClient)**
 
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 **Returns**
@@ -128,7 +128,7 @@ mutate(variables, {
   - If you make multiple requests, `onSuccess` will fire only after the latest call you've made.
 - `mutateAsync: (variables: TVariables, { onSuccess, onSettled, onError }) => Promise<TData>`
   - Similar to `mutate` but returns a promise which can be awaited.
-- `status: string`
+- `status: MutationStatus`
   - Will be:
     - `idle` initial status prior to the mutation function executing.
     - `pending` if the mutation is currently executing.

docs/framework/react/reference/useMutationState.md

@@ -72,7 +72,7 @@ const latest = data[data.length - 1]
   - `filters?: MutationFilters`: [Mutation Filters](../../guides/filters.md#mutation-filters)
   - `select?: (mutation: Mutation) => TResult`
     - Use this to transform the mutation state.
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 **Returns**

docs/framework/react/reference/useQuery.md

@@ -91,7 +91,7 @@ const {
   - This function receives a `retryAttempt` integer and the actual Error and returns the delay to apply before the next attempt in milliseconds.
   - A function like `attempt => Math.min(attempt > 1 ? 2 ** attempt * 1000 : 1000, 30 * 1000)` applies exponential backoff.
   - A function like `attempt => attempt * 1000` applies linear backoff.
-- `staleTime: number | 'static' ((query: Query) => number | 'static')`
+- `staleTime: number | 'static' | ((query: Query) => number | 'static')`
   - Optional
   - Defaults to `0`
   - The time in milliseconds after which data is considered stale. This value only applies to the hook it is defined on.
@@ -154,12 +154,12 @@ const {
 - `initialDataUpdatedAt: number | (() => number | undefined)`
   - Optional
   - If set, this value will be used as the time (in milliseconds) of when the `initialData` itself was last updated.
-- `placeholderData: TData | (previousValue: TData | undefined; previousQuery: Query | undefined,) => TData`
+- `placeholderData: TData | (previousValue: TData | undefined, previousQuery: Query | undefined) => TData`
   - Optional
   - If set, this value will be used as the placeholder data for this particular query observer while the query is still in the `pending` state.
   - `placeholderData` is **not persisted** to the cache
   - If you provide a function for `placeholderData`, as a first argument you will receive previously watched query data if available, and the second argument will be the complete previousQuery instance.
-- `structuralSharing: boolean | (oldData: unknown | undefined, newData: unknown) => unknown)`
+- `structuralSharing: boolean | (oldData: unknown | undefined, newData: unknown) => unknown`
   - Optional
   - Defaults to `true`
   - If set to `false`, structural sharing between query results will be disabled.
@@ -178,7 +178,7 @@ const {
 
 **Parameter2 (QueryClient)**
 
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.
 
 **Returns**

docs/framework/react/reference/useQueryClient.md

@@ -13,5 +13,5 @@ const queryClient = useQueryClient(queryClient?: QueryClient)
 
 **Options**
 
-- `queryClient?: QueryClient`,
+- `queryClient?: QueryClient`
   - Use this to use a custom QueryClient. Otherwise, the one from the nearest context will be used.

docs/framework/react/typescript.md

@@ -250,8 +250,8 @@ function groupMutationOptions() {
 }
 
 useMutation({
-  ...groupMutationOptions()
-  onSuccess: () => queryClient.invalidateQueries({ queryKey: ['groups'] })
+  ...groupMutationOptions(),
+  onSuccess: () => queryClient.invalidateQueries({ queryKey: ['groups'] }),
 })
 useIsMutating(groupMutationOptions())
 queryClient.isMutating(groupMutationOptions())

examples/angular/auto-refetching/package.json

@@ -13,7 +13,7 @@
     "@angular/compiler": "^20.0.0",
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.85.5",
+    "@tanstack/angular-query-experimental": "^5.85.6",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"