support onRight/rightTitle/rightButtonImage for Actions.refresh

aksonov · Jul 12, 2017 · a5666a6 · a5666a6
1 parent 904c8db
commit a5666a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Example/Example.js b/Example/Example.js
@@ -114,7 +114,7 @@ class Example extends Component {
                 </Scene>
               </Scene>
             </Scene>
-            <Scene key="login" rightTitle="Right" onRight={()=>{}}  >
+            <Scene key="login" >
               <Scene key="loginModal" component={Login} title="Login" leftTitle="Cancel" onLeft={Actions.pop}/>
               <Scene
                 key="loginModal2"

diff --git a/Example/components/Login.js b/Example/components/Login.js
@@ -23,6 +23,13 @@ const styles = StyleSheet.create({
 });
 
 export default class extends React.Component {
+  componentDidMount() {
+    Actions.refresh({
+      title: 'Login!',
+      rightTitle: 'rightTitle',
+      onRight: () => {},
+    });
+  }
   render() {
     const title = this.props.title || 'No Title';
     const data = this.props.data || 'No Data';

diff --git a/src/Router.js b/src/Router.js
@@ -103,12 +103,15 @@ function createNavigationOptions(params) {
       res.tabBarIcon = tabBarIcon || icon;
     }
 
-    if ((rightButtonImage || rightTitle || params.renderRightButton) && onRight) {
+    if (rightButtonImage || rightTitle || params.renderRightButton || onRight || navigationParams.onRight
+      || navigationParams.rightTitle || navigationParams.rightButtonImage) {
       res.headerRight = getValue(navigationParams.right || right || rightButton || params.renderRightButton,
           { ...navigationParams, ...screenProps }) || renderRightButton({ ...params, ...navigationParams });
     }
 
-    if (leftButtonImage || backButtonImage || backTitle || leftTitle || params.renderLeftButton || leftButtonTextStyle || backButtonTextStyle || onLeft) {
+    if (leftButtonImage || backButtonImage || backTitle || leftTitle || params.renderLeftButton || leftButtonTextStyle
+      || backButtonTextStyle || onLeft || navigationParams.leftTitle || navigationParams.onLeft || navigationParams.leftButtonImage
+      || navigationParams.backButtonImage || navigationParams.backTitle) {
       res.headerLeft = getValue(navigationParams.left || left || leftButton || params.renderLeftButton, { ...params, ...navigationParams, ...screenProps })
         || renderLeftButton({ ...params, ...navigationParams }) || (init ? null : renderBackButton({ ...params, ...navigationParams, ...screenProps }));
     }