Skip to content

Commit 0a46caa

Browse files
fzaninottofzaninotto
committed
Fix MUI 4.12 deprecation warnings
Closes #6451
1 parent 1cb9a8d commit 0a46caa

17 files changed

+113
-105
lines changed

‎examples/crm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "^4.11.2",
6+
"@material-ui/core": "^4.12.1",
77
"@material-ui/icons": "^4.11.2",
88
"@nivo/bar": "^0.67.0",
99
"@nivo/core": "^0.67.0",

‎examples/demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "3.0.0",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "^4.11.2",
6+
"@material-ui/core": "^4.12.1",
77
"@material-ui/icons": "^4.11.2",
88
"@types/inflection": "^1.5.28",
99
"@types/recharts": "^1.8.10",

‎examples/simple/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"serve": "vite preview"
99
},
1010
"dependencies": {
11-
"@material-ui/core": "^4.11.2",
11+
"@material-ui/core": "^4.12.1",
1212
"@material-ui/icons": "^4.11.2",
1313
"ra-data-fakerest": "^3.9.3",
1414
"ra-i18n-polyglot": "^3.12.4",

‎examples/tutorial/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "3.0.0",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "^4.11.2",
6+
"@material-ui/core": "^4.12.1",
77
"ra-data-json-server": "^3.9.0",
88
"react": "^17.0.0",
99
"react-admin": "^3.9.0",

‎packages/ra-ui-materialui/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"watch": "tsc --outDir esm --module es2015 --watch"
2727
},
2828
"devDependencies": {
29-
"@material-ui/core": "^4.11.2",
29+
"@material-ui/core": "^4.12.1",
3030
"@material-ui/icons": "^4.11.2",
31-
"@material-ui/styles": "^4.11.2",
31+
"@material-ui/styles": "^4.11.4",
3232
"@testing-library/react": "^11.2.3",
3333
"@types/query-string": "5.1.0",
3434
"cross-env": "^5.2.0",
@@ -50,9 +50,9 @@
5050
"rimraf": "^2.6.3"
5151
},
5252
"peerDependencies": {
53-
"@material-ui/core": "^4.11.2",
53+
"@material-ui/core": "^4.12.1",
5454
"@material-ui/icons": "^4.11.2",
55-
"@material-ui/styles": "^4.11.2",
55+
"@material-ui/styles": "^4.11.4",
5656
"final-form": "^4.20.2",
5757
"final-form-arrays": "^3.0.2",
5858
"ra-core": "^3.14.0",

‎packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { Fragment, useState, ReactElement } from 'react';
33
import PropTypes from 'prop-types';
44
import ActionDelete from '@material-ui/icons/Delete';
5-
import { fade } from '@material-ui/core/styles/colorManipulator';
5+
import { alpha } from '@material-ui/core/styles/colorManipulator';
66
import inflection from 'inflection';
77
import { makeStyles } from '@material-ui/core/styles';
88
import {
@@ -24,7 +24,7 @@ const useStyles = makeStyles(
2424
deleteButton: {
2525
color: theme.palette.error.main,
2626
'&:hover': {
27-
backgroundColor: fade(theme.palette.error.main, 0.12),
27+
backgroundColor: alpha(theme.palette.error.main, 0.12),
2828
// Reset on mouse devices
2929
'@media (hover: none)': {
3030
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { ReactElement } from 'react';
33
import PropTypes from 'prop-types';
44
import ActionDelete from '@material-ui/icons/Delete';
5-
import { fade } from '@material-ui/core/styles/colorManipulator';
5+
import { alpha } from '@material-ui/core/styles/colorManipulator';
66
import { makeStyles } from '@material-ui/core/styles';
77
import {
88
useDeleteMany,
@@ -22,7 +22,7 @@ const useStyles = makeStyles(
2222
deleteButton: {
2323
color: theme.palette.error.main,
2424
'&:hover': {
25-
backgroundColor: fade(theme.palette.error.main, 0.12),
25+
backgroundColor: alpha(theme.palette.error.main, 0.12),
2626
// Reset on mouse devices
2727
'@media (hover: none)': {
2828
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { Fragment, useState, ReactElement } from 'react';
33
import PropTypes from 'prop-types';
44
import ActionUpdate from '@material-ui/icons/Update';
5-
import { fade } from '@material-ui/core/styles/colorManipulator';
5+
import { alpha } from '@material-ui/core/styles/colorManipulator';
66
import inflection from 'inflection';
77
import { makeStyles } from '@material-ui/core/styles';
88
import {
@@ -25,7 +25,7 @@ const useStyles = makeStyles(
2525
updateButton: {
2626
color: theme.palette.error.main,
2727
'&:hover': {
28-
backgroundColor: fade(theme.palette.error.main, 0.12),
28+
backgroundColor: alpha(theme.palette.error.main, 0.12),
2929
// Reset on mouse devices
3030
'@media (hover: none)': {
3131
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { ReactElement } from 'react';
33
import PropTypes from 'prop-types';
44
import ActionUpdate from '@material-ui/icons/Update';
5-
import { fade } from '@material-ui/core/styles/colorManipulator';
5+
import { alpha } from '@material-ui/core/styles/colorManipulator';
66
import { makeStyles } from '@material-ui/core/styles';
77
import {
88
useUpdateMany,
@@ -22,7 +22,7 @@ const useStyles = makeStyles(
2222
updateButton: {
2323
color: theme.palette.error.main,
2424
'&:hover': {
25-
backgroundColor: fade(theme.palette.error.main, 0.12),
25+
backgroundColor: alpha(theme.palette.error.main, 0.12),
2626
// Reset on mouse devices
2727
'@media (hover: none)': {
2828
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import React, {
66
} from 'react';
77
import PropTypes from 'prop-types';
88
import { makeStyles } from '@material-ui/core/styles';
9-
import { fade } from '@material-ui/core/styles/colorManipulator';
9+
import { alpha } from '@material-ui/core/styles/colorManipulator';
1010
import ActionDelete from '@material-ui/icons/Delete';
1111
import classnames from 'classnames';
1212
import inflection from 'inflection';
@@ -114,7 +114,7 @@ const useStyles = makeStyles(
114114
deleteButton: {
115115
color: theme.palette.error.main,
116116
'&:hover': {
117-
backgroundColor: fade(theme.palette.error.main, 0.12),
117+
backgroundColor: alpha(theme.palette.error.main, 0.12),
118118
// Reset on mouse devices
119119
'@media (hover: none)': {
120120
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/button/DeleteWithUndoButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { ReactElement, ReactEventHandler, SyntheticEvent } from 'react';
33
import PropTypes from 'prop-types';
44
import { makeStyles } from '@material-ui/core/styles';
5-
import { fade } from '@material-ui/core/styles/colorManipulator';
5+
import { alpha } from '@material-ui/core/styles/colorManipulator';
66
import ActionDelete from '@material-ui/icons/Delete';
77
import classnames from 'classnames';
88
import {
@@ -65,7 +65,7 @@ const useStyles = makeStyles(
6565
deleteButton: {
6666
color: theme.palette.error.main,
6767
'&:hover': {
68-
backgroundColor: fade(theme.palette.error.main, 0.12),
68+
backgroundColor: alpha(theme.palette.error.main, 0.12),
6969
// Reset on mouse devices
7070
'@media (hover: none)': {
7171
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/layout/Confirm.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import DialogContentText from '@material-ui/core/DialogContentText';
88
import DialogTitle from '@material-ui/core/DialogTitle';
99
import Button from '@material-ui/core/Button';
1010
import { makeStyles } from '@material-ui/core/styles';
11-
import { fade } from '@material-ui/core/styles/colorManipulator';
11+
import { alpha } from '@material-ui/core/styles/colorManipulator';
1212
import ActionCheck from '@material-ui/icons/CheckCircle';
1313
import AlertError from '@material-ui/icons/ErrorOutline';
1414
import classnames from 'classnames';
@@ -22,7 +22,7 @@ const useStyles = makeStyles(
2222
confirmWarning: {
2323
color: theme.palette.error.main,
2424
'&:hover': {
25-
backgroundColor: fade(theme.palette.error.main, 0.12),
25+
backgroundColor: alpha(theme.palette.error.main, 0.12),
2626
// Reset on mouse devices
2727
'@media (hover: none)': {
2828
backgroundColor: 'transparent',

‎packages/ra-ui-materialui/src/layout/Notification.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const Notification = (props: Props & Omit<SnackbarProps, 'open'>) => {
9292
autoHideDuration
9393
}
9494
disableWindowBlurListener={notification && notification.undoable}
95-
onExited={handleExited}
95+
TransitionProps={{ onExited: handleExited }}
9696
onClose={handleRequestClose}
9797
ContentProps={{
9898
className: classnames(

‎packages/ra-ui-materialui/src/list/pagination/Pagination.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const Pagination = (props: PaginationProps) => {
8585
count={total}
8686
rowsPerPage={perPage}
8787
page={page - 1}
88-
onChangePage={handlePageChange}
88+
onPageChange={handlePageChange}
8989
rowsPerPageOptions={emptyArray}
9090
component="span"
9191
labelDisplayedRows={labelDisplayedRows}
@@ -99,8 +99,8 @@ const Pagination = (props: PaginationProps) => {
9999
count={total}
100100
rowsPerPage={perPage}
101101
page={page - 1}
102-
onChangePage={handlePageChange}
103-
onChangeRowsPerPage={handlePerPageChange}
102+
onPageChange={handlePageChange}
103+
onRowsPerPageChange={handlePerPageChange}
104104
ActionsComponent={actions}
105105
component="span"
106106
labelRowsPerPage={translate('ra.navigation.page_rows_per_page')}

‎packages/ra-ui-materialui/src/list/pagination/PaginationActions.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const useStyles = makeStyles(
2222
);
2323

2424
const PaginationActions = props => {
25-
const { page, rowsPerPage, count, onChangePage, color, size } = props;
25+
const { page, rowsPerPage, count, onPageChange, color, size } = props;
2626
const classes = useStyles(props);
2727
const translate = useTranslate();
2828
const theme = useTheme();
@@ -71,14 +71,14 @@ const PaginationActions = props => {
7171
if (page === 0) {
7272
throw new Error(translate('ra.navigation.page_out_from_begin'));
7373
}
74-
onChangePage(event, page - 1);
74+
onPageChange(event, page - 1);
7575
};
7676

7777
const nextPage = event => {
7878
if (page > getNbPages() - 1) {
7979
throw new Error(translate('ra.navigation.page_out_from_end'));
8080
}
81-
onChangePage(event, page + 1);
81+
onPageChange(event, page + 1);
8282
};
8383

8484
const gotoPage = event => {
@@ -90,7 +90,7 @@ const PaginationActions = props => {
9090
})
9191
);
9292
}
93-
onChangePage(event, page);
93+
onPageChange(event, page);
9494
};
9595

9696
const renderPageNums = () => {
@@ -172,7 +172,7 @@ PaginationActions.propTypes = {
172172
count: PropTypes.number.isRequired,
173173
classes: PropTypes.object,
174174
nextIconButtonProps: PropTypes.object,
175-
onChangePage: PropTypes.func.isRequired,
175+
onPageChange: PropTypes.func.isRequired,
176176
page: PropTypes.number.isRequired,
177177
rowsPerPage: PropTypes.number.isRequired,
178178
color: PropTypes.oneOf(['primary', 'secondary']),

‎packages/react-admin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"react-dom": "^16.9.0 || ^17.0.0"
3535
},
3636
"dependencies": {
37-
"@material-ui/core": "^4.11.2",
37+
"@material-ui/core": "^4.12.1",
3838
"@material-ui/icons": "^4.11.2",
3939
"@material-ui/styles": "^4.11.2",
4040
"connected-react-router": "^6.5.2",

0 commit comments

Comments
 (0)