fix(query): gracefully handle CancelledError

pmndrs · Jul 8, 2021 · e5b96c0 · e5b96c0
1 parent b49d38e
commit e5b96c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.size-snapshot.json b/.size-snapshot.json
@@ -70,9 +70,9 @@
     }
   },
   "query.js": {
-    "bundled": 5170,
-    "minified": 2240,
-    "gzipped": 686,
+    "bundled": 5330,
+    "minified": 2351,
+    "gzipped": 746,
     "treeshaked": {
       "rollup": {
         "code": 105,

diff --git a/src/query/atomWithInfiniteQuery.ts b/src/query/atomWithInfiniteQuery.ts
@@ -5,6 +5,7 @@ import {
   InfiniteData,
   InitialDataFunction,
   QueryObserverResult,
+  isCancelledError,
 } from 'react-query'
 import { atom } from 'jotai'
 import type { WritableAtom, Getter } from 'jotai'
@@ -60,6 +61,7 @@ export function atomWithInfiniteQuery<
               >
             )()
           : options.initialData
+
       const dataAtom = atom<
         | InfiniteData<TData | TQueryData>
         | Promise<InfiniteData<TData | TQueryData>>
@@ -87,7 +89,7 @@ export function atomWithInfiniteQuery<
           | QueryObserverResult<InfiniteData<TData>, TError>
           | { data?: undefined; error: TError }
       ) => {
-        if (result.error) {
+        if (result.error && !isCancelledError(result.error)) {
           if (settlePromise) {
             settlePromise(null, result.error)
             settlePromise = null