Merge branch 'master' into examples/Explorer

Author: charpeni

README.md

@@ -3,7 +3,7 @@ React Native Simple Router
 
 Awesome navigation for your React Native app.
 
-![NavBar Example](https://camo.githubusercontent.com/1e8083920215b01ed81fcd054dd01fe709e16a85/687474703a2f2f7472697374616e656477617264732e6d652f752f72656163742d6e61746976652d726f757465722f6e61746976652d726f757465722e676966)
+![NavBar Example](http://i.imgur.com/h5jUDC8.png)
 
 Install
 -------
@@ -165,8 +165,8 @@ The functions **`this.props.setRightProps`**, **`this.props.setLeftProps`** and
 
 As of 0.7.0 the router acts as a relay for events emitted by the navigator, and extends these to the following list:
 
-  - `willFocus`: Emitted when a route will focus. Emits the route name as a string.
-  - `didFocus`: Emitted when a route did focus. Emits the route name as a string.
+  - `willFocus`: Emitted when a route will focus. Emits route object.
+  - `didFocus`: Emitted when a route did focus. Emits route object.
   - `willPop`: Emitted when a route stack will be popped. Triggered by `Navigator.pop();`
   - `didPop`: Emitted when a route stack did pop. Triggered by `Navigator.pop();`
   - `willPush`: Emitted when a new route will be pushed to the route stack. Emits the new route object. Triggered by `Navigator.push(route);`
@@ -181,9 +181,9 @@ As of 0.7.0 the router acts as a relay for events emitted by the navigator, and
 You can listen to these events by adding an event listener as such:
 
 ```javascript
-  	this.props.routeEmitter.addListener('didFocus', (name) => {
-		//Do something with name..
-	});
+  this.props.routeEmitter.addListener('didFocus', (route) => {
+      console.log(route.name, 'didFocus');
+  });
 ```
 
 As of v0.8.0 the `leftCorner`, `rightCorner` and `titleComponent` have access to the following router functions :

components/NavBarContent.js

@@ -173,7 +173,11 @@ class NavBarContent extends React.Component {
       );
     } else if (this.props.route.index > 0) {
       leftCornerContent = (
-        <NavButton onPress={this.goBack} backButtonComponent={this.props.backButtonComponent} />
+        <NavButton onPress={this.goBack } backButtonComponent={ () => {
+          const BackButton = this.props.backButtonComponent;
+          const backButtonProps = this.props.route.backButtonProps || {};
+          return <BackButton {...backButtonProps} />;
+        }} />
       );
     }
 
@@ -205,7 +209,7 @@ class NavBarContent extends React.Component {
       );
     }
 
-    if (Platform.OS === 'ios' || this.props.route.rightCorner || this.props.rightCorner) {
+    if (Platform.OS === 'ios' || this.props.route.rightCorner || this.props.route.index > 0) {
       rightCorner = (
         <View style={[styles.corner, styles.alignRight]}>
           {rightCornerContent}

index.js

@@ -83,12 +83,12 @@ class Router extends React.Component {
     this.refs.navigator.navigationContext.addListener('willfocus', (event) => {
       const route = event.data.route;
       this.setState({ route });
-      this.emitter.emit('willFocus', route.name);
+      this.emitter.emit('willFocus', route);
     });
 
     this.refs.navigator.navigationContext.addListener('didfocus', (event) => {
       const route = event.data.route;
-      this.emitter.emit('didFocus', route.name);
+      this.emitter.emit('didFocus', route);
     });
 
     aspect.before(this.refs.navigator, 'pop', () => {