fix failing test

mui · Nov 28, 2024 · 8da261b · 8da261b
1 parent 128234a
commit 8da261b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/x-data-grid/src/hooks/features/pagination/useGridPagination.ts b/packages/x-data-grid/src/hooks/features/pagination/useGridPagination.ts
@@ -10,6 +10,7 @@ import {
 import { useGridPaginationModel } from './useGridPaginationModel';
 import { useGridRowCount } from './useGridRowCount';
 import { useGridPaginationMeta } from './useGridPaginationMeta';
+import { gridFilteredTopLevelRowCountSelector } from '../filter';
 
 export const paginationStateInitializer: GridStateInitializer<
   Pick<
@@ -20,6 +21,7 @@ export const paginationStateInitializer: GridStateInitializer<
     | 'autoPageSize'
     | 'signature'
     | 'paginationMeta'
+    | 'paginationMode'
   >
 > = (state, props) => {
   const paginationModel = {
@@ -29,7 +31,10 @@ export const paginationStateInitializer: GridStateInitializer<
 
   throwIfPageSizeExceedsTheLimit(paginationModel.pageSize, props.signature);
 
-  const rowCount = props.rowCount ?? props.initialState?.pagination?.rowCount;
+  const rowCount =
+    props.rowCount ??
+    props.initialState?.pagination?.rowCount ??
+    (props.paginationMode === 'client' ? state.rows?.totalRowCount : undefined);
   const meta = props.paginationMeta ?? props.initialState?.pagination?.meta ?? {};
   return {
     ...state,