fix: check if left button is truthy to add a left offset

react-navigation · Aug 21, 2019 · 8645e36 · 8645e36
1 parent 9195861
commit 8645e36
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/packages/stack/src/views/Header/HeaderSegment.tsx b/packages/stack/src/views/Header/HeaderSegment.tsx
@@ -274,6 +274,24 @@ export default class HeaderSegment extends React.Component<Props, State> {
       }
     }
 
+    const leftButton = left
+      ? left({
+          backImage,
+          pressColorAndroid,
+          allowFontScaling: backAllowFontScaling,
+          onPress: onGoBack,
+          labelVisible: headerBackTitleVisible,
+          label: leftLabel !== undefined ? leftLabel : previousTitle,
+          truncatedLabel,
+          labelStyle: [leftLabelStyle, customLeftLabelStyle],
+          onLabelLayout: this.handleLeftLabelLayout,
+          screenLayout: layout,
+          titleLayout,
+          tintColor: headerTintColor,
+          canGoBack: Boolean(onGoBack),
+        })
+      : null;
+
     return (
       <React.Fragment>
         <Animated.View
@@ -295,34 +313,20 @@ export default class HeaderSegment extends React.Component<Props, State> {
             style={{ height: headerStatusBarHeight }}
           />
           <View pointerEvents="box-none" style={styles.content}>
-            {left ? (
+            {leftButton ? (
               <Animated.View
                 pointerEvents="box-none"
                 style={[styles.left, leftButtonStyle, leftContainerStyle]}
               >
-                {left({
-                  backImage,
-                  pressColorAndroid,
-                  allowFontScaling: backAllowFontScaling,
-                  onPress: onGoBack,
-                  labelVisible: headerBackTitleVisible,
-                  label: leftLabel !== undefined ? leftLabel : previousTitle,
-                  truncatedLabel,
-                  labelStyle: [leftLabelStyle, customLeftLabelStyle],
-                  onLabelLayout: this.handleLeftLabelLayout,
-                  screenLayout: layout,
-                  titleLayout,
-                  tintColor: headerTintColor,
-                  canGoBack: Boolean(onGoBack),
-                })}
+                {leftButton}
               </Animated.View>
             ) : null}
             <Animated.View
               pointerEvents="box-none"
               style={[
                 Platform.select({
                   ios: null,
-                  default: { left: left ? 72 : 16 },
+                  default: { left: leftButton ? 72 : 16 },
                 }),
                 styles.title,
                 titleStyle,