Skip to content

Commit a05675b

Browse files
Katarina Antonkaciakmaciak
authored andcommitted
fix(useInfiniteSubscription): fix unsubscribing when previous/next page has been fetched
1 parent 1ec16d5 commit a05675b

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/subscription-storage.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ export function cleanupSubscription<
5353

5454
if (!subscription) return;
5555

56-
subscription.forEach((subscription) => {
57-
subscription.unsubscribe();
58-
});
59-
6056
if (pageParam === undefined) {
6157
subscription.forEach((subscription) => {
6258
subscription.unsubscribe();

src/use-infinite-subscription.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export interface UseInfiniteSubscriptionOptions<
7878
onData?: (data: InfiniteData<TData>) => void;
7979
}
8080

81-
export type UseSubscriptionResult<
81+
export type UseInfiniteSubscriptionResult<
8282
TData = unknown,
8383
TError = unknown
8484
> = UseInfiniteQueryResult<TData, TError>;
@@ -160,14 +160,14 @@ export function useInfiniteSubscription<
160160
TData,
161161
TSubscriptionKey
162162
> = {}
163-
): UseSubscriptionResult<TData, TError> {
163+
): UseInfiniteSubscriptionResult<TData, TError> {
164164
const { queryFn, clearErrors } = useObservableQueryFn(
165165
subscriptionFn,
166166
(data, previousData, pageParam): InfiniteData<TSubscriptionFnData> => {
167167
if (!isInfiniteData(previousData)) {
168168
return {
169169
pages: [data],
170-
pageParams: [undefined],
170+
pageParams: [pageParam],
171171
};
172172
}
173173
const pageIndex = previousData.pageParams.findIndex(

0 commit comments

Comments
 (0)