Skip to content

fix to show correctly show navbar in tabs component #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2016
Merged

fix to show correctly show navbar in tabs component #418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix to show correctly show navbar in tabs component
  • Loading branch information
@philipshurpik
philipshurpik committed Mar 28, 2016
commit 20383ce8f4c69c64cded1263628d1b0658ebd7b9
3 changes: 2 additions & 1 deletion src/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 (
Expand Down