[TablePagination] Allow more rows per pages

mui · Nov 7, 2018 · 4952c38 · 4952c38
1 parent 4eeb7a2
commit 4952c38
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/docs/src/pages/demos/tables/CustomPaginationActionsTable.js b/docs/src/pages/demos/tables/CustomPaginationActionsTable.js
@@ -171,6 +171,7 @@ class CustomPaginationActionsTable extends React.Component {
             <TableFooter>
               <TableRow>
                 <TablePagination
+                  rowsPerPageOptions={[5, 10, 25]}
                   colSpan={3}
                   count={rows.length}
                   rowsPerPage={rowsPerPage}

diff --git a/docs/src/pages/demos/tables/EnhancedTable.js b/docs/src/pages/demos/tables/EnhancedTable.js
@@ -328,6 +328,7 @@ class EnhancedTable extends React.Component {
           </Table>
         </div>
         <TablePagination
+          rowsPerPageOptions={[5, 10, 25]}
           component="div"
           count={data.length}
           rowsPerPage={rowsPerPage}

diff --git a/packages/material-ui/src/TablePagination/TablePagination.js b/packages/material-ui/src/TablePagination/TablePagination.js
@@ -9,7 +9,7 @@ import Select from '../Select';
 import TableCell from '../TableCell';
 import Toolbar from '../Toolbar';
 import Typography from '../Typography';
-import TablePaginationActions from '../TablePaginationActions';
+import TablePaginationActions from './TablePaginationActions';
 
 export const styles = theme => ({
   /* Styles applied to the root element. */
@@ -237,7 +237,7 @@ TablePagination.defaultProps = {
   component: TableCell,
   labelDisplayedRows: ({ from, to, count }) => `${from}-${to} of ${count}`,
   labelRowsPerPage: 'Rows per page:',
-  rowsPerPageOptions: [5, 10, 25],
+  rowsPerPageOptions: [10, 25, 50, 100],
 };
 
 export default withStyles(styles, { name: 'MuiTablePagination' })(TablePagination);
diff --git a/...nationActions/TablePaginationActions.d.ts → ...blePagination/TablePaginationActions.d.ts b/...nationActions/TablePaginationActions.d.ts → ...blePagination/TablePaginationActions.d.ts
diff --git a/...ginationActions/TablePaginationActions.js → ...TablePagination/TablePaginationActions.js b/...ginationActions/TablePaginationActions.js → ...TablePagination/TablePaginationActions.js
diff --git a/packages/material-ui/src/TablePaginationActions/index.d.ts b/packages/material-ui/src/TablePaginationActions/index.d.ts
diff --git a/packages/material-ui/src/TablePaginationActions/index.js b/packages/material-ui/src/TablePaginationActions/index.js
diff --git a/pages/api/table-pagination.md b/pages/api/table-pagination.md
@@ -31,7 +31,7 @@ A `TableCell` based component for placing inside `TableFooter` for pagination.
 | <span class="prop-name">onChangeRowsPerPage</span> | <span class="prop-type">func</span> |   | Callback fired when the number of rows per page is changed.<br><br>**Signature:**<br>`function(event: object) => void`<br>*event:* The event source of the callback |
 | <span class="prop-name required">page *</span> | <span class="prop-type">number</span> |   | The zero-based index of the current page. |
 | <span class="prop-name required">rowsPerPage *</span> | <span class="prop-type">number</span> |   | The number of rows per page. |
-| <span class="prop-name">rowsPerPageOptions</span> | <span class="prop-type">array</span> | <span class="prop-default">[5, 10, 25]</span> | Customizes the options of the rows per page select field. If less than two options are available, no select field will be displayed. |
+| <span class="prop-name">rowsPerPageOptions</span> | <span class="prop-type">array</span> | <span class="prop-default">[10, 25, 50, 100]</span> | Customizes the options of the rows per page select field. If less than two options are available, no select field will be displayed. |
 | <span class="prop-name">SelectProps</span> | <span class="prop-type">object</span> |   | Properties applied to the rows per page [`Select`](/api/select/) element. |
 
 Any other properties supplied will be spread to the root element ([TableCell](/api/table-cell/)).