File tree Expand file tree Collapse file tree 3 files changed +8
-2
lines changed
Expand file tree Collapse file tree 3 files changed +8
-2
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ " @comet/admin " : patch
3+ ---
4+
5+ Fix pagination labels for empty DataGrids
Original file line number Diff line number Diff line change @@ -52,7 +52,8 @@ export const DataGridPagination: FunctionComponent<DataGridPaginationProps> = (i
5252 id = "comet.dataGridPagination.pageInformation"
5353 defaultMessage = "{itemsFrom}-{itemsTo} of {itemsTotal} items"
5454 values = { {
55- itemsFrom : paginationState . paginationModel . page * paginationState . paginationModel . pageSize + 1 ,
55+ itemsFrom :
56+ paginationState . rowCount === 0 ? 0 : paginationState . paginationModel . page * paginationState . paginationModel . pageSize + 1 ,
5657 itemsTo : Math . min (
5758 ( paginationState . paginationModel . page + 1 ) * paginationState . paginationModel . pageSize ,
5859 paginationState . rowCount ,
Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ export const DataGridPaginationActions: FunctionComponent<PropsWithChildren<Data
6767 defaultMessage = "Page {page} of {pageCount}"
6868 id = "comet.dataGridPaginationActions.pageXOfY"
6969 values = { {
70- page : page + 1 ,
70+ page : pageCount === 0 ? 0 : page + 1 ,
7171 pageCount : pageCount ,
7272 } }
7373 />
You can’t perform that action at this time.
0 commit comments