Rollback MuiThemeProvider => ThemeProvider

Cf mui/material-ui#15536 (comment)
marmelab · May 7, 2019 · 1881da3 · 1881da3
1 parent 32e22a9
commit 1881da3
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
diff --git a/docs/Admin.md b/docs/Admin.md
@@ -245,7 +245,7 @@ For more details on predefined themes and custom themes, refer to the [Material
 
 ## `appLayout`
 
-If you want to deeply customize the app header, the menu, or the notifications, the best way is to provide a custom layout component. It must contain a `{children}` placeholder, where react-admin will render the resources. If you use material UI fields and inputs, it should contain a `<ThemeProvider>` element. And finally, if you want to show the spinner in the app header when the app fetches data in the background, the Layout should connect to the redux store.
+If you want to deeply customize the app header, the menu, or the notifications, the best way is to provide a custom layout component. It must contain a `{children}` placeholder, where react-admin will render the resources. If you use material UI fields and inputs, it should contain a `<MuiThemeProvider>` element. And finally, if you want to show the spinner in the app header when the app fetches data in the background, the Layout should connect to the redux store.
 
 Use the [default layout](https://github.com/marmelab/react-admin/blob/master/packages/ra-ui-materialui/src/layout/Layout.js) as a starting point, and check [the Theming documentation](./Theming.md#using-a-custom-layout) for examples.
 

diff --git a/docs/Authentication.md b/docs/Authentication.md
@@ -249,7 +249,7 @@ For all these cases, it's up to you to implement your own `LoginPage` component,
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { userLogin } from 'react-admin';
-import { ThemeProvider } from '@material-ui/styles';
+import { MuiThemeProvider } from '@material-ui/core/styles';
 
 class MyLoginPage extends Component {
     submit = (e) => {
@@ -263,11 +263,11 @@ class MyLoginPage extends Component {
 
     render() {
         return (
-            <ThemeProvider theme={this.props.theme}>
+            <MuiThemeProvider theme={this.props.theme}>
                 <form onSubmit={this.submit}>
                 ...
                 </form>
-            </ThemeProvider>
+            </MuiThemeProvider>
         );
     }
 };

diff --git a/docs/CustomApp.md b/docs/CustomApp.md
@@ -159,7 +159,7 @@ import { createHashHistory } from 'history';
 +import { TranslationProvider, Resource } from 'react-admin';
 import restProvider from 'ra-data-simple-rest';
 import defaultMessages from 'ra-language-english';
-+import { ThemeProvider } from '@material-ui/styles';
++import { MuiThemeProvider } from '@material-ui/core/styles';
 +import AppBar from '@material-ui/core/AppBar';
 +import Toolbar from '@material-ui/core/Toolbar';
 +import Typography from '@material-ui/core/Typography';
@@ -202,7 +202,7 @@ const App = () => (
 -           <Resource name="comments" list={CommentList} edit={CommentEdit} create={CommentCreate} />
 -           <Resource name="users" list={UserList} edit={UserEdit} create={UserCreate} />
 +       <TranslationProvider>
-+           <ThemeProvider>
++           <MuiThemeProvider>
 +               <Resource name="posts" intent="registration" />
 +               <Resource name="comments" intent="registration" />
 +               <Resource name="users" intent="registration" />
@@ -228,7 +228,7 @@ const App = () => (
 +                       <Route exact path="/users/:id" render={(routeProps) => <UsersEdit resource="users" {...routeProps} />} />
 +                   </Switch>
 +               </ConnectedRouter>
-+           </ThemeProvider>
++           </MuiThemeProvider>
 +       </TranslationProvider>
 -       </Admin>
     </Provider>

diff --git a/docs/Theming.md b/docs/Theming.md
@@ -464,7 +464,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { withStyles, createMuiTheme } from '@material-ui/core/styles';
-import { ThemeProvider } from '@material-ui/styles';
+import { MuiThemeProvider } from '@material-ui/Core/styles';
 import {
     AppBar,
     Menu,

diff --git a/examples/demo/src/layout/Login.js b/examples/demo/src/layout/Login.js
@@ -11,7 +11,7 @@ import CardActions from '@material-ui/core/CardActions';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import TextField from '@material-ui/core/TextField';
 import { createMuiTheme, withStyles } from '@material-ui/core/styles';
-import { ThemeProvider } from '@material-ui/core/styles';
+import { MuiThemeProvider } from '@material-ui/core/styles';
 import LockIcon from '@material-ui/icons/Lock';
 
 import { Notification, useTranslate, translate, userLogin } from 'react-admin';
@@ -165,13 +165,13 @@ const enhance = compose(
 
 const EnhancedLogin = enhance(Login);
 
-// We need to put the ThemeProvider decoration in another component
+// We need to put the MuiThemeProvider decoration in another component
 // Because otherwise the withStyles() HOC used in EnhancedLogin won't get
 // the right theme
 const LoginWithTheme = props => (
-    <ThemeProvider theme={createMuiTheme(lightTheme)}>
+    <MuiThemeProvider theme={createMuiTheme(lightTheme)}>
         <EnhancedLogin {...props} />
-    </ThemeProvider>
+    </MuiThemeProvider>
 );
 
 export default LoginWithTheme;
diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json
@@ -27,7 +27,6 @@
     },
     "devDependencies": {
         "@material-ui/core": "^4.0.0-beta.0",
-        "@material-ui/styles": "^4.0.0-beta.0",
         "@material-ui/icons": "^4.0.0-beta.0",
         "cross-env": "^5.2.0",
         "enzyme": "~3.9.0",
@@ -45,7 +44,6 @@
     },
     "dependencies": {
         "@material-ui/core": "^4.0.0-beta.0",
-        "@material-ui/styles": "^4.0.0-beta.0",
         "@material-ui/icons": "^4.0.0-beta.0",
         "autosuggest-highlight": "^3.1.1",
         "classnames": "~2.2.5",

diff --git a/packages/ra-ui-materialui/src/auth/Login.tsx b/packages/ra-ui-materialui/src/auth/Login.tsx
@@ -15,7 +15,7 @@ import {
     WithStyles,
     Theme,
 } from '@material-ui/core/styles';
-import { ThemeProvider } from '@material-ui/styles';
+import { MuiThemeProvider } from '@material-ui/core/styles';
 import LockIcon from '@material-ui/icons/Lock';
 import { StaticContext } from 'react-router';
 
@@ -121,7 +121,7 @@ class Login extends Component<
         } = this.props;
 
         return (
-            <ThemeProvider theme={this.theme}>
+            <MuiThemeProvider theme={this.theme}>
                 <div
                     className={classnames(classes.main, className)}
                     {...rest}
@@ -137,7 +137,7 @@ class Login extends Component<
                     </Card>
                     <Notification />
                 </div>
-            </ThemeProvider>
+            </MuiThemeProvider>
         );
     }
 }

diff --git a/packages/ra-ui-materialui/src/layout/Layout.js b/packages/ra-ui-materialui/src/layout/Layout.js
@@ -8,7 +8,7 @@ import {
     withStyles,
     createStyles,
 } from '@material-ui/core/styles';
-import { ThemeProvider } from '@material-ui/styles';
+import { MuiThemeProvider } from '@material-ui/core/styles';
 import compose from 'recompose/compose';
 import { ComponentPropType } from 'ra-core';
 
@@ -187,9 +187,9 @@ class LayoutWithTheme extends Component {
     render() {
         const { theme, ...rest } = this.props;
         return (
-            <ThemeProvider theme={this.theme}>
+            <MuiThemeProvider theme={this.theme}>
                 <EnhancedLayout {...rest} />
-            </ThemeProvider>
+            </MuiThemeProvider>
         );
     }
 }

diff --git a/yarn.lock b/yarn.lock
@@ -1672,7 +1672,7 @@
   dependencies:
     "@babel/runtime" "^7.2.0"
 
-"@material-ui/styles@^4.0.0-beta.0", "@material-ui/styles@^4.0.0-beta.1":
+"@material-ui/styles@^4.0.0-beta.1":
   version "4.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.0.0-beta.1.tgz#a552fe402763f0579cbd39e79a9e42fbf6762139"
   integrity sha512-k41Xw6U6CHLNupWMCcc5w7AONNddsZVTUL7qe6nIMWZeBdLxX77N/nNZBq5sU2aFY5sShB8JwXK5X/xhDNfPgg==