From 29351822cfc9eaa7625eaefc9df70dde05b45cc0 Mon Sep 17 00:00:00 2001 From: Manan Telrandhe Date: Thu, 23 Jul 2026 11:30:53 +0530 Subject: [PATCH 1/2] fix(solid-query): avoid cycling internal resource when data is settled to prevent Suspense detach --- packages/solid-query/src/useBaseQuery.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/solid-query/src/useBaseQuery.ts b/packages/solid-query/src/useBaseQuery.ts index 773d0719e0c..0c27f37cbf8 100644 --- a/packages/solid-query/src/useBaseQuery.ts +++ b/packages/solid-query/src/useBaseQuery.ts @@ -182,8 +182,11 @@ export function useBaseQuery< return obs.subscribe((result) => { observerResult = result queueMicrotask(() => { - if (unsubscribe) { + if (!unsubscribe) return + if (resolver || result.isLoading || result.isError) { refetch() + } else { + setStateWithReconciliation(result) } }) }) From b7f0996c4757b25b1fa11d36a316b37832d7648d Mon Sep 17 00:00:00 2001 From: Manan Telrandhe Date: Fri, 24 Jul 2026 09:56:32 +0530 Subject: [PATCH 2/2] fix(solid-query): address suspense detachment PR feedback --- packages/solid-query/src/useBaseQuery.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/solid-query/src/useBaseQuery.ts b/packages/solid-query/src/useBaseQuery.ts index 0c27f37cbf8..f748ea03cbd 100644 --- a/packages/solid-query/src/useBaseQuery.ts +++ b/packages/solid-query/src/useBaseQuery.ts @@ -182,8 +182,8 @@ export function useBaseQuery< return obs.subscribe((result) => { observerResult = result queueMicrotask(() => { - if (!unsubscribe) return - if (resolver || result.isLoading || result.isError) { + if (!unsubscribe || observer() !== obs) return + if (resolver || result.isLoading || (result.isFetching && result.isError)) { refetch() } else { setStateWithReconciliation(result)