Require initialPageParam value

reduxjs · Oct 24, 2024 · 2c39bf3 · 2c39bf3
1 parent 0ed9cd2
commit 2c39bf3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/packages/toolkit/src/query/core/apiState.ts b/packages/toolkit/src/query/core/apiState.ts
@@ -45,6 +45,7 @@ export type GetPreviousPageParamFunction<TPageParam, TQueryFnData> = (
 ) => TPageParam | undefined | null
 
 export type InfiniteQueryConfigOptions<TQueryFnData, TPageParam> = {
+  initialPageParam: TPageParam
   /**
    * This function can be set to automatically get the previous cursor for infinite queries.
    * The result will also be used to determine the value of `hasPreviousPage`.

diff --git a/packages/toolkit/src/query/core/buildThunks.ts b/packages/toolkit/src/query/core/buildThunks.ts
@@ -561,7 +561,8 @@ export function buildThunks<
           // Fetch first page
           result = await fetchPage(
             existingData,
-            existingData.pageParams[0] ?? arg.originalArgs,
+            existingData.pageParams[0] ??
+              endpointDefinition.infiniteQueryOptions.initialPageParam, // arg.originalArgs,
           )
 
           //original

diff --git a/packages/toolkit/src/query/endpointDefinitions.ts b/packages/toolkit/src/query/endpointDefinitions.ts
@@ -601,7 +601,7 @@ export interface InfiniteQueryExtraOptions<
    */
   invalidatesTags?: never
 
-  infiniteQueryOptions: InfiniteQueryConfigOptions<ResultType, QueryArg>
+  infiniteQueryOptions: InfiniteQueryConfigOptions<ResultType, PageParam>
 
   /**
    * Can be provided to return a custom cache key value based on the query arguments.

diff --git a/packages/toolkit/src/query/react/buildHooks.ts b/packages/toolkit/src/query/react/buildHooks.ts
@@ -1943,6 +1943,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
         const queryStateResults = useInfiniteQueryState(
           arg,
           {
+            initialPageParam: options?.initialPageParam!,
             getNextPageParam: options?.getNextPageParam!,
             getPreviousPageParam: options?.getPreviousPageParam,
           },

diff --git a/packages/toolkit/src/query/tests/buildHooks.test.tsx b/packages/toolkit/src/query/tests/buildHooks.test.tsx
@@ -783,6 +783,7 @@ describe('hooks tests', () => {
         endpoints: (builder) => ({
           getInfinitePokemon: builder.infiniteQuery<any, string, number>({
             infiniteQueryOptions: {
+              initialPageParam: 0,
               getNextPageParam: (
                 lastPage,
                 allPages,
@@ -813,6 +814,7 @@ describe('hooks tests', () => {
       function User() {
         const { data, isFetching, isUninitialized, fetchNextPage } =
           pokemonApi.endpoints.getInfinitePokemon.useInfiniteQuery('a', {
+            initialPageParam: 0,
             getNextPageParam: (lastPageParam) => lastPageParam + 1,
           })