Skip to content
Snippets Groups Projects
Commit 2f53d0f5 authored by Jack Reed's avatar Jack Reed Committed by Mathias Maaß
Browse files

Enable basic splitting

parent e739c842
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,6 @@ import { MuiThemeProvider } from '@material-ui/core/styles';
import Fullscreen from 'react-full-screen';
import AccessTokenSender from '../../../src/containers/AccessTokenSender';
import AuthenticationSender from '../../../src/containers/AuthenticationSender';
import WorkspaceArea from '../../../src/containers/WorkspaceArea';
import { App } from '../../../src/components/App';
import settings from '../../../src/config/settings';
......@@ -30,7 +29,7 @@ describe('App', () => {
const wrapper = createWrapper();
expect(wrapper.find(MuiThemeProvider).length).toBe(1);
expect(wrapper.find(Fullscreen).length).toBe(1);
expect(wrapper.find(WorkspaceArea).length).toBe(1);
expect(wrapper.find('Suspense').length).toBe(1);
expect(wrapper.find(AuthenticationSender).length).toBe(1);
expect(wrapper.find(AccessTokenSender).length).toBe(1);
});
......
import React, { Component } from 'react';
import React, { Component, lazy, Suspense } from 'react';
import PropTypes from 'prop-types';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import Fullscreen from 'react-full-screen';
import { I18nextProvider } from 'react-i18next';
import { LiveAnnouncer } from 'react-aria-live';
import createI18nInstance from '../i18n';
import WorkspaceArea from '../containers/WorkspaceArea';
import AuthenticationSender from '../containers/AuthenticationSender';
import AccessTokenSender from '../containers/AccessTokenSender';
const WorkspaceArea = lazy(() => import('../containers/WorkspaceArea'));
/**
* This is the top level Mirador component.
* @prop {Object} manifests
......@@ -64,7 +65,11 @@ export class App extends Component {
<MuiThemeProvider theme={createMuiTheme(theme)}>
<AuthenticationSender />
<AccessTokenSender />
<Suspense
fallback={<div />}
>
<WorkspaceArea />
</Suspense>
</MuiThemeProvider>
</LiveAnnouncer>
</I18nextProvider>
......
......@@ -37,7 +37,7 @@ const styles = {
boxShadow: 'none',
},
'& .mosaic-window-toolbar': {
display: 'none',
display: 'none !important',
},
},
};
......
......@@ -39,6 +39,7 @@ const baseConfig = [
libraryExport: 'default',
libraryTarget: 'umd',
path: path.join(__dirname, 'dist'),
publicPath: '/dist/',
},
plugins: [
new webpack.IgnorePlugin({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment