|
@@ -1,7 +1,7 @@
|
|
|
import React from 'react';
|
|
import React from 'react';
|
|
|
import propTypes from 'prop-types';
|
|
import propTypes from 'prop-types';
|
|
|
import { withUnstatedContainers } from '../UnstatedUtils';
|
|
import { withUnstatedContainers } from '../UnstatedUtils';
|
|
|
-// import PageContainer from '../../services/PageContainer';
|
|
|
|
|
|
|
+import PageContainer from '../../services/PageContainer';
|
|
|
import NavigationContainer from '../../services/NavigationContainer';
|
|
import NavigationContainer from '../../services/NavigationContainer';
|
|
|
import Editor from '../PageEditor';
|
|
import Editor from '../PageEditor';
|
|
|
import Page from '../Page';
|
|
import Page from '../Page';
|
|
@@ -10,7 +10,8 @@ import EditorNavbarBottom from '../PageEditor/EditorNavbarBottom';
|
|
|
|
|
|
|
|
|
|
|
|
|
const DisplaySwitcher = (props) => {
|
|
const DisplaySwitcher = (props) => {
|
|
|
- const { navigationContainer /* ,pageContainer */ } = props;
|
|
|
|
|
|
|
+ const { navigationContainer, pageContainer } = props;
|
|
|
|
|
+ const { page } = pageContainer;
|
|
|
const { editorMode } = navigationContainer.state;
|
|
const { editorMode } = navigationContainer.state;
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
@@ -29,8 +30,8 @@ const DisplaySwitcher = (props) => {
|
|
|
|
|
|
|
|
DisplaySwitcher.propTypes = {
|
|
DisplaySwitcher.propTypes = {
|
|
|
navigationContainer: propTypes.instanceOf(NavigationContainer).isRequired,
|
|
navigationContainer: propTypes.instanceOf(NavigationContainer).isRequired,
|
|
|
- // pageContainer: propTypes.instanceOf(PageContainer).isRequired,
|
|
|
|
|
|
|
+ pageContainer: propTypes.instanceOf(PageContainer).isRequired,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
-export default withUnstatedContainers(DisplaySwitcher, [/* PageContainer, */NavigationContainer]);
|
|
|
|
|
|
|
+export default withUnstatedContainers(DisplaySwitcher, [PageContainer, NavigationContainer]);
|