Skip to content
Snippets Groups Projects
Unverified Commit 68e29d56 authored by Justin Coyne's avatar Justin Coyne Committed by GitHub
Browse files

Merge pull request #3862 from ProjectMirador/no-mui-styles

Remove deprecated @mui/styles package
parents cc7330d0 d23f6285
No related branches found
No related tags found
2 merge requests!19Draft: Merge video support into mui5,!18Only nudge over badge content for the WindowListButton; it needs special...
......@@ -5,8 +5,6 @@ import { I18nextProvider } from 'react-i18next';
import {
ThemeProvider, StyledEngineProvider, createTheme,
} from '@mui/material/styles';
import StylesProvider from '@mui/styles/StylesProvider';
import createGenerateClassName from '@mui/styles/createGenerateClassName';
import { DndContext, DndProvider } from 'react-dnd';
import { MultiBackend } from 'react-dnd-multi-backend';
import { HTML5toTouch } from 'rdndmb-html5-to-touch';
......@@ -96,13 +94,11 @@ export class AppProviders extends Component {
/** */
render() {
const {
children, createGenerateClassNameOptions,
children,
theme, translations,
dndManager,
} = this.props;
const generateClassName = createGenerateClassName(createGenerateClassNameOptions);
/**
* Create rtl emotion cache
*/
......@@ -128,11 +124,9 @@ export class AppProviders extends Component {
<StyledEngineProvider injectFirst>
<CacheProvider value={theme.direction === 'rtl' ? cacheRtl : cacheDefault}>
<ThemeProvider theme={createTheme((theme))}>
<StylesProvider generateClassName={generateClassName}>
<MaybeDndProvider dndManager={dndManager}>
{children}
</MaybeDndProvider>
</StylesProvider>
</ThemeProvider>
</CacheProvider>
</StyledEngineProvider>
......@@ -144,7 +138,6 @@ export class AppProviders extends Component {
AppProviders.propTypes = {
children: PropTypes.node,
createGenerateClassNameOptions: PropTypes.object, // eslint-disable-line react/forbid-prop-types
dndManager: PropTypes.object, // eslint-disable-line react/forbid-prop-types
language: PropTypes.string.isRequired,
theme: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
......@@ -153,6 +146,5 @@ AppProviders.propTypes = {
AppProviders.defaultProps = {
children: null,
createGenerateClassNameOptions: {},
dndManager: undefined,
};
......@@ -11,7 +11,6 @@ import { AppProviders } from '../components/AppProviders';
*/
const mapStateToProps = state => (
{
createGenerateClassNameOptions: getConfig(state).createGenerateClassNameOptions,
language: getConfig(state).language,
theme: getTheme(state),
translations: getConfig(state).translations,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment