Skip to content
Snippets Groups Projects
Commit a27e1342 authored by Jack Reed's avatar Jack Reed Committed by Chris Beer
Browse files

Use Theme and Styles provider to just flip all of the styles

parent d33bad75
No related branches found
No related tags found
No related merge requests found
import React from 'react';
import { shallow } from 'enzyme';
import { MuiThemeProvider } from '@material-ui/core/styles';
import { ThemeProvider, StylesProvider } from '@material-ui/core/styles';
import Fullscreen from 'react-full-screen';
import AccessTokenSender from '../../../src/containers/AccessTokenSender';
import AuthenticationSender from '../../../src/containers/AuthenticationSender';
......@@ -27,7 +27,8 @@ function createWrapper(props) {
describe('App', () => {
it('should render all needed elements ', () => {
const wrapper = createWrapper();
expect(wrapper.find(MuiThemeProvider).length).toBe(1);
expect(wrapper.find(ThemeProvider).length).toBe(1);
expect(wrapper.find(StylesProvider).length).toBe(1);
expect(wrapper.find(Fullscreen).length).toBe(1);
expect(wrapper.find('Suspense').length).toBe(1);
expect(wrapper.find(AuthenticationSender).length).toBe(1);
......@@ -36,7 +37,7 @@ describe('App', () => {
it('sets up a theme based on the config passed in merged w/ MaterialUI', () => {
const wrapper = createWrapper();
const { theme } = wrapper.find(MuiThemeProvider).props();
const { theme } = wrapper.find(ThemeProvider).props();
expect(theme.palette.type).toEqual('light');
expect(theme.typography.useNextVariants).toBe(true);
expect(Object.keys(theme).length).toBeGreaterThan(10);
......
import React, { Component, lazy, Suspense } from 'react';
import PropTypes from 'prop-types';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import {
ThemeProvider, StylesProvider, createMuiTheme, jssPreset,
} from '@material-ui/core/styles';
import Fullscreen from 'react-full-screen';
import { create } from 'jss';
import rtl from 'jss-rtl';
import { I18nextProvider } from 'react-i18next';
import { LiveAnnouncer } from 'react-aria-live';
import createI18nInstance from '../i18n';
......@@ -62,7 +66,10 @@ export class App extends Component {
>
<I18nextProvider i18n={this.i18n}>
<LiveAnnouncer>
<MuiThemeProvider theme={createMuiTheme(theme)}>
<ThemeProvider
theme={createMuiTheme(theme)}
>
<StylesProvider jss={create({ plugins: [...jssPreset().plugins, rtl()] })}>
<AuthenticationSender />
<AccessTokenSender />
<Suspense
......@@ -70,7 +77,8 @@ export class App extends Component {
>
<WorkspaceArea />
</Suspense>
</MuiThemeProvider>
</StylesProvider>
</ThemeProvider>
</LiveAnnouncer>
</I18nextProvider>
</Fullscreen>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment