@octanejs/apollo-client 0.1.24 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/apollo-client",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -62,7 +62,7 @@
     "@apollo/client": ">=4.2.6 <4.3.0",
     "graphql": "^16.0.0 || ^17.0.0",
     "rxjs": "^7.3.0",
-    "octane": "0.1.29"
+    "octane": "0.1.30"
   },
   "devDependencies": {
     "@apollo/client": "4.2.6",
@@ -73,7 +73,7 @@
     "react-dom": "^19.2.7",
     "rxjs": "^7.8.2",
     "vitest": "^4.1.10",
-    "octane": "0.1.29"
+    "octane": "0.1.30"
   },
   "scripts": {
     "test": "vitest run --root ../.. --project apollo-client"

package/src/react/hooks/useQuery.js

@@ -26,6 +26,11 @@ import { isCompilerSite } from './internal/site.js';
 import { useApolloClient } from './useApolloClient.js';
 import { useSyncExternalStore } from './useSyncExternalStore.js';
 const lastWatchOptions = Symbol();
+const linkedQueryStateOptions = {
+	sourceEqual(previous, next) {
+		return previous.client === next.client && previous.query === next.query;
+	},
+};
 export const useQuery = function useQuery(query, options) {
 	'use no memo';
 	if (isCompilerSite(options, skipToken)) options = undefined;
@@ -54,16 +59,11 @@ function useQuery_(query, options = {}) {
 			},
 		};
 	}
-	let [state, setState] = React.useState(createState);
-	if (client !== state.client || query !== state.query) {
-		// If the client or query have changed, we need to create a new InternalState.
-		// This will trigger a re-render with the new state, but it will also continue
-		// to run the current render function to completion.
-		// Since we sometimes trigger some side-effects in the render function, we
-		// re-assign `state` to the new state to ensure that those side-effects are
-		// triggered with the new state.
-		setState((state = createState(state)));
-	}
+	const [state] = React.useLinkedState(
+		{ client, query },
+		(_source, previous) => createState(previous?.value),
+		linkedQueryStateOptions,
+	);
 	const { observable, resultData } = state;
 	useInitialFetchPolicyIfNecessary(watchQueryOptions, observable);
 	useResubscribeIfNecessary(