Skip to content
Merged
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
28 changes: 28 additions & 0 deletions packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,32 @@ describe('InfiniteQueryBehavior', () => {

expect(reFetchedData.data?.pageParams).toEqual([1, 2, 3])
})

test('should fetch even if initialPageParam is null', async () => {
const key = queryKey()

const observer = new InfiniteQueryObserver(queryClient, {
queryKey: key,
queryFn: async () => 'data',
getNextPageParam: () => null,
initialPageParam: null,
})

let observerResult:
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
})

await waitFor(() =>
expect(observerResult).toMatchObject({
isFetching: false,
data: { pages: ['data'], pageParams: [null] },
}),
)

unsubscribe()
})
})
2 changes: 1 addition & 1 deletion packages/query-core/src/infiniteQueryBehavior.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export function infiniteQueryBehavior<TQueryFnData, TError, TData, TPageParam>(
currentPage === 0
? (oldPageParams[0] ?? options.initialPageParam)
: getNextPageParam(options, result)
if (param == null) {
if (currentPage > 0 && param == null) {
break
}
result = await fetchPage(result, param)
Expand Down
Loading