From 53e8424041d1b6765d03fcf61d6d6e754b51c4c8 Mon Sep 17 00:00:00 2001
From: Jack Zhao <bugzpodder@hotmail.com>
Date: Fri, 26 Jun 2020 22:48:21 -0700
Subject: [PATCH] fix: disabling query in suspense mode (#643)

---
 src/react/tests/suspense.test.js | 25 +++++++++++++++++++++++++
 src/react/utils.js               |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/react/tests/suspense.test.js b/src/react/tests/suspense.test.js
index 81d405ad4f..e30de2605e 100644
--- a/src/react/tests/suspense.test.js
+++ b/src/react/tests/suspense.test.js
@@ -151,4 +151,29 @@ describe("useQuery's in Suspense mode", () => {
 
     await waitFor(() => rendered.getByText('rendered'))
   })
+
+  it('should not call the queryFn when not enabled', async () => {
+    const queryFn = jest.fn()
+    queryFn.mockImplementation(() => sleep(10))
+
+    function Page() {
+      const [enabled, setEnabled] = React.useState(false)
+      useQuery(['test'], queryFn, { suspense: true, enabled })
+
+      return <button aria-label="fire" onClick={() => setEnabled(true)} />
+    }
+
+    const rendered = render(
+      <React.Suspense fallback="loading">
+        <Page />
+      </React.Suspense>
+    )
+
+    expect(queryFn).toHaveBeenCalledTimes(0)
+
+    fireEvent.click(rendered.getByLabelText('fire'))
+
+    expect(queryFn).toHaveBeenCalledTimes(1)
+    await waitFor(() => rendered.getByLabelText('fire'))
+  })
 })
diff --git a/src/react/utils.js b/src/react/utils.js
index 0d18852ba9..6d62d75d7a 100644
--- a/src/react/utils.js
+++ b/src/react/utils.js
@@ -68,7 +68,11 @@ export function handleSuspense(queryInfo) {
       throw queryInfo.error
     }
 
-    if (queryInfo.query.config.suspense && queryInfo.status !== statusSuccess) {
+    if (
+      queryInfo.query.config.suspense &&
+      queryInfo.status !== statusSuccess &&
+      queryInfo.query.config.enabled
+    ) {
       queryInfo.query.wasSuspended = true
       throw queryInfo.query.fetch()
     }