mirror of
https://github.com/zhigang1992/react-navigation.git
synced 2026-02-09 22:51:57 +08:00
fix: don't ignore headerLeft if specified. fixes #164
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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]}
|
||||
|
||||
Reference in New Issue
Block a user