Browse Source

switch to show/hide NavbarToggler

Yuki Takei 5 years ago
parent
commit
c4ed6ec25f
1 changed files with 13 additions and 6 deletions
  1. 13 6
      src/client/js/components/Navbar/GrowiSubNavigation.jsx

+ 13 - 6
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -11,9 +11,10 @@ import PagePathHierarchicalLink from '@commons/components/PagePathHierarchicalLi
 
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
 import AppContainer from '../../services/AppContainer';
+import NavigationContainer from '../../services/NavigationContainer';
+import PageContainer from '../../services/PageContainer';
 
 
 import RevisionPathControls from '../Page/RevisionPathControls';
 import RevisionPathControls from '../Page/RevisionPathControls';
-import PageContainer from '../../services/PageContainer';
 import TagLabels from '../Page/TagLabels';
 import TagLabels from '../Page/TagLabels';
 import LikeButton from '../LikeButton';
 import LikeButton from '../LikeButton';
 import BookmarkButton from '../BookmarkButton';
 import BookmarkButton from '../BookmarkButton';
@@ -60,7 +61,10 @@ const PagePathNav = ({ pageId, pagePath, isPageForbidden }) => {
 };
 };
 
 
 const GrowiSubNavigation = (props) => {
 const GrowiSubNavigation = (props) => {
-  const { appContainer, pageContainer, isCompactMode } = props;
+  const {
+    appContainer, navigationContainer, pageContainer, isCompactMode,
+  } = props;
+  const { isDrawerMode } = navigationContainer.state;
   const {
   const {
     pageId, path, createdAt, creator, updatedAt, revisionAuthor,
     pageId, path, createdAt, creator, updatedAt, revisionAuthor,
     isForbidden: isPageForbidden,
     isForbidden: isPageForbidden,
@@ -83,9 +87,11 @@ const GrowiSubNavigation = (props) => {
 
 
       {/* Left side */}
       {/* Left side */}
       <div className="d-flex">
       <div className="d-flex">
-        <div className="d-flex align-items-center border-right mr-3 pr-3">
-          <NavbarToggler />
-        </div>
+        { isDrawerMode && (
+          <div className="d-flex align-items-center border-right mr-3 pr-3">
+            <NavbarToggler />
+          </div>
+        ) }
 
 
         <div>
         <div>
           { !isCompactMode && !isPageNotFound && !isPageForbidden && (
           { !isCompactMode && !isPageNotFound && !isPageForbidden && (
@@ -147,12 +153,13 @@ const GrowiSubNavigation = (props) => {
 /**
 /**
  * Wrapper component for using unstated
  * Wrapper component for using unstated
  */
  */
-const GrowiSubNavigationWrapper = withUnstatedContainers(GrowiSubNavigation, [AppContainer, PageContainer]);
+const GrowiSubNavigationWrapper = withUnstatedContainers(GrowiSubNavigation, [AppContainer, NavigationContainer, PageContainer]);
 
 
 
 
 GrowiSubNavigation.propTypes = {
 GrowiSubNavigation.propTypes = {
   t: PropTypes.func.isRequired, //  i18next
   t: PropTypes.func.isRequired, //  i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
+  navigationContainer: PropTypes.instanceOf(NavigationContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 
 
   isCompactMode: PropTypes.bool,
   isCompactMode: PropTypes.bool,