@@ -103,12 +103,15 @@ if(tabBarIcon||icon){
103103res . tabBarIcon = tabBarIcon || icon ;
104104}
105105
106- if ( ( rightButtonImage || rightTitle || params . renderRightButton ) && onRight ) {
106+ if ( rightButtonImage || rightTitle || params . renderRightButton || onRight || navigationParams . onRight ||
107+ navigationParams . rightTitle || navigationParams . rightButtonImage ) {
107108res . headerRight = getValue ( navigationParams . right || right || rightButton || params . renderRightButton , _extends ( { } ,
108109navigationParams , screenProps ) ) || ( 0 , _NavBar . renderRightButton ) ( _extends ( { } , params , navigationParams ) ) ;
109110}
110111
111- if ( leftButtonImage || backButtonImage || backTitle || leftTitle || params . renderLeftButton || leftButtonTextStyle || backButtonTextStyle || onLeft ) {
112+ if ( leftButtonImage || backButtonImage || backTitle || leftTitle || params . renderLeftButton || leftButtonTextStyle ||
113+ backButtonTextStyle || onLeft || navigationParams . leftTitle || navigationParams . onLeft || navigationParams . leftButtonImage ||
114+ navigationParams . backButtonImage || navigationParams . backTitle ) {
112115res . headerLeft = getValue ( navigationParams . left || left || leftButton || params . renderLeftButton , _extends ( { } , params , navigationParams , screenProps ) ) ||
113116( 0 , _NavBar . renderLeftButton ) ( _extends ( { } , params , navigationParams ) ) || ( init ?null :( 0 , _NavBar . renderBackButton ) ( _extends ( { } , params , navigationParams , screenProps ) ) ) ;
114117}
@@ -136,15 +139,15 @@ if(!Component){
136139return null ;
137140}
138141return ( 0 , _native . observer ) ( function ( _ref3 ) { var navigation = _ref3 . navigation , props = _objectWithoutProperties ( _ref3 , [ 'navigation' ] ) ;
139- return _react2 . default . createElement ( Component , _extends ( { } , props , { navigation :navigation } , navigation . state . params , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :139 } } ) ) ;
142+ return _react2 . default . createElement ( Component , _extends ( { } , props , { navigation :navigation } , navigation . state . params , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :142 } } ) ) ;
140143} ) ;
141144}
142145
143146
144147var App = ( 0 , _native . observer ) ( function ( props ) {
145148var AppNavigator = props . navigator ;
146149return (
147- _react2 . default . createElement ( AppNavigator , { navigation :( 0 , _reactNavigation . addNavigationHelpers ) ( { dispatch :_navigationStore2 . default . dispatch , state :_navigationStore2 . default . state } ) , __source :{ fileName :_jsxFileName , lineNumber :147 } } ) ) ;
150+ _react2 . default . createElement ( AppNavigator , { navigation :( 0 , _reactNavigation . addNavigationHelpers ) ( { dispatch :_navigationStore2 . default . dispatch , state :_navigationStore2 . default . state } ) , __source :{ fileName :_jsxFileName , lineNumber :150 } } ) ) ;
148151
149152} ) ;
150153
@@ -262,7 +265,7 @@ var AppNavigator=processScene(scene,props);
262265_navigationStore2 . default . router = AppNavigator . router ;
263266_navigationStore2 . default . reducer = createReducer && createReducer ( props ) ;
264267
265- return _react2 . default . createElement ( App , { navigator :AppNavigator , __source :{ fileName :_jsxFileName , lineNumber :265 } } ) ;
268+ return _react2 . default . createElement ( App , { navigator :AppNavigator , __source :{ fileName :_jsxFileName , lineNumber :268 } } ) ;
266269} ;
267270Router . propTypes = {
268271createReducer :_propTypes2 . default . func ,
0 commit comments