fix: make headerShown option work

react-navigation · Oct 20, 2019 · 84e9244 · 84e9244
1 parent 452638a
commit 84e9244
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/views/Header/HeaderStyleInterpolator.tsx b/src/views/Header/HeaderStyleInterpolator.tsx
@@ -6,8 +6,9 @@ function hasHeader(scene: Scene) {
   if (!scene) {
     return true;
   }
-  const { descriptor } = scene;
-  return descriptor.options.header !== null;
+  const { header, headerShown } = scene.descriptor.options;
+
+  return header !== null && headerShown !== false;
 }
 
 const crossFadeInterpolation = (

diff --git a/src/views/StackView/StackViewLayout.tsx b/src/views/StackView/StackViewLayout.tsx
@@ -956,7 +956,7 @@ class StackViewLayout extends React.Component<Props, State> {
     // When using a floating header, we need to add some top
     // padding on the scene.
     const { options } = scene.descriptor;
-    const hasHeader = options.header !== null;
+    const hasHeader = options.header !== null && options.headerShown !== false;
     const headerMode = this.getHeaderMode();
 
     let floatingContainerStyle: ViewStyle = StyleSheet.absoluteFill as ViewStyle;