Allow @defer to work in queries with suspense enabled (#3687)

urql-graphql · Oct 7, 2024 · a5bc925 · a5bc925
1 parent 0438740
commit a5bc925
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changeset/shiny-eagles-join.md b/.changeset/shiny-eagles-join.md
@@ -0,0 +1,5 @@
+---
+'urql': minor
+---
+
+Support use of defer with suspense
diff --git a/packages/react-urql/src/hooks/useQuery.ts b/packages/react-urql/src/hooks/useQuery.ts
@@ -263,7 +263,12 @@ export function useQuery<
 
         const subscription = pipe(
           source,
-          takeWhile(() => (suspense && !resolve) || !result),
+          takeWhile(
+            () =>
+              (suspense && !resolve) ||
+              !result ||
+              ('hasNext' in result && result.hasNext)
+          ),
           subscribe(_result => {
             result = _result;
             if (resolve) resolve(result);