Allow the passing of props and bumped dependency versions

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Tristan Edwards
+Copyright (c) 2015 Mikael Carpenter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,21 +1,23 @@
-React Native Router
+GB Native Router
 ===================
+
 Awesome navigation for your React Native app.
 
-![Twitter navigation](http://tristanedwards.me/u/react-native-router/native-router.gif)
+![NavBar Example](http://i.imgur.com/h5jUDC8.png)
 
 Install
 -------
 
 Make sure that you are in your React Native project directory and run:
 
-```npm install react-native-router --save```
+
+```$ npm install gb-native-router --save```
 
 Usage
 -----
 
 ```javascript
-var Router = require('react-native-router');
+var Router = require('gb-native-router');
 ```
 
 The basics:
@@ -75,53 +77,80 @@ var HelloPage = React.createClass({
 
 Now, when you click on "Next page please!", it will go to the next page (which in this case is still HelloPage but with a new title). Keep in mind that ```this.props.toRoute()``` needs to be called from one of the top-level routes, therefore, if your link is deeply nested within multiple components, you need to make sure that the action "bubbles up" until it reaches the parent route, which in turn calls ```this.props.toRoute()```.
 
-
-A more advanced example: Twitter app
-------------------------------------
-
-To see more of the router in action, you can check out the Twitter example app that comes with the package. Just make sure that you first drag all the images from ```node_modules/react-native-router/twitter-example/images``` to your project's Images.xcassets:
-
-![Drag the assets to xcassets](http://tristanedwards.me/u/react-native-router/drag-assets.gif)
-
-After that, don't forget to rebuild the app in XCode before you launch the simulator. Then test the app by requiring the TwitterApp component:
-
-```javascript
-var TwitterApp = require('./node_modules/react-native-router/twitter-example');
-
-var {
-  AppRegistry
-} = React;
-
-AppRegistry.registerComponent('routerTest', () => TwitterApp);
-```
-
 Configurations
 --------------
 
 The **`<Router \>`** object used to initialize the navigation can take the following props:
 - `firstRoute` (required): A React class corresponding to the first page of your navigation
 - `headerStyle`: Apply a StyleSheet to the navigation bar. You'll probably want to change the backgroundColor for example.
 - `titleStyle`: Apply a StyleSheet to the navigation bar titles. Useful for changing the font or text color.
+- `borderBottomWidth`: Apply a bottom border to your navbar.
+- `borderColor`: Apply a border color to your bottom border.
 - `backButtonComponent`: By default, the navigation bar will display a simple "Back" text for the back button. To change this, you can specify your own backButton component (like in the Twitter app).
 - `rightCorner`: If you have the same occuring action buttons on the right side of your navigation bar (like the Twitter "Compose"-button), you can specify a component for that view.
 - `customAction`: A special callback prop for your action buttons (this can be handy for triggering a side menu for example). The action gets triggered from your custom `leftCorner` or `rightCorner` components by calling `this.props.customAction("someActionName")` from them. It is then picked up like this: `<Router customAction={this.doSomething} />`.
+- `hideNavigationBar`: Hide the navigation bar, always
 
 The **`this.props.toRoute()`** callback prop takes one parameter (a JavaScript object) which can have the following keys:
 - `name`: The name of your route, which will be shown as the title of the navigation bar unless it is changed.
 - `component` (required): The React class corresponding to the view you want to render.
 - `leftCorner`: Specify a component to render on the left side of the navigation bar (like the "Add people"-button on the first page of the Twitter app)
 - `rightCorner`: Specify a component to render on the right side of the navigation bar
 - `titleComponent`: Specify a component to replace the title. This could for example be your logo (as in the first page of the Instagram app)
-- `headerStyle`: change the style of your header for the new route. You could for example specify a new backgroundColor and the router will automatically make a nice transition from one color to the other!
-- `data`: Send custom data to your route.
+- `headerStyle`: Change the style of your header for the new route. You could for example specify a new backgroundColor and the router will automatically make a nice transition from one color to the other!
+- `passProps`: Takes in an object. Passes each `key: value` pair to your component as a prop. i.e. <Component key={value} />
+- `trans`: If set to a truthy value it will make the navbar transparent and move your component content so that it sits behind the nav.
+- `hideNavigationBar`: If set to a truthy value will hide the navigationbar out of view, and move the component so that it is at the top of the screen.
+- `leftCornerProps`: If you set a `leftCorner` component you can use this property to pass props to that component.
+- `rightCornerProps`: If you set a `rightCorner` component you can use this property to pass props to that component.
+- `sceneConfig`: Control the animation of the route being switched. Possible values are:
+  - Navigator.SceneConfigs.FadeAndroid
+  - Navigator.SceneConfigs.FloatFromBottom
+  - Navigator.SceneConfigs.FloatFromBottomAndroid
+  - Navigator.SceneConfigs.FloatFromLeft
+  - Navigator.SceneConfigs.FloatFromRight
+  - Navigator.SceneConfigs.HorizontalSwipeJump
+  - Navigator.SceneConfigs.PushFromRight
+  - Navigator.SceneConfigs.VerticalDownSwipeJump
+  - Navigator.SceneConfigs.VerticalUpSwipeJump
+
+The **`this.props.replaceRoute`**  takes in an object that can contain the same keys as `toRoute()`. The difference is that instead of adding a route to your stack, it replaces the route
+that you're on with the new route that you pass it.
+- This is useful for login or signup screens. If you don't want your user to be able to navigate back to it, then use `replaceRoute()` rather than `toRoute()`.
+
+The **`this.props.resetToRoute`**  takes in an object that can contain the same keys as `toRoute()`. The difference is that instead of adding a route to your stack, it replaces the route
+that you're on with the new route that you pass it, and empties the navigation stack as well.
+- This is useful for going to an application after a login or signup screens. If you don't want your user to be able to navigate back to it, then use `resetToRoute()` rather than `replaceRoute()`.
+
+The **`this.props.setRightProps`** and **`this.props.setLeftProps`** take in an object of props and sends that to your navbar's `RightComponent` and `LeftComponent`.
+- This allows you to talk directly to your navbar, because previously you could only talk to it when navigating forward or backward.
+
+
+Events emitted by the router:
+  `didFocus`, emits route name
+  You can add a listener to a component as such:
 
+```javascript
+  	this.props.routeEmitter.addListener('didFocus', (name) => {
+			//Check if name is the current component, and if it is, act on this focus event.
+		});
+```
 
-Todos
------
-When swiping from left to right to go back, it would be nice if the navigation bar's opacity gradually changed with the user's finger position. (See [Issue #1](https://github.com/t4t5/react-native-router/issues/1))
 
-Questions?
----------
 
-If something is unclear or if you just want to say hi, feel free to [follow me on Twitter](https://twitter.com/t4t5)!
+A more advanced example: Twitter app
+------------------------------------
+
+To see more of the router in action, you can check out the Twitter example app that comes with the package. Just make sure that you first drag all the images from ```node_modules/react-native-router/twitter-example/images``` to your project's Images.xcassets
+
+After that, don't forget to rebuild the app in XCode before you launch the simulator. Then test the app by requiring the TwitterApp component:
+
+```javascript
+var TwitterApp = require('./node_modules/react-native-router/twitter-example');
 
+var {
+  AppRegistry
+} = React;
+
+AppRegistry.registerComponent('routerTest', () => TwitterApp);
+```

components/NavBarContainer.js

@@ -9,7 +9,6 @@ var {
   View
 } = React;
 
-
 var NavBarContainer = React.createClass({
 
   getInitialState: function() {
@@ -41,40 +40,90 @@ var NavBarContainer = React.createClass({
 
   // We render both the current and the previous navbar (for animation)
   render: function() {
-    return (
-      <View style={[styles.navbarContainer, this.props.style]}>
-        <NavBarContent 
-          route={this.state.previousRoute} 
+    var trans,
+      navbarStyle,
+      navbarContent;
+
+    if (this.props.currentRoute.trans) {
+      trans = {backgroundColor: 'transparent'};
+    } else {
+      trans = {};
+    }
+
+    if (this.props.currentRoute.hideNavigationBar) {
+      navbarStyle = styles.navbarContainerHidden;
+    } else {
+      navbarStyle = styles.navbarContainer;
+    }
+
+    if(this.props.currentRoute.trans) {
+      navbarContent = (
+        <NavBarContent
+        route={this.state.previousRoute}
+        backButtonComponent={this.props.backButtonComponent}
+        rightCorner={this.props.rightCorner}
+        titleStyle={this.props.titleStyle}
+        willDisappear="true"></NavBarContent>
+      );
+    } else if (this.props.currentRoute.hideNavigationBar) {
+      navbarContent = (
+        <NavBarContent
+          route={this.props.currentRoute}
           backButtonComponent={this.props.backButtonComponent}
           rightCorner={this.props.rightCorner}
           titleStyle={this.props.titleStyle}
-          willDisappear="true" 
-        />
-        <NavBarContent 
-          route={this.props.currentRoute} 
+          borderBottomWidth={this.props.borderBottomWidth}
+          borderColor={this.props.borderColor}
+          goBack={this.goBack}
+          goForward={this.goForward}
+          leftProps={this.props.leftProps}
+          rightProps={this.props.rightProps}
+          titleProps={this.props.titleProps}
+          customAction={this.customAction}>
+      </NavBarContent>
+      );
+    } else {
+      navbarContent = (
+        <NavBarContent
+          route={this.props.currentRoute}
           backButtonComponent={this.props.backButtonComponent}
           rightCorner={this.props.rightCorner}
           titleStyle={this.props.titleStyle}
+          borderBottomWidth={this.props.borderBottomWidth}
+          borderColor={this.props.borderColor}
           goBack={this.goBack}
           goForward={this.goForward}
-          customAction={this.customAction}
-        />
+          leftProps={this.props.leftProps}
+          rightProps={this.props.rightProps}
+          titleProps={this.props.titleProps}
+          customAction={this.customAction}>
+        </NavBarContent>
+      );
+    }
+
+    return (
+      <View style={[navbarStyle, this.props.style, trans]}>
+        {navbarContent}
       </View>
-    )
+    );
   }
 });
 
-
 var styles = StyleSheet.create({
   navbarContainer: {
     position: 'absolute',
     top: 0,
     left: 0,
     right: 0,
-    height: 64,
-    backgroundColor: '#5589B7'
+    height: 64
+  },
+  navbarContainerHidden: {
+    position: 'absolute',
+    top: -64,
+    left: 0,
+    right: 0,
+    height: 64
   }
 });
 
-
 module.exports = NavBarContainer;