Merge pull request #6 from aksonov/master

merge from master
aksonov · Mar 9, 2016 · 76e670d · 76e670d
2 parents 9cc723d + 3d5d7f0
commit 76e670d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ExRouter.js b/ExRouter.js
@@ -45,6 +45,9 @@ export class ExRouteAdapter {
         if (this.route.props.renderLeftButton){
             this.renderLeftButton = this.route.props.renderLeftButton.bind(this.route);
         }
+        if (this.route.props.renderBackButton){
+            this.renderBackButton = this.route.props.renderBackButton.bind(this.route);
+        }
     }
 
     configureScene() {
@@ -126,6 +129,7 @@ export class ExRouteAdapter {
             ExNavigatorStyles.barButtonText,
             ExNavigatorStyles.barBackButtonText,
             navigator.props.barButtonTextStyle,
+            this.route.props.leftButtonTextStyle,
           ]}
                 >
                     {title}
@@ -141,6 +145,7 @@ export class ExRouteAdapter {
                     style={[
             ExNavigatorStyles.barButtonIcon,
             navigator.props.barButtonIconStyle,
+            this.route.props.barButtonIconStyle,
           ]}
                 />
                 {buttonText}
@@ -387,4 +392,3 @@ var styles = StyleSheet.create({
     },
 
 });
-
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-router-flux",
-  "version": "2.3.11",
+  "version": "2.3.12",
   "description": "React Native Router using Flux architecture",
   "repository": {
     "type": "git",