Merge pull request #216 from material-table-core/villuv-feature/mui5

Mui v5
material-table-core · Jun 5, 2021 · 4f3ea95 · 4f3ea95
2 parents d31df8b + 477b011
commit 4f3ea95
Show file tree

Hide file tree

Showing 25 changed files with 612 additions and 264 deletions.
diff --git a/__tests__/demo/demo-components/RemoteData/index.js b/__tests__/demo/demo-components/RemoteData/index.js
@@ -1,9 +1,5 @@
 import React, { useState, useRef, Component } from 'react';
 import MaterialTable, { MTableBodyRow, MTableEditRow } from '../../../../src';
-import { Grid, MuiThemeProvider, Button } from '@material-ui/core';
-import { createMuiTheme } from '@material-ui/core/styles';
-import Typography from '@material-ui/core/Typography';
-
 // check if removing this.isRemoteData()@https://github.com/material-table-core/core/blob/0e953441fd9f9912d8cf97db103a8e0cb4f43912/src/material-table.js#L119-L120
 // is any good
 

diff --git a/__tests__/demo/demo.js b/__tests__/demo/demo.js
@@ -16,6 +16,7 @@
  * built-in dev server (run `npm start`)
  */
 
+import { ThemeProvider, createTheme } from '@material-ui/core';
 import React from 'react';
 import { render } from 'react-dom';
 
@@ -40,7 +41,7 @@ import { I1353, I1941, I122 } from './demo-components/RemoteData';
 module.hot.accept();
 
 render(
-  <div>
+  <ThemeProvider theme={createTheme()}>
     <h1>Basic</h1>
     <Basic />
 
@@ -112,6 +113,6 @@ render(
         <I122 />
       </li>
     </ol>
-  </div>,
+  </ThemeProvider>,
   document.querySelector('#app')
 );
diff --git a/__tests__/demo/demo.original.js b/__tests__/demo/demo.original.js
@@ -1,12 +1,14 @@
-import { Grid, MuiThemeProvider, Button } from '@material-ui/core';
-import { createMuiTheme } from '@material-ui/core';
+import { Grid, ThemeProvider } from '@material-ui/core';
+import { createTheme } from '@material-ui/core/styles';
+import React, { Component } from 'react';
+import MaterialTable from '../src';
 
 let direction = 'ltr';
 // direction = 'rtl';
-const theme = createMuiTheme({
+const theme = createTheme({
   direction: direction,
   palette: {
-    type: 'light'
+    mode: 'light'
   }
 });
 
@@ -483,7 +485,7 @@ class App extends Component {
   render() {
     return (
       <>
-        <MuiThemeProvider theme={theme}>
+        <ThemeProvider theme={theme}>
           <div style={{ maxWidth: '100%', direction }}>
             <Grid container>
               <Grid item xs={12}>
@@ -678,7 +680,7 @@ class App extends Component {
               // />
             }
           </div>
-        </MuiThemeProvider>
+        </ThemeProvider>
       </>
     );
   }