Merge branch 'main' into test/react-query-hydration-boundary-invalid-state-handling

Author: manudeli

docs/framework/react/guides/query-cancellation.md

@@ -188,6 +188,24 @@ return (
 
 [//]: # 'Example7'
 
+## `Cancel Options`
+
+Cancel options are used to control the behavior of query cancellation operations.
+
+```tsx
+// Cancel specific queries silently
+await queryClient.cancelQueries({ queryKey: ['posts'] }, { silent: true })
+```
+
+A cancel options object supports the following properties:
+
+- `silent?: boolean`
+  - When set to `true`, suppresses propagation of `CancelledError` to observers (e.g., `onError` callbacks) and related notifications, and returns the retry promise instead of rejecting.
+  - Defaults to `false`
+- `revert?: boolean`
+  - When set to `true`, restores the query’s state (data and status) from immediately before the in-flight fetch, sets `fetchStatus` back to `idle`, and only throws if there was no prior data.
+  - Defaults to `true`
+
 ## Limitations
 
 Cancellation does not work when working with `Suspense` hooks: `useSuspenseQuery`, `useSuspenseQueries` and `useSuspenseInfiniteQuery`.

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/reference/QueryClient.md

@@ -403,12 +403,16 @@ The `cancelQueries` method can be used to cancel outgoing queries based on their
 This is most useful when performing optimistic updates since you will likely need to cancel any outgoing query refetches so they don't clobber your optimistic update when they resolve.
 
 ```tsx
-await queryClient.cancelQueries({ queryKey: ['posts'], exact: true })
+await queryClient.cancelQueries(
+  { queryKey: ['posts'], exact: true },
+  { silent: true },
+)
 ```
 
 **Options**
 
 - `filters?: QueryFilters`: [Query Filters](../../framework/react/guides/filters.md#query-filters)
+- `cancelOptions?: CancelOptions`: [Cancel Options](../../framework/react/guides/query-cancellation.md#cancel-options)
 
 **Returns**
 

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.6",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"

examples/angular/basic-persister/package.json

@@ -13,9 +13,9 @@
     "@angular/compiler": "^20.0.0",
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.85.6",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "@tanstack/angular-query-persist-client": "^5.62.7",
-    "@tanstack/query-async-storage-persister": "^5.85.6",
+    "@tanstack/query-async-storage-persister": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"

examples/angular/basic/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.6",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"

examples/angular/devtools-panel/package.json

@@ -14,8 +14,8 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/router": "^20.0.0",
-    "@tanstack/angular-query-devtools-experimental": "^5.85.6",
-    "@tanstack/angular-query-experimental": "^5.85.6",
+    "@tanstack/angular-query-devtools-experimental": "^5.85.7",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"

examples/angular/infinite-query-with-max-pages/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.6",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"

examples/angular/optimistic-updates/package.json

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

examples/angular/pagination/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.6",
+    "@tanstack/angular-query-experimental": "^5.85.7",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"