Skip to content

Commit d949f85

Browse files
committed
wip: mui5 incomplete work
1 parent f759476 commit d949f85

File tree

68 files changed

+3065
-2675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3065
-2675
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ node_modules
44
mochawesome-report-unit
55
todo
66
generated
7-
src/demo/**/__e2e__
7+
demo/**/__e2e__
88
_results_
99
.DS_Store
1010
generator/package-lock.json

demo/mobile/reactnative/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const App = () => {
2929
colors: {
3030
...DefaultTheme.colors,
3131
primary: 'tomato',
32-
accent: 'yellow',
32+
accent: 'gray',
3333
},
3434
};
3535

demo/web/react/DemoHome.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Library
22
import React from 'react';
3-
import { withStyles } from '@material-ui/core/styles';
3+
import { withStyles } from '@material-ui/styles';
44
import VersionContext from './context/version.context';
55

66
import Menu from './menu';

demo/web/react/MuiRoot.jsx

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
import React from 'react';
22
import 'typeface-roboto'; // eslint-disable-line import/extensions
33
import CssBaseline from '@material-ui/core/CssBaseline';
4-
// import StyledEngineProvider from '@material-ui/styled-engine'; // For MUI 5
5-
import { MuiThemeProvider } from '@material-ui/core/styles';
4+
import StyledEngineProvider from '@material-ui/styled-engine';
5+
import { ThemeProvider } from '@material-ui/styles';
66
import theme from './theme';
7-
/** For MUI 5
8-
* <StyledEngineProvider injectFirst>
9-
<MuiThemeProvider theme={theme}>
10-
<CssBaseline />
11-
{children}
12-
</MuiThemeProvider>
13-
</StyledEngineProvider>
14-
*/
7+
158
export default ({ children }) => (
16-
<MuiThemeProvider theme={theme}>
9+
<ThemeProvider theme={theme}>
1710
<CssBaseline />
1811
{children}
19-
</MuiThemeProvider>
12+
</ThemeProvider>
2013
);

demo/web/react/body/Body.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { withStyles } from '@material-ui/core/styles';
2+
import { withStyles } from '@material-ui/styles';
33
import styles from './body-styles';
44
import Example from './Example';
55
import UIBundler from './ui-bundler';

demo/web/react/body/Source.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Typography from '@material-ui/core/Typography';
1616
import Valid from '@material-ui/icons/CheckCircle';
1717
import Invalid from '@material-ui/icons/HighlightOff';
1818
import WarningRoundedIcon from '@material-ui/icons/WarningRounded';
19-
import { withStyles } from '@material-ui/core/styles';
19+
import { withStyles } from '@material-ui/styles';
2020
import sourceStyles from './editor-styles';
2121

2222
const classNames = require('classnames');

demo/web/react/body/example-styles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeStyles, createStyles } from '@material-ui/core/styles';
1+
import { makeStyles, createStyles } from '@material-ui/styles';
22

33
const rootStyle = (theme, type) => ({
44
'position': 'relative',

demo/web/react/examples/additional-props/__e2e__/additional-props.feature

Lines changed: 0 additions & 33 deletions
This file was deleted.

demo/web/react/examples/alternatives/__e2e__/alternatives.feature

Lines changed: 0 additions & 45 deletions
This file was deleted.

demo/web/react/examples/arrays/__e2e__/arrays.feature

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)