From 494f6828f023eb05bcbe22b6de570e043afb05bc Mon Sep 17 00:00:00 2001 From: ToastHawaii Date: Wed, 13 Nov 2024 10:54:38 +0100 Subject: [PATCH 1/2] Update useSubscribe.ts Fix to make things more stable. --- packages/react-meteor-data/suspense/useSubscribe.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/react-meteor-data/suspense/useSubscribe.ts b/packages/react-meteor-data/suspense/useSubscribe.ts index f95ca4d3..26ab51b5 100644 --- a/packages/react-meteor-data/suspense/useSubscribe.ts +++ b/packages/react-meteor-data/suspense/useSubscribe.ts @@ -26,10 +26,6 @@ export function useSubscribeSuspense(name: string, ...params: EJSON[]) { cachedSubscriptions.find(x => x.name === name && isEqual(x.params, params)) if (cachedSubscription) { cachedSubscription.handle?.stop() - remove(cachedSubscriptions, - x => - x.name === cachedSubscription.name && - isEqual(x.params, cachedSubscription.params)) } }, 0) }, [name, EJSON.stringify(params)]) @@ -51,6 +47,12 @@ export function useSubscribeSuspense(name: string, ...params: EJSON[]) { resolve(h) }, onStop(error: unknown) { + if(!error){ + remove(cachedSubscriptions, + x => + x.name === subscription.name && + isEqual(x.params, subscription.params)) + } subscription.error = error subscription.handle = h reject(error) From 634f077eb615b614684d28af699facc941defa60 Mon Sep 17 00:00:00 2001 From: ToastHawaii Date: Wed, 13 Nov 2024 15:14:59 +0100 Subject: [PATCH 2/2] Update packages/react-meteor-data/suspense/useSubscribe.ts Co-authored-by: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com> --- packages/react-meteor-data/suspense/useSubscribe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-meteor-data/suspense/useSubscribe.ts b/packages/react-meteor-data/suspense/useSubscribe.ts index 26ab51b5..561c9615 100644 --- a/packages/react-meteor-data/suspense/useSubscribe.ts +++ b/packages/react-meteor-data/suspense/useSubscribe.ts @@ -47,7 +47,7 @@ export function useSubscribeSuspense(name: string, ...params: EJSON[]) { resolve(h) }, onStop(error: unknown) { - if(!error){ + if (!error) { remove(cachedSubscriptions, x => x.name === subscription.name &&