Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DataGrid] Fix warning with v5 #1038

Merged
merged 2 commits into from
Feb 15, 2021
Merged

[DataGrid] Fix warning with v5 #1038

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eca850
[DataGrid] Fix warning with v5
oliviertassinari Feb 12, 2021
4795b34
one line
oliviertassinari Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/grid/_modules_/grid/components/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ import { isMuiV5 } from '../utils';

// Used to hide the Rows per page selector on small devices
const useStyles = makeStyles((theme: Theme) => ({
selectLabel: {
display: 'none',
[theme.breakpoints.up('md')]: {
display: 'block',
},
},
caption: {
// input label
'&[id]': {
Expand Down Expand Up @@ -64,7 +70,10 @@ export function Pagination() {
return (
// @ts-ignore TODO remove once upgraded v4 support is dropped
<TablePagination
classes={classes}
classes={{
...(isMuiV5() ? { selectLabel: classes.selectLabel } : { caption: classes.caption }),
input: classes.input,
}}
component="div"
count={paginationState.rowCount}
page={paginationState.page}
Expand Down