Merge upstream.

Example/.babelrc

@@ -0,0 +1,3 @@
+{
+  presets: ["react-native"]
+}

Example/Example.js

@@ -60,7 +60,7 @@ export default class Example extends React.Component {
                         <Scene key="loginModal2" hideNavBar={true} component={Login2} title="Login2" panHandlers={null} duration={1}/>
                     </Scene>
                     <Scene key="tabbar" component={NavigationDrawer}>
-                        <Scene key="main" tabs={true} default="tab2" >
+                        <Scene key="main" tabs={true} >
                             <Scene key="tab1"  title="Tab #1" icon={TabIcon} navigationBarStyle={{backgroundColor:"red"}} titleStyle={{color:"white"}}>
                                 <Scene key="tab1_1" component={TabView} title="Tab #1_1" onRight={()=>alert("Right button")} rightTitle="Right" />
                                 <Scene key="tab1_2" component={TabView} title="Tab #1_2" titleStyle={{color:"black"}}/>

Example/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "react": "^0.14.7",
-    "react-native": "^0.23.1",
+    "react-native": "^0.22.2",
     "react-native-button": "^1.2.1",
     "react-native-drawer": "^1.16.7",
     "react-native-modalbox": "^1.3.0",

README.md

@@ -176,7 +176,7 @@ export default class Example extends React.Component {
                         <Scene key="loginModal" component={Login} schema="modal" title="Login"/>
                         <Scene key="loginModal2" hideNavBar={true} component={Login2} title="Login2"/>
                     </Scene>
-                    <Scene key="tabbar" tabs={true} default="tab2" >
+                    <Scene key="tabbar" tabs={true} >
                         <Scene key="tab1"  title="Tab #1" icon={TabIcon} navigationBarStyle={{backgroundColor:'red'}} titleStyle={{color:'white'}}>
                             <Scene key="tab1_1" component={TabView} title="Tab #1_1" onRight={()=>alert("Right button")} rightTitle="Right" />
                             <Scene key="tab1_2" component={TabView} title="Tab #1_2" titleStyle={{color:'black'}}/>
@@ -253,6 +253,8 @@ const reducerCreate = params=>{
 return <Router scenes={scenes} createReducer={reducerCreate} />;
 
 ```
+## Tabbar
+Every tab has its own navigation bar. However, if you do not set its parent `<Scene tabs={true} />` with `hideNavBar={true}`, the tabs' navigation bar will be overrided by their parient.
 
 ## Custom nav bar for individual scene or even different state of scene (new feature):
 Your scene `component` class could implement _static_ renderNavigationBar(props) method that could return different navbar depending from component props

index.js

@@ -6,7 +6,6 @@ import getInitialState from './src/State';
 import Reducer from './src/Reducer';
 import TabBar from './src/TabBar';
 import Modal from './src/Modal';
-
 import DefaultRenderer from './src/DefaultRenderer';
 import Switch from './src/Switch';
 

src/Actions.js

@@ -107,7 +107,7 @@ class Actions {
     }
 
     create(scene:Scene){
-        assert(scene, "roote scene should be defined");
+        assert(scene, "root scene should be defined");
         let refs = {};
         this.iterate(scene, {}, refs);
         return refs

src/DefaultRenderer.js

@@ -6,16 +6,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import React, {Component, Animated, PropTypes, StyleSheet, ScrollView, View, Text, NavigationExperimental} from "react-native";
+import React, {Component, Animated, PropTypes, StyleSheet, View, NavigationExperimental} from "react-native";
 const {
     AnimatedView: NavigationAnimatedView,
     Card: NavigationCard,
     RootContainer: NavigationRootContainer,
     Header: NavigationHeader,
     } = NavigationExperimental;
-import Actions from "./Actions";
-import getInitialState from "./State";
-import Reducer from "./Reducer";
 import TabBar from "./TabBar";
 import NavBar from "./NavBar";
 
@@ -95,15 +92,18 @@ export default class DefaultRenderer extends Component {
 
     _renderCard(/*NavigationSceneRendererProps*/ props) {
         const { key, direction, panHandlers, getSceneStyle } = props.scene.navigationState;
-        const style = getSceneStyle ? getSceneStyle(props) : null;
+
+        const optionals = {};
+        if (getSceneStyle) optionals.style = getSceneStyle(props);
+
         return (
             <NavigationCard
                 {...props}
                 key={'card_' + key}
                 direction={direction || 'horizontal'}
                 panHandlers={panHandlers}
                 renderScene={this._renderScene}
-                style={style}
+                {...optionals}
             />
         );
     }

src/Router.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import React, {Component, StyleSheet, ScrollView, Text, NavigationExperimental} from "react-native";
+import React, {Component, NavigationExperimental} from "react-native";
 const {
     AnimatedView: NavigationAnimatedView,
     Card: NavigationCard,

src/Scene.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import React, {Text, Component} from "react-native";
+import React, {Component} from "react-native";
 
 export default class extends Component {
     render(){

src/Schema.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import React, {Text, Component} from "react-native";
+import React, {Component} from "react-native";
 
 export default class extends Component {
     render(){

src/TabBar.js

@@ -1,8 +1,7 @@
-import React, {View, Text, Component, NavigationExperimental} from "react-native";
+import React, {View, Component, NavigationExperimental} from "react-native";
 import Tabs from "react-native-tabs";
 import DefaultRenderer from "./DefaultRenderer";
 import Actions from "./Actions";
-import NavBar from "./NavBar";
 const {
     AnimatedView: NavigationAnimatedView,
     CardStack: NavigationCardStack,