Added: "All" option to "rows per page" in TablePagination API

changed API to enable key value pairs as 'rows per page options' removed -1 from default 'rows per page options'
mui · Oct 15, 2019 · 78bcda7 · 78bcda7
1 parent 83f5e19
commit 78bcda7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/src/pages/components/tables/CustomPaginationActionsTable.js b/docs/src/pages/components/tables/CustomPaginationActionsTable.js
@@ -152,7 +152,7 @@ export default function CustomPaginationActionsTable() {
           <TableFooter>
             <TableRow>
               <TablePagination
-                rowsPerPageOptions={[5, 10, 25]}
+                rowsPerPageOptions={[5, 10, 25, { label: 'All', value: -1 }]}
                 colSpan={3}
                 count={rows.length}
                 rowsPerPage={rowsPerPage}

diff --git a/packages/material-ui/src/TablePagination/TablePagination.js b/packages/material-ui/src/TablePagination/TablePagination.js
@@ -125,9 +125,9 @@ const TablePagination = React.forwardRef(function TablePagination(props, ref) {
               <MenuItemComponent
                 className={classes.menuItem}
                 key={rowsPerPageOption}
-                value={rowsPerPageOption}
+                value={rowsPerPageOption.value ? rowsPerPageOption.value : rowsPerPageOption}
               >
-                {rowsPerPageOption}
+                {rowsPerPageOption.label ? rowsPerPageOption.label : rowsPerPageOption}
               </MenuItemComponent>
             ))}
           </Select>