diff --git a/src/core/infiniteQueryBehavior.ts b/src/core/infiniteQueryBehavior.ts index df8f8f9798..3cb4168812 100644 --- a/src/core/infiniteQueryBehavior.ts +++ b/src/core/infiniteQueryBehavior.ts @@ -182,7 +182,7 @@ export function getPreviousPageParam( * Returns `undefined` if it cannot be determined. */ export function hasNextPage( - options: QueryOptions, + options: QueryOptions, pages?: unknown ): boolean | undefined { if (options.getNextPageParam && Array.isArray(pages)) { @@ -200,7 +200,7 @@ export function hasNextPage( * Returns `undefined` if it cannot be determined. */ export function hasPreviousPage( - options: QueryOptions, + options: QueryOptions, pages?: unknown ): boolean | undefined { if (options.getPreviousPageParam && Array.isArray(pages)) { diff --git a/src/core/infiniteQueryObserver.ts b/src/core/infiniteQueryObserver.ts index 1622ed0777..dbde391a97 100644 --- a/src/core/infiniteQueryObserver.ts +++ b/src/core/infiniteQueryObserver.ts @@ -5,6 +5,7 @@ import type { InfiniteData, InfiniteQueryObserverOptions, InfiniteQueryObserverResult, + QueryKey, } from './types' import type { QueryClient } from './queryClient' import { @@ -27,12 +28,14 @@ export class InfiniteQueryObserver< TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, - TQueryData = TQueryFnData + TQueryData = TQueryFnData, + TQueryKey extends QueryKey = QueryKey > extends QueryObserver< TQueryFnData, TError, InfiniteData, - InfiniteData + InfiniteData, + TQueryKey > { // Type override subscribe!: ( @@ -54,7 +57,8 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData + TQueryData, + TQueryKey > ) { super(client, options) @@ -71,7 +75,8 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData + TQueryData, + TQueryKey >, notifyOptions?: NotifyOptions ): void { @@ -89,7 +94,8 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData + TQueryData, + TQueryKey > ): InfiniteQueryObserverResult { options.behavior = infiniteQueryBehavior() @@ -125,12 +131,13 @@ export class InfiniteQueryObserver< } protected createResult( - query: Query>, + query: Query, TQueryKey>, options: InfiniteQueryObserverOptions< TQueryFnData, TError, TData, - TQueryData + TQueryData, + TQueryKey > ): InfiniteQueryObserverResult { const { state } = query