@@ -144,12 +144,16 @@ res.header=function(data){return _react2.default.createElement(NavBarFromParams,
144144res . header = function ( data ) { return _react2 . default . createElement ( NavBar , _extends ( { navigation :navigation } , state , data , { __source :{ fileName :_jsxFileName , lineNumber :144 } } ) ) ; } ;
145145}
146146
147- if ( panHandlers === null ) {
147+ if ( typeof navigationParams . panHandlers !== 'undefined' ) {
148+ if ( navigationParams . panHandlers === null ) {
149+ res . gesturesEnabled = false ;
150+ }
151+ } else if ( panHandlers === null ) {
148152res . gesturesEnabled = false ;
149153}
150154
151155if ( navigationBarTitleImage ) {
152- res . headerTitle = _react2 . default . createElement ( _reactNative . Image , { source :navigationBarTitleImage , style :navigationBarTitleImageStyle , __source :{ fileName :_jsxFileName , lineNumber :152 } } ) ;
156+ res . headerTitle = _react2 . default . createElement ( _reactNative . Image , { source :navigationBarTitleImage , style :navigationBarTitleImageStyle , __source :{ fileName :_jsxFileName , lineNumber :156 } } ) ;
153157}
154158
155159if ( tabBarLabel ) {
@@ -158,7 +162,7 @@ res.tabBarLabel=tabBarLabel;
158162
159163if ( tabBarIcon || icon ) {
160164var Icon = tabBarIcon || icon ;
161- res . tabBarIcon = function ( data ) { return _react2 . default . createElement ( Icon , _extends ( { } , state , data , { __source :{ fileName :_jsxFileName , lineNumber :161 } } ) ) ; } ;
165+ res . tabBarIcon = function ( data ) { return _react2 . default . createElement ( Icon , _extends ( { } , state , data , { __source :{ fileName :_jsxFileName , lineNumber :165 } } ) ) ; } ;
162166}
163167var componentData = { } ;
164168
@@ -176,20 +180,20 @@ if(rightButtonImage||rightTitle||params.renderRightButton||onRight||navigationPa
176180navigationParams . rightTitle || navigationParams . rightButtonImage || rightButtonTextStyle ||
177181( drawerImage || drawerIcon ) && ! hideDrawerButton && drawerPosition === 'right' ) {
178182res . headerRight = getValue ( navigationParams . right || navigationParams . rightButton || params . renderRightButton , _extends ( { } ,
179- navigationParams , screenProps ) ) || _react2 . default . createElement ( RightNavBarButton , _extends ( { } , params , navigationParams , componentData , { __source :{ fileName :_jsxFileName , lineNumber :179 } } ) ) ;
183+ navigationParams , screenProps ) ) || _react2 . default . createElement ( RightNavBarButton , _extends ( { } , params , navigationParams , componentData , { __source :{ fileName :_jsxFileName , lineNumber :183 } } ) ) ;
180184}
181185
182186if ( leftButtonImage || backButtonImage || backTitle || leftTitle || params . renderLeftButton || leftButtonTextStyle ||
183187backButtonTextStyle || onLeft || navigationParams . leftTitle || navigationParams . onLeft || navigationParams . leftButtonImage ||
184188navigationParams . backButtonImage || navigationParams . backTitle || ( drawerImage || drawerIcon ) && ! hideDrawerButton && drawerPosition !== 'right' ) {
185189res . headerLeft = getValue ( navigationParams . left || navigationParams . leftButton || params . renderLeftButton , _extends ( { } , params , navigationParams , screenProps ) ) ||
186190( onLeft && ( leftTitle || navigationParams . leftTitle || leftButtonImage || navigationParams . leftButtonImage ) || drawerImage || drawerIcon ) &&
187- _react2 . default . createElement ( LeftNavBarButton , _extends ( { } , params , navigationParams , componentData , { __source :{ fileName :_jsxFileName , lineNumber :187 } } ) ) || res . headerLeft || (
188- init ?null :renderBackButton && renderBackButton ( state ) || _react2 . default . createElement ( BackNavBarButton , _extends ( { } , state , { __source :{ fileName :_jsxFileName , lineNumber :188 } } ) ) ) ;
191+ _react2 . default . createElement ( LeftNavBarButton , _extends ( { } , params , navigationParams , componentData , { __source :{ fileName :_jsxFileName , lineNumber :191 } } ) ) || res . headerLeft || (
192+ init ?null :renderBackButton && renderBackButton ( state ) || _react2 . default . createElement ( BackNavBarButton , _extends ( { } , state , { __source :{ fileName :_jsxFileName , lineNumber :192 } } ) ) ) ;
189193}
190194
191195if ( back ) {
192- res . headerLeft = renderBackButton && renderBackButton ( state ) || _react2 . default . createElement ( BackNavBarButton , _extends ( { } , state , { __source :{ fileName :_jsxFileName , lineNumber :192 } } ) ) ;
196+ res . headerLeft = renderBackButton && renderBackButton ( state ) || _react2 . default . createElement ( BackNavBarButton , _extends ( { } , state , { __source :{ fileName :_jsxFileName , lineNumber :196 } } ) ) ;
193197}
194198
195199if ( typeof navigationParams . left !== 'undefined' || typeof navigationParams . leftButton !== 'undefined' ||
@@ -269,15 +273,15 @@ store.deleteRef(originalRouteName(navigation.state.routeName));
269273} } , { key :'render' , value :function render ( )
270274{ var _this2 = this ;
271275var navigation = this . props . navigation ;
272- return _react2 . default . createElement ( Component , _extends ( { ref :function ref ( _ref5 ) { return _this2 . ref = _ref5 ; } } , this . props , extendProps ( navigation . state . params , store ) , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :272 } } ) ) ;
276+ return _react2 . default . createElement ( Component , _extends ( { ref :function ref ( _ref5 ) { return _this2 . ref = _ref5 ; } } , this . props , extendProps ( navigation . state . params , store ) , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :276 } } ) ) ;
273277} } ] ) ; return Wrapped ; } ( _react2 . default . Component ) , _class . propTypes = { navigation :_propTypes2 . default . object } , _temp ) ;
274278
275279return wrapper ( Wrapped ) ;
276280}
277281
278282
279283function StatelessWrapped ( _ref6 ) { var navigation = _ref6 . navigation , props = _objectWithoutProperties ( _ref6 , [ 'navigation' ] ) ;
280- return _react2 . default . createElement ( Component , _extends ( { } , props , { navigation :navigation } , extendProps ( navigation . state . params , store ) , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :280 } } ) ) ;
284+ return _react2 . default . createElement ( Component , _extends ( { } , props , { navigation :navigation } , extendProps ( navigation . state . params , store ) , { name :navigation . state . routeName , __source :{ fileName :_jsxFileName , lineNumber :284 } } ) ) ;
281285}
282286StatelessWrapped . propTypes = {
283287navigation :_propTypes2 . default . object } ;
@@ -471,8 +475,8 @@ if(lightbox){
471475return ( 0 , _LightboxNavigator2 . default ) ( res , _extends ( { mode :mode , initialRouteParams :initialRouteParams , initialRouteName :initialRouteName } , commonProps , { navigationOptions :createNavigationOptions ( commonProps ) } ) ) ;
472476} else if ( tabs ) {
473477if ( ! tabBarComponent ) {
474- tabBarComponent = tabBarPosition === 'top' ?function ( props ) { return _react2 . default . createElement ( _reactNavigation . TabBarTop , _extends ( { } , props , commonProps , { __source :{ fileName :_jsxFileName , lineNumber :474 } } ) ) ; } :
475- function ( props ) { return _react2 . default . createElement ( _reactNavigation . TabBarBottom , _extends ( { } , props , commonProps , { __source :{ fileName :_jsxFileName , lineNumber :475 } } ) ) ; } ;
478+ tabBarComponent = tabBarPosition === 'top' ?function ( props ) { return _react2 . default . createElement ( _reactNavigation . TabBarTop , _extends ( { } , props , commonProps , { __source :{ fileName :_jsxFileName , lineNumber :478 } } ) ) ; } :
479+ function ( props ) { return _react2 . default . createElement ( _reactNavigation . TabBarBottom , _extends ( { } , props , commonProps , { __source :{ fileName :_jsxFileName , lineNumber :479 } } ) ) ; } ;
476480}
477481if ( ! tabBarPosition ) {
478482tabBarPosition = _reactNative . Platform . OS === 'android' ?'top' :'bottom' ;
0 commit comments