allow to hide navbar, avoid scene type inheritance

Author: aksonov

Example/components/TabView.js

@@ -22,16 +22,24 @@ const styles = StyleSheet.create({
 });
 
 class TabView extends React.Component {
+  state = { hideNavBar: false }
+
+  toggleNavBar = () => {
+    this.setState({ hideNavBar: !this.state.hideNavBar }, () =>
+      Actions.refresh({ hideNavBar: this.state.hideNavBar })
+    );
+  }
+
   render() {
     return (
       <View style={[styles.container, this.props.sceneStyle]}>
         <Text>Tab title:{this.props.title} name:{this.props.name}</Text>
         <Text>Tab data:{this.props.data}</Text>
-        {this.props.name === 'tab1_1' &&
-          <Button onPress={() => Actions.tab1_2()}>next screen for tab1_1</Button>
+        {this.props.name === 'tab_1_1' &&
+        <Button onPress={() => Actions.tab_1_2()}>next screen for tab1_1</Button>
         }
         {this.props.name === 'tab_2_1' &&
-          <Button onPress={() => Actions.tab_2_2()}>next screen for tab2_1</Button>
+        <Button onPress={() => Actions.tab_2_2()}>next screen for tab2_1</Button>
         }
         <Button onPress={Actions.pop}>Back</Button>
         <Button onPress={() => { Actions.tab_1(); }}>Switch to tab1</Button>
@@ -40,6 +48,7 @@ class TabView extends React.Component {
         <Button onPress={() => { Actions.tab_4(); }}>Switch to tab4</Button>
         <Button onPress={() => { Actions.tab_5({ data: 'test!' }); }}>Switch to tab5 with data</Button>
         <Button onPress={() => { Actions.echo(); }}>push clone scene (EchoView)</Button>
+        <Button onPress={() => { this.toggleNavBar(); }}>Toggle NavBar</Button>
       </View>
     );
   }

dist/navigationStore.js

@@ -214,7 +214,11 @@ res.tabBarVisible=false;
 res.tabBarVisible=false;
 }
 
-if(hideNavBar){
+if(navigationParams.hideNavBar!=null){
+if(navigationParams.hideNavBar){
+res.header=null;
+}
+}else if(hideNavBar){
 res.header=null;
 }
 
@@ -304,17 +308,17 @@ this.ref=ref;
 {
 var navigation=this.props.navigation;
 if(!navigation||!navigation.state){
-return _react2.default.createElement(Component,_extends({ref:this.onRef},this.props,{__source:{fileName:_jsxFileName,lineNumber:307}}));
+return _react2.default.createElement(Component,_extends({ref:this.onRef},this.props,{__source:{fileName:_jsxFileName,lineNumber:311}}));
 }
-return _react2.default.createElement(Component,_extends({ref:this.onRef},this.props,extendProps(navigation.state.params,store),{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:309}}));
+return _react2.default.createElement(Component,_extends({ref:this.onRef},this.props,extendProps(navigation.state.params,store),{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:313}}));
 }}]);return Wrapped;}(_react2.default.Component),_class.propTypes={navigation:_propTypes2.default.object},_temp);
 
 return wrapper(Wrapped);
 }
 
 
 function StatelessWrapped(_ref5){var navigation=_ref5.navigation,props=_objectWithoutProperties(_ref5,['navigation']);
-return _react2.default.createElement(Component,_extends({},props,{navigation:navigation},extendProps(navigation.state.params,store),{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:317}}));
+return _react2.default.createElement(Component,_extends({},props,{navigation:navigation},extendProps(navigation.state.params,store),{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:321}}));
 }
 StatelessWrapped.propTypes={
 navigation:_propTypes2.default.object};
@@ -413,7 +417,7 @@ delete commonProps.children;
 delete commonProps.component;
 
 for(var _iterator4=Object.keys(commonProps),_isArray4=Array.isArray(_iterator4),_i5=0,_iterator4=_isArray4?_iterator4:_iterator4[typeof Symbol==='function'?typeof Symbol==='function'?typeof Symbol==='function'?Symbol.iterator:'@@iterator':'@@iterator':'@@iterator']();;){var _ref7;if(_isArray4){if(_i5>=_iterator4.length)break;_ref7=_iterator4[_i5++];}else{_i5=_iterator4.next();if(_i5.done)break;_ref7=_i5.value;}var pkey=_ref7;
-if(dontInheritKeys.includes(pkey)&&!parentProps[pkey]){
+if(dontInheritKeys.includes(pkey)&&(pkey==='type'||pkey==='hideNavBar'||!parentProps[pkey])){
 delete commonProps[pkey];
 }
 }
@@ -465,7 +469,7 @@ _this2.states[key].path=path;
 
 var screen={
 screen:createWrapper(component,wrapBy,_this2)||_this2.processScene(_child,commonProps,clones)||lightbox&&_reactNative.View,
-navigationOptions:createNavigationOptions(_extends({},commonProps,getProperties(component),_child.props,{init:init,component:component}))};
+navigationOptions:createNavigationOptions(_extends({},commonProps,{hideNavBar:parentProps.hideNavBar},getProperties(component),_child.props,{init:init,component:component}))};
 
 
 
@@ -476,7 +480,7 @@ wrapNavBar=false;
 if(component&&wrapNavBar){
 res[key]={
 screen:_this2.processScene({key:key,props:{children:{key:'_'+key,props:_extends({},_child.props,{wrap:false})}}},commonProps,clones,wrapBy),
-navigationOptions:createNavigationOptions(_extends({},commonProps,_child.props))};
+navigationOptions:createNavigationOptions(_extends({},commonProps,_child.props,{hideNavBar:true}))};
 
 }else{
 res[key]=screen;
@@ -511,8 +515,8 @@ if(lightbox){
 return(0,_LightboxNavigator2.default)(res,_extends({mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName},commonProps,{navigationOptions:createNavigationOptions(commonProps)}));
 }else if(tabs){
 if(!tabBarComponent){
-tabBarComponent=tabBarPosition==='top'?function(props){return _react2.default.createElement(_reactNavigation.TabBarTop,_extends({},props,commonProps,{__source:{fileName:_jsxFileName,lineNumber:514}}));}:
-function(props){return _react2.default.createElement(_reactNavigation.TabBarBottom,_extends({},props,commonProps,{__source:{fileName:_jsxFileName,lineNumber:515}}));};
+tabBarComponent=tabBarPosition==='top'?function(props){return _react2.default.createElement(_reactNavigation.TabBarTop,_extends({},props,commonProps,{__source:{fileName:_jsxFileName,lineNumber:518}}));}:
+function(props){return _react2.default.createElement(_reactNavigation.TabBarBottom,_extends({},props,commonProps,{__source:{fileName:_jsxFileName,lineNumber:519}}));};
 }
 if(!tabBarPosition){
 tabBarPosition=_reactNative.Platform.OS==='android'?'top':'bottom';

src/navigationStore.js

@@ -214,7 +214,11 @@ function createNavigationOptions(params) {
       res.tabBarVisible = false;
     }
 
-    if (hideNavBar) {
+    if (navigationParams.hideNavBar != null) {
+      if (navigationParams.hideNavBar) {
+        res.header = null;
+      }
+    } else if (hideNavBar) {
       res.header = null;
     }
 
@@ -413,7 +417,7 @@ class NavigationStore {
     delete commonProps.component;
     // add inherit props
     for (const pkey of Object.keys(commonProps)) {
-      if (dontInheritKeys.includes(pkey) && !parentProps[pkey]) {
+      if (dontInheritKeys.includes(pkey) && (pkey === 'type' || pkey === 'hideNavBar' || !parentProps[pkey])) {
         delete commonProps[pkey];
       }
     }
@@ -465,7 +469,7 @@ class NavigationStore {
       // console.log(`KEY ${key} PATH ${path} DRAWER ${drawer} TABS ${tabs} WRAP ${wrap}`, JSON.stringify(commonProps));
       const screen = {
         screen: createWrapper(component, wrapBy, this) || this.processScene(child, commonProps, clones) || (lightbox && View),
-        navigationOptions: createNavigationOptions({ ...commonProps, ...getProperties(component), ...child.props, init, component }),
+        navigationOptions: createNavigationOptions({ ...commonProps, hideNavBar: parentProps.hideNavBar, ...getProperties(component), ...child.props, init, component }),
       };
 
       // wrap component inside own navbar for tabs/drawer parent controllers
@@ -476,7 +480,7 @@ class NavigationStore {
       if (component && wrapNavBar) {
         res[key] = {
           screen: this.processScene({ key, props: { children: { key: `_${key}`, props: { ...child.props, wrap: false } } } }, commonProps, clones, wrapBy),
-          navigationOptions: createNavigationOptions({ ...commonProps, ...child.props }),
+          navigationOptions: createNavigationOptions({ ...commonProps, ...child.props, hideNavBar: true }),
         };
       } else {
         res[key] = screen;