fix for #364

Example/components/TabView.js

@@ -9,7 +9,7 @@ var Actions = require('react-native-router-flux').Actions;
 class TabView extends React.Component {
     render(){
         return (
-            <View style={styles.container}>
+            <View style={[styles.container, this.props.sceneStyle]}>
                 <Text>Tab {this.props.title}</Text>
                 {this.props.name === "tab1_1" &&
                 <Button onPress={Actions.tab1_2}>next screen for tab1_1</Button>

Example/package.json

@@ -9,7 +9,7 @@
     "react-native": "^0.22.0",
     "react-native-button": "^1.2.1",
     "react": "^0.14.7",
-    "react-native-router-flux": "^3.1.1",
+    "react-native-router-flux": "^3.1.4",
     "react-native-modalbox": "^1.3.0"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-router-flux",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "React Native Router using Flux architecture",
   "repository": {
     "type": "git",

src/DefaultRenderer.js

@@ -57,8 +57,7 @@ export default class DefaultRenderer extends Component {
     }
 
     _renderHeader(/*NavigationSceneRendererProps*/ props) {
-        const NavigationBar = props.navigationState.navBar || NavBar;
-        return <NavigationBar
+        return <NavBar
                 {...props}
                 getTitle={state => state.title}
             />;

src/Reducer.js

@@ -45,7 +45,7 @@ function update(state,action){
     // clone state, TODO: clone effectively?
     if (!state.scenes[action.key] && action.key.indexOf('_')!=-1){
         action.key = action.key.substring(action.key.indexOf('_')+1);
-        console.log("Transform to key="+action.key);
+        //console.log("Transform to key="+action.key);
     }
     const newProps = {...state.scenes[action.key], ...action};
     let newState = Immutable.fromJS(state).toJS();
@@ -124,7 +124,7 @@ function reducer({initialState, scenes}){
     assert(scenes, "scenes should not be null");
     assert(scenes.current, "scenes.current should not be null");
     return function(state, action){
-        console.log("ACTION:", action);
+        //console.log("ACTION:", action);
         state = state || {...initialState, scenes};
         //console.log("ACTION:", action);
         //console.log("STATE:", JSON.stringify(state));

src/Router.js

@@ -29,7 +29,8 @@ export default class extends Component {
     _handleProps(props){
         const scenesMap = props.scenes || Actions.create(props.children);
         const {children, style, scenes, reducer,...parentProps} = props;
-        const initialState = getInitialState(scenesMap, parentProps);
+        scenesMap.rootProps = parentProps;
+        const initialState = getInitialState(scenesMap);
         this.setState({reducer: props.reducer || Reducer({initialState, scenes:scenesMap})});
     }
 
@@ -46,14 +47,7 @@ export default class extends Component {
             return null;
         }
         Actions.callback = props=>onNavigate(props);
-        const Component = navigationState.component || DefaultRenderer;
-        const props = navigationState.scenes[navigationState.scenes.current];
-
-        return (
-            <Component
-                navigationState={navigationState}
-                onNavigate={onNavigate} data={props}/>
-        );
+        return <DefaultRenderer navigationState={navigationState}/>;
     }
 
     render(){

src/State.js

@@ -11,7 +11,7 @@ import assert from 'assert';
 export function getInitialState(route:{string: any},scenes:{string:any}, position=0, props={}){
     const {key, style, type, ...parentProps} = props;
     if (!route.children){
-        return {...route, sceneKey:route.key, key:position+'_'+route.key, ...parentProps};
+        return { ...scenes.rootProps, ...route, sceneKey:route.key, key:position+'_'+route.key, ...parentProps,};
     }
     let {children, ...res} = {...route, ...parentProps};
     let index = 0;
@@ -35,7 +35,7 @@ export default function(scenes:{string: any}, props){
     // find 'root' component and get state from it
     for (let route in scenes){
         if (scenes.hasOwnProperty(route) && !scenes[route].parent){
-            return getInitialState(scenes[route], scenes, 0, props);
+            return getInitialState(scenes[route], scenes);
         }
     }
 }