Skip to content

Commit 03c8b37

Browse files
djhidjhi
authored
Merge pull request #6587 from marmelab/fix-deprecation-warnings
Fix MUI 4.12 deprecation warnings
2 parents 4cea0cb + 53dc57c commit 03c8b37

29 files changed

+136
-128
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/Button.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import * as React from 'react';
33
import expect from 'expect';
44
import { TestContext } from 'ra-test';
55
import { ThemeProvider } from '@material-ui/core';
6-
import { createMuiTheme } from '@material-ui/core/styles';
6+
import { createTheme } from '@material-ui/core/styles';
77
import Button from './Button';
88

9-
const theme = createMuiTheme();
9+
const theme = createTheme();
1010

1111
const invalidButtonDomProps = {
1212
basePath: '',

‎packages/ra-ui-materialui/src/button/CloneButton.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import expect from 'expect';
22
import { ThemeProvider } from '@material-ui/core';
3-
import { createMuiTheme } from '@material-ui/core/styles';
3+
import { createTheme } from '@material-ui/core/styles';
44
import { render } from '@testing-library/react';
55
import * as React from 'react';
66
import { createMemoryHistory } from 'history';
@@ -9,7 +9,7 @@ import { Router } from 'react-router-dom';
99
import { CloneButton } from './CloneButton';
1010
import { TestContext } from 'ra-test';
1111

12-
const theme = createMuiTheme();
12+
const theme = createTheme();
1313

1414
const invalidButtonDomProps = {
1515
basePath: '/posts',

‎packages/ra-ui-materialui/src/button/CreateButton.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as React from 'react';
33
import expect from 'expect';
44
import { TestContext } from 'ra-test';
55
import { ThemeProvider } from '@material-ui/core';
6-
import { createMuiTheme } from '@material-ui/core/styles';
6+
import { createTheme } from '@material-ui/core/styles';
77
import CreateButton from './CreateButton';
88

99
const invalidButtonDomProps = {
@@ -25,7 +25,7 @@ describe('<CreateButton />', () => {
2525
it('should render a button with no DOM errors', () => {
2626
const spy = jest.spyOn(console, 'error').mockImplementation(() => {});
2727

28-
const theme = createMuiTheme({
28+
const theme = createTheme({
2929
props: {
3030
MuiWithWidth: {
3131
initialWidth: 'sm',

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import * as React from 'react';
33
import expect from 'expect';
44
import { DataProvider, DataProviderContext } from 'ra-core';
55
import { renderWithRedux, TestContext } from 'ra-test';
6-
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
6+
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
77
import { DeleteWithConfirmButton } from './DeleteWithConfirmButton';
88
import { Toolbar, SimpleForm } from '../form';
99
import { Edit } from '../detail';
1010
import { TextInput } from '../input';
1111
import { Notification } from '../layout';
1212

13-
const theme = createMuiTheme();
13+
const theme = createTheme();
1414

1515
const invalidButtonDomProps = {
1616
basePath: '',

‎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.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import * as React from 'react';
33
import expect from 'expect';
44
import { DataProvider, DataProviderContext } from 'ra-core';
55
import { renderWithRedux, TestContext } from 'ra-test';
6-
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
6+
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
77
import { Toolbar, SimpleForm } from '../form';
88
import { Edit } from '../detail';
99
import { TextInput } from '../input';
1010
import { DeleteWithUndoButton } from './DeleteWithUndoButton';
1111

12-
const theme = createMuiTheme();
12+
const theme = createTheme();
1313

1414
const invalidButtonDomProps = {
1515
basePath: '',

‎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/button/SaveButton.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import {
99
} from 'ra-core';
1010
import { renderWithRedux, TestContext } from 'ra-test';
1111
import { ThemeProvider } from '@material-ui/core';
12-
import { createMuiTheme } from '@material-ui/core/styles';
12+
import { createTheme } from '@material-ui/core/styles';
1313

1414
import SaveButton from './SaveButton';
1515
import { Toolbar, SimpleForm } from '../form';
1616
import { Edit } from '../detail';
1717
import { TextInput } from '../input';
1818

19-
const theme = createMuiTheme();
19+
const theme = createTheme();
2020

2121
const invalidButtonDomProps = {
2222
basePath: '',

‎packages/ra-ui-materialui/src/form/SimpleFormIterator.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ThemeProvider } from '@material-ui/core';
2-
import { createMuiTheme } from '@material-ui/core/styles';
2+
import { createTheme } from '@material-ui/core/styles';
33
import { fireEvent, getByText, waitFor } from '@testing-library/react';
44
import expect from 'expect';
55
import { SaveContextProvider, SideEffectContextProvider } from 'ra-core';
@@ -10,7 +10,7 @@ import TextInput from '../input/TextInput';
1010
import SimpleForm from './SimpleForm';
1111
import { SimpleFormIterator } from './SimpleFormIterator';
1212

13-
const theme = createMuiTheme();
13+
const theme = createTheme();
1414

1515
describe('<SimpleFormIterator />', () => {
1616
// bypass confirm leave form with unsaved changes

‎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/DeviceTestWrapper.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import mediaQuery from 'css-mediaquery';
33
import { ThemeProvider } from '@material-ui/styles';
4-
import { createMuiTheme } from '@material-ui/core/styles';
4+
import { createTheme } from '@material-ui/core/styles';
55

66
/**
77
* Test utility to simulate a device form factor for server-side mediaQueries
@@ -18,7 +18,7 @@ const DeviceTestWrapper = ({
1818
width = 'md',
1919
children,
2020
}: DeviceTestWrapperProps): JSX.Element => {
21-
const theme = createMuiTheme();
21+
const theme = createTheme();
2222

2323
// Use https://github.com/ericf/css-mediaquery as polyfill.
2424
const ssrMatchMedia = query => ({

‎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/layout/createMuiTheme.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
createMuiTheme as createLegacyModeTheme,
2+
createTheme as createLegacyModeTheme,
33
unstable_createMuiStrictModeTheme as createStrictModeTheme,
44
} from '@material-ui/core/styles';
55

‎packages/ra-ui-materialui/src/list/List.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import { waitFor, fireEvent } from '@testing-library/react';
44
import { DataProviderContext, ResourceContextProvider } from 'ra-core';
55
import { renderWithRedux } from 'ra-test';
66
import { ThemeProvider } from '@material-ui/styles';
7-
import { createMuiTheme } from '@material-ui/core/styles';
7+
import { createTheme } from '@material-ui/core/styles';
88
import { MemoryRouter } from 'react-router-dom';
99

1010
import defaultTheme from '../defaultTheme';
1111
import List from './List';
1212
import { Filter } from './filter';
1313
import { TextInput } from '../input';
1414

15-
const theme = createMuiTheme(defaultTheme);
15+
const theme = createTheme(defaultTheme);
1616

1717
describe('<List />', () => {
1818
const defaultProps = {

‎packages/ra-ui-materialui/src/list/filter/FilterButton.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import * as React from 'react';
22
import expect from 'expect';
33
import { render, fireEvent } from '@testing-library/react';
44
import { ThemeProvider } from '@material-ui/styles';
5-
import { createMuiTheme } from '@material-ui/core/styles';
5+
import { createTheme } from '@material-ui/core/styles';
66

77
import FilterButton from './FilterButton';
88
import TextInput from '../../input/TextInput';
99

10-
const theme = createMuiTheme();
10+
const theme = createTheme();
1111

1212
describe('<FilterButton />', () => {
1313
const defaultProps = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import * as React from 'react';
22
import expect from 'expect';
33
import { render } from '@testing-library/react';
44
import { ThemeProvider } from '@material-ui/styles';
5-
import { createMuiTheme } from '@material-ui/core/styles';
5+
import { createTheme } from '@material-ui/core/styles';
66
import { ListPaginationContext } from 'ra-core';
77

88
import Pagination from './Pagination';
99
import DeviceTestWrapper from '../../layout/DeviceTestWrapper';
1010

11-
const theme = createMuiTheme();
11+
const theme = createTheme();
1212

1313
describe('<Pagination />', () => {
1414
const defaultProps = {

0 commit comments

Comments
 (0)