fix: don't ignore headerLeft if specified. fixes #164

react-navigation · Aug 18, 2019 · c9b2c4d · c9b2c4d
1 parent 32b7ec8
commit c9b2c4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx
@@ -128,7 +128,7 @@ export type SceneDescriptorMap = { [key: string]: SceneDescriptor | undefined };
 
 export type HeaderBackButtonProps = {
   disabled?: boolean;
-  onPress: () => void;
+  onPress?: () => void;
   pressColorAndroid?: string;
   backImage?: (props: { tintColor: string }) => React.ReactNode;
   tintColor?: string;

diff --git a/packages/stack/src/views/Header/HeaderSegment.tsx b/packages/stack/src/views/Header/HeaderSegment.tsx
@@ -141,9 +141,9 @@ export default class HeaderSegment extends React.Component<Props, State> {
       leftLabel: previousTitle,
       onGoBack,
       headerTitle,
-      headerLeft: left = (props: HeaderBackButtonProps) => (
-        <HeaderBackButton {...props} />
-      ),
+      headerLeft: left = onGoBack
+        ? (props: HeaderBackButtonProps) => <HeaderBackButton {...props} />
+        : undefined,
       // @ts-ignore
       headerStatusBarHeight = getStatusBarHeight(layout.width > layout.height),
       headerTransparent,
@@ -295,7 +295,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
             style={{ height: headerStatusBarHeight }}
           />
           <View pointerEvents="box-none" style={styles.content}>
-            {onGoBack ? (
+            {left ? (
               <Animated.View
                 pointerEvents="box-none"
                 style={[styles.left, leftButtonStyle, leftContainerStyle]}