diff --git a/packages/react-navigation/src/views/CardStack.js b/packages/react-navigation/src/views/CardStack.js index 2e7f0a06..c20999aa 100644 --- a/packages/react-navigation/src/views/CardStack.js +++ b/packages/react-navigation/src/views/CardStack.js @@ -334,10 +334,10 @@ class CardStack extends Component { }); const { options } = this._getScreenDetails(scene); - const gesturesEnabled = mode === 'card' && ( - typeof options.gesturesEnabled === 'boolean' ? options.gesturesEnabled - : Platform.OS === 'ios' - ) + const gesturesEnabled = mode === 'card' && + (typeof options.gesturesEnabled === 'boolean' + ? options.gesturesEnabled + : Platform.OS === 'ios'); const handlers = gesturesEnabled ? responder.panHandlers : {}; diff --git a/packages/react-navigation/src/views/HeaderBackButton.js b/packages/react-navigation/src/views/HeaderBackButton.js index 16283bc2..23af608d 100644 --- a/packages/react-navigation/src/views/HeaderBackButton.js +++ b/packages/react-navigation/src/views/HeaderBackButton.js @@ -67,11 +67,16 @@ class HeaderBackButton extends React.PureComponent { ? this.state.initialTextWidth > width : false; + const backButtonTitle = renderTruncated ? truncatedTitle : title; + // eslint-disable-next-line global-require const asset = require('./assets/back-icon.png'); return ( { style={[styles.title, { color: tintColor }]} numberOfLines={1} > - {renderTruncated ? truncatedTitle : title} + {backButtonTitle} }