From c9b2c4d686951faff453203d88ef95c8e98bf32d Mon Sep 17 00:00:00 2001 From: "satyajit.happy" Date: Wed, 17 Jul 2019 14:10:28 +0200 Subject: [PATCH] fix: don't ignore headerLeft if specified. fixes #164 --- packages/stack/src/types.tsx | 2 +- packages/stack/src/views/Header/HeaderSegment.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx index 5d016eb8..2cc9b9e3 100644 --- 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 index f749b316..90badfd9 100644 --- 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 { leftLabel: previousTitle, onGoBack, headerTitle, - headerLeft: left = (props: HeaderBackButtonProps) => ( - - ), + headerLeft: left = onGoBack + ? (props: HeaderBackButtonProps) => + : undefined, // @ts-ignore headerStatusBarHeight = getStatusBarHeight(layout.width > layout.height), headerTransparent, @@ -295,7 +295,7 @@ export default class HeaderSegment extends React.Component { style={{ height: headerStatusBarHeight }} /> - {onGoBack ? ( + {left ? (