Merge pull request #418 from philipshurpik/fix-navbar-in-tabs

fix to show correctly show navbar in tabs component
aksonov · Mar 28, 2016 · bbb20bb · bbb20bb
2 parents 8acd239 + 20383ce
commit bbb20bb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/NavBar.js b/src/NavBar.js
@@ -51,6 +51,7 @@ export default class NavBar extends React.Component {
     }
     render() {
         const state = this.props.navigationState;
+        const child = state.children[state.index];
         let selected = state.children[state.index];
         while (selected.hasOwnProperty("children")) {
             selected = selected.children[selected.index]
@@ -62,7 +63,7 @@ export default class NavBar extends React.Component {
         if (selected.component && selected.component.renderNavigationBar){
             return selected.component.renderNavigationBar({...this.props,...selected});
         }
-        if (state.hideNavBar || selected.hideNavBar){
+        if (state.hideNavBar || child.hideNavBar || selected.hideNavBar){
             return null;
         }
         return (