kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-12 22:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: drop header: null in favor of more explitit headerShown option

Browse Source
This commit is contained in:
satyajit.happy
2019-10-06 15:53:18 +02:00
parent 16079d1050
commit ba6b6ae025
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/stack/src/views/Stack/Stack.tsx
View File

@@ -353,7 +353,7 @@ export default class Stack extends React.Component<Props, State> {
: 0;
const {
header,
headerShown,
headerTransparent,
cardTransparent,
cardShadowEnabled,
@@ -430,9 +430,9 @@ export default class Stack extends React.Component<Props, State> {
onPageChangeCancel={onPageChangeCancel}
gestureResponseDistance={gestureResponseDistance}
floatingHeaderHeight={floatingHeaderHeights[route.key]}
hasCustomHeader={header === null}
getPreviousRoute={getPreviousRoute}
headerMode={headerMode}
headerShown={headerShown}
headerTransparent={headerTransparent}
renderHeader={renderHeader}
renderScene={renderScene}

6
packages/stack/src/views/Stack/StackItem.tsx
View File

@@ -53,9 +53,9 @@ type Props = TransitionPreset & {
};
gestureVelocityImpact?: number;
headerMode: StackHeaderMode;
headerShown?: boolean;
headerTransparent?: boolean;
floatingHeaderHeight: number;
hasCustomHeader: boolean;
};
export default class StackItem extends React.PureComponent<Props> {
@@ -114,7 +114,7 @@ export default class StackItem extends React.PureComponent<Props> {
gestureResponseDistance,
gestureVelocityImpact,
floatingHeaderHeight,
hasCustomHeader,
headerShown,
getPreviousRoute,
headerMode,
headerTransparent,
@@ -153,7 +153,7 @@ export default class StackItem extends React.PureComponent<Props> {
importantForAccessibility={focused ? 'auto' : 'no-hide-descendants'}
pointerEvents="box-none"
containerStyle={
headerMode === 'float' && !headerTransparent && !hasCustomHeader
headerMode === 'float' && !headerTransparent && headerShown !== false
? { marginTop: floatingHeaderHeight }
: null
}