Fix error on page transition with multiple queries (#1737)

wpengine · Jan 17, 2024 · 1b495d7 · 1b495d7
1 parent 7764c37
commit 1b495d7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/.changeset/modern-walls-destroy.md b/.changeset/modern-walls-destroy.md
@@ -0,0 +1,5 @@
+---
+'@faustwp/core': patch
+---
+
+Fixes a bug when navigating to a page client side that threw an error with multiple queries.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/faustwp-core/src/components/FaustProvider.tsx b/packages/faustwp-core/src/components/FaustProvider.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { ApolloProvider } from '@apollo/client';
 // eslint-disable-next-line import/extensions
 import { useRouter } from 'next/router';
@@ -37,6 +37,15 @@ export function FaustProvider(props: {
     setQueries,
   });
 
+  /**
+   * On page transitions, reset the queries state based on the new page props.
+   */
+  useEffect(() => {
+    // eslint-disable-next-line no-underscore-dangle
+    if (pageProps.__FAUST_QUERIES__) setQueries(pageProps.__FAUST_QUERIES__);
+    // eslint-disable-next-line no-underscore-dangle
+  }, [pageProps.__FAUST_QUERIES__]);
+
   return (
     <FaustContext.Provider value={faustContext}>
       <ApolloProvider client={apolloClient}>