Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/null-page-param-refetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tanstack/query-core': patch
---

Preserve a stored `null` first page parameter when refetching an infinite query.
24 changes: 24 additions & 0 deletions packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,30 @@ describe('InfiniteQueryBehavior', () => {
unsubscribe()
})

it('should preserve a null first page parameter when refetching', async () => {
const key = queryKey()
const pageParams: Array<unknown> = []
const queryFn = ({ pageParam }: { pageParam: unknown }) => {
pageParams.push(pageParam)
return String(pageParam)
}

await queryClient.infiniteQuery({
queryKey: key,
queryFn,
initialPageParam: null,
getNextPageParam: () => undefined,
})
await queryClient.infiniteQuery({
queryKey: key,
queryFn,
initialPageParam: 'replacement',
getNextPageParam: () => undefined,
})

expect(pageParams).toEqual([null, null])
})

it('should not fetch next page when getNextPageParam returns null', async () => {
const key = queryKey()

Expand Down
4 changes: 3 additions & 1 deletion packages/query-core/src/infiniteQueryBehavior.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ export function infiniteQueryBehavior<TQueryFnData, TError, TData, TPageParam>(
do {
const param =
currentPage === 0
? (oldPageParams[0] ?? options.initialPageParam)
? oldPageParams[0] === undefined
? options.initialPageParam
: oldPageParams[0]
: getNextPageParam(options, result)
if (currentPage > 0 && param == null) {
break
Expand Down