fixed menu

unfoldingWord · Jan 20, 2017 · e22c3ae · e22c3ae
1 parent 8e1e3ea
commit e22c3ae
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/js/components/core/SideBar/SideBarContainer.js b/src/js/components/core/SideBar/SideBarContainer.js
@@ -59,7 +59,8 @@ class SideBarContainer extends React.Component {
               <MenuHeaders ref='menuheaders' subMenuProps={this.props.subMenuProps} currentToolNamespace={this.props.currentToolNamespace} currentGroupObjects={this.props.currentGroupObjects}
                 isCurrentHeader={this.props.isCurrentHeader} currentCheckIndex={this.props.currentCheckIndex}
                 currentGroupIndex={this.props.currentGroupIndex} menuClick={this.props.menuClick} currentBookName={this.props.currentBookName}
-                currentSubGroupObjects={this.props.currentSubGroupObjects} isCurrentSubMenu={this.props.currentCheckIndex} />
+                currentSubGroupObjects={this.props.currentSubGroupObjects} isCurrentSubMenu={this.props.currentCheckIndex} 
+                isOpen={this.props.isOpen}/>
             </Col>
           </Grid>);
     }

diff --git a/src/js/components/core/navigation_menu/MenuHeaders.js b/src/js/components/core/navigation_menu/MenuHeaders.js
@@ -13,6 +13,7 @@ class MenuHeaders extends React.Component {
         const menuItem = this.props.currentGroupObjects[i];
         menuItem.isCurrentItem = this.props.isCurrentHeader == i;
         menuItem.currentGroupprogress = menuItem.currentGroupprogress || 0;
+        menuItem.open = this.props.isOpen;
         groupsName.push(
           <MenuHeadersItems onClick={this.props.menuClick} subMenuProps={this.props.subMenuProps}
              {...menuItem} id={i} key={i} ref={menuItem.group.toString()}

diff --git a/src/js/components/core/navigation_menu/MenuHeadersItem.js b/src/js/components/core/navigation_menu/MenuHeadersItem.js
@@ -36,11 +36,11 @@ class MenuHeadersItems extends React.Component {
             {this.props.checks[0].groupName}
           </td>
           <td>
-            {this.props.isCurrentItem ? <Glyphicon glyph="chevron-right" style={{ position: "absolute", right: "5px", top: "auto" }} /> :
+            {this.props.isCurrentItem && this.props.open ? <Glyphicon glyph="chevron-right" style={{ position: "absolute", right: "5px", top: "auto" }} /> :
               <Glyphicon glyph="chevron-down" style={{ position: "absolute", right: "5px", top: "auto" }} />}
           </td>
         </tr>
-        {this.props.isCurrentItem ?
+        {this.props.isCurrentItem && this.props.open ? 
           <tr>
             <td>
               <SubMenu ref='submenu' checkClicked={this.props.subMenuProps.checkClicked} currentBookName={this.props.currentBookName}

diff --git a/src/js/pages/app.js b/src/js/pages/app.js
@@ -87,15 +87,15 @@ var Main = React.createClass({
   goToPreviousCheck() {
     var lastCheck = this.state.currentCheckIndex - 1 < 0;
     if (lastCheck) {
-      this.state.menuHeadersProps.menuClick(this.state.currentGroupIndex - 1);
+      this.state.menuHeadersProps.menuClick(this.state.currentGroupIndex - 1, true);
     }
     else this.state.subMenuProps.checkClicked(this.state.currentCheckIndex - 1);
   },
 
   goToNextCheck() {
     var lastCheck = this.state.currentCheckIndex + 1 >= this.state.currentSubGroupObjects.length;
     if (lastCheck) {
-      this.state.menuHeadersProps.menuClick(this.state.currentGroupIndex + 1);
+      this.state.menuHeadersProps.menuClick(this.state.currentGroupIndex + 1, true);
     }
     else this.state.subMenuProps.checkClicked(this.state.currentCheckIndex + 1);
   },
@@ -303,6 +303,7 @@ var Main = React.createClass({
     const user = CoreStore.getLoggedInUser();
     this.state =
       Object.assign({}, this.state, {
+        subMenuOpen:true,
         mainViewVisible: this.props.coreStoreReducer.mainViewVisible,
         currentToolNamespace: null,
         currentGroupName: null,
@@ -499,7 +500,12 @@ var Main = React.createClass({
               console.log("Its possible the tools data structure doesnt follow the groups and checks pattern");
             }
           },
-          menuClick: (id) => {
+          menuClick: (id, menuOpen) => {
+            if (id  != this.state.currentGroupIndex) {
+              menuOpen = true;
+            } else {
+              menuOpen = menuOpen || !this.state.subMenuOpen;
+            }
             id = id >= 0 ? id : 0;
             id = id <= this.state.currentGroupObjects.length - 1 ? id : this.state.currentGroupObjects.length - 1;
             this.state.menuHeadersProps.setIsCurrentCheck(true, id, () => {
@@ -508,15 +514,16 @@ var Main = React.createClass({
                 chapterNumber: currentCheck.chapter,
                 verseNumber: currentCheck.verse
               });
-            });
+            }, menuOpen);
           },
-          setIsCurrentCheck: (status, id, callback) => {
+          setIsCurrentCheck: (status, id, callback, menuOpen) => {
             const newObj = this.state.currentGroupObjects.slice(0);
             const currentSubGroupObjects = newObj[id].checks;
             this.setState({
               currentGroupIndex: parseInt(id),
               currentSubGroupObjects: currentSubGroupObjects,
               currentCheckIndex: 0,
+              subMenuOpen:menuOpen
             }, callback);
           },
         },
@@ -1027,7 +1034,8 @@ var Main = React.createClass({
               <SideBarContainer ref='sidebar' currentToolNamespace={this.state.currentToolNamespace} currentGroupObjects={this.state.currentGroupObjects}
                 subMenuProps={this.state.subMenuProps} isCurrentHeader={this.state.currentGroupIndex} {...this.state.sideBarContainerProps} menuClick={this.state.menuHeadersProps.menuClick} {...this.state.sideNavBarProps}
                 currentBookName={this.state.currentBookName} isCurrentSubMenu={this.state.currentCheckIndex} currentCheckIndex={this.state.currentCheckIndex}
-                currentGroupIndex={this.state.currentGroupIndex} currentSubGroupObjects={this.state.currentSubGroupObjects} />
+                currentGroupIndex={this.state.currentGroupIndex} currentSubGroupObjects={this.state.currentSubGroupObjects} 
+                isOpen={this.state.subMenuOpen}/>
             </Col>
             <Col style={RootStyles.ScrollableSection} md={9}>
               <Loader {...this.state.loaderModalProps} />

diff --git a/tC_apps/translationWords b/tC_apps/translationWords