feat: add headerBackgroundStyle option

react-navigation · Aug 18, 2019 · 2ea0912 · 2ea0912
1 parent 27c4861
commit 2ea0912
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx
@@ -79,6 +79,7 @@ export type HeaderOptions = {
   headerBackImage?: HeaderBackButtonProps['backImage'];
   headerPressColorAndroid?: string;
   headerBackground?: () => React.ReactNode;
+  headerBackgroundStyle?: StyleProp<ViewStyle>;
   headerStyle?: StyleProp<ViewStyle>;
   headerStatusBarHeight?: number;
 };

diff --git a/packages/stack/src/views/Header/HeaderSegment.tsx b/packages/stack/src/views/Header/HeaderSegment.tsx
@@ -56,10 +56,6 @@ export const getDefaultHeaderHeight = (layout: Layout) => {
 };
 
 export default class HeaderSegment extends React.Component<Props, State> {
-  static defaultProps = {
-    headerBackground: () => <HeaderBackground />,
-  };
-
   state: State = {};
 
   private handleTitleLayout = (e: LayoutChangeEvent) => {
@@ -124,10 +120,11 @@ export default class HeaderSegment extends React.Component<Props, State> {
       headerLeft: left = (props: HeaderBackButtonProps) => (
         <HeaderBackButton {...props} />
       ),
-      headerBackground,
+      headerStatusBarHeight = getStatusBarHeight(layout.width > layout.height),
       headerTintColor,
+      headerBackground,
+      headerBackgroundStyle,
       // @ts-ignore
-      headerStatusBarHeight = getStatusBarHeight(layout.width > layout.height),
       headerRight: right,
       headerBackImage: backImage,
       headerBackTitle: leftLabel,
@@ -163,14 +160,16 @@ export default class HeaderSegment extends React.Component<Props, State> {
 
     return (
       <React.Fragment>
-        {headerBackground ? (
-          <Animated.View
-            pointerEvents="none"
-            style={[StyleSheet.absoluteFill, backgroundStyle]}
-          >
-            {headerBackground()}
-          </Animated.View>
-        ) : null}
+        <Animated.View
+          pointerEvents="none"
+          style={[StyleSheet.absoluteFill, backgroundStyle]}
+        >
+          {headerBackground ? (
+            headerBackground()
+          ) : (
+            <HeaderBackground style={headerBackgroundStyle} />
+          )}
+        </Animated.View>
         <View pointerEvents="none" style={{ height: headerStatusBarHeight }} />
         <View pointerEvents="box-none" style={styles.container}>
           {onGoBack ? (