From 467c7ac3fa7beee591c1daf620f5d8cd3041b0cb Mon Sep 17 00:00:00 2001
From: Arseny Yankovsky <ArsenyYankovsky@users.noreply.github.com>
Date: Thu, 1 Mar 2018 22:42:19 +0100
Subject: [PATCH] Allow modification of SafeAreaView props (#3496)

* SafeAreaView fix

* Updated to only allow modification of forceInset property of SafeAreaView
---
 packages/react-navigation/flow/react-navigation.js   | 10 ++++++++++
 packages/react-navigation/src/views/Header/Header.js |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/react-navigation/flow/react-navigation.js b/packages/react-navigation/flow/react-navigation.js
index 9fd23f88..df4e7166 100644
--- a/packages/react-navigation/flow/react-navigation.js
+++ b/packages/react-navigation/flow/react-navigation.js
@@ -48,6 +48,15 @@ declare module 'react-navigation' {
   // react-native/Libraries/Animated/src/nodes/AnimatedValue.js
   declare type AnimatedValue = Object;
 
+  declare type HeaderForceInset = {
+    horizontal?: string,
+    vertical?: string,
+    left?: string,
+    right?: string,
+    top?: string,
+    bottom?: string,
+  };
+
   /**
    * Next, all the type declarations
    */
@@ -341,6 +350,7 @@ declare module 'react-navigation' {
     headerPressColorAndroid?: string,
     headerRight?: React$Node,
     headerStyle?: ViewStyleProp,
+    headerForceInset?: HeaderForceInset,
     headerBackground?: React$Node | React$ElementType,
     gesturesEnabled?: boolean,
     gestureResponseDistance?: { vertical?: number, horizontal?: number },
diff --git a/packages/react-navigation/src/views/Header/Header.js b/packages/react-navigation/src/views/Header/Header.js
index 8c8d5488..789bba67 100644
--- a/packages/react-navigation/src/views/Header/Header.js
+++ b/packages/react-navigation/src/views/Header/Header.js
@@ -473,11 +473,11 @@ class Header extends React.PureComponent {
       safeHeaderStyle,
     ];
 
+    const { headerForceInset } = options;
+    const forceInset = headerForceInset || { top: 'always', bottom: 'never' };
+
     return (
-      <SafeAreaView
-        forceInset={{ top: 'always', bottom: 'never' }}
-        style={containerStyles}
-      >
+      <SafeAreaView forceInset={forceInset} style={containerStyles}>
         <View style={StyleSheet.absoluteFill}>{options.headerBackground}</View>
         <View style={{ flex: 1 }}>{appBar}</View>
       </SafeAreaView>