Review suggestions

Signed-off-by: brookewp <[email protected]>
Automattic · Feb 25, 2025 · 7a5ef2b · 7a5ef2b
1 parent 1ec7391
commit 7a5ef2b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/inc/Validation/ConfigSchemas.php b/inc/Validation/ConfigSchemas.php
@@ -288,9 +288,8 @@ private static function generate_http_query_config_schema(): array {
 			'pagination_schema' => Types::nullable(
 				Types::object( [
 					// This field provides an integer representing the total number of
-					// items available in paginated results. This field must be defined
-					// in order present to enable pagination support of any type,
-					// including cursor-based pagination.
+					// items available in paginated results. Either this field or
+					// `has_next_page` must be defined in order to enable
 					'total_items' => Types::nullable(
 						Types::object( [
 							'name' => Types::nullable( Types::string() ),

diff --git a/src/blocks/remote-data-container/components/item-list/ItemList.tsx b/src/blocks/remote-data-container/components/item-list/ItemList.tsx
@@ -162,7 +162,7 @@ export function ItemList( props: ItemListProps ) {
 			onChangeView={ onChangeView }
 			paginationInfo={ {
 				totalItems: totalItems ?? data.length,
-				totalPages: totalPages ?? ( hasNextPage ? page + 1 : page - 1 ),
+				totalPages: totalPages ?? ( hasNextPage ? page + 1 : page - 1 ) ?? 1,
 			} }
 			search={ supportsSearch }
 			view={ view }

diff --git a/src/blocks/remote-data-container/hooks/usePaginationVariables.ts b/src/blocks/remote-data-container/hooks/usePaginationVariables.ts
@@ -36,7 +36,7 @@ export function usePaginationVariables( {
 	initialPerPage,
 	inputVariables,
 }: UsePaginationVariablesInput ): UsePaginationVariables {
-	const [ paginationData, setPaginationData ] = useState< RemoteDataPagination >( {} );
+	const [ paginationData, setPaginationData ] = useState< RemoteDataPagination >();
 	const [ page, setPage ] = useState< number >( initialPage );
 	const [ perPage, setPerPage ] = useState< number | null >( initialPerPage ?? null );
 

diff --git a/types/remote-data.d.ts b/types/remote-data.d.ts
@@ -3,9 +3,9 @@ interface InnerBlockContext {
 }
 
 interface RemoteDataPagination {
-    hasNextPage?: boolean;
     cursorNext?: string;
     cursorPrevious?: string;
+	hasNextPage?: boolean;
 	totalItems?: number;
 }