fix: fix calculating default header height

react-navigation · Oct 8, 2019 · a21206f · a21206f
1 parent 15023fa
commit a21206f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 22 deletions.
diff --git a/src/views/Stack/Stack.tsx b/src/views/Stack/Stack.tsx
@@ -8,6 +8,7 @@ import {
   ViewProps,
 } from 'react-native';
 import { NavigationRoute } from 'react-navigation';
+import { EdgeInsets } from 'react-native-safe-area-context';
 import Animated from 'react-native-reanimated';
 import * as Screens from 'react-native-screens'; // Import with * as to prevent getters being called
 import { getDefaultHeaderHeight } from '../Header/HeaderSegment';
@@ -34,6 +35,7 @@ type ProgressValues = {
 
 type Props = {
   mode: 'card' | 'modal';
+  insets: EdgeInsets | null;
   navigation: NavigationStackProp;
   descriptors: SceneDescriptorMap;
   routes: NavigationRoute[];
@@ -111,10 +113,12 @@ const ANIMATED_ONE = new Animated.Value(1);
 
 const getFloatingHeaderHeights = (
   routes: NavigationRoute[],
+  insets: EdgeInsets | null,
   layout: Layout,
   previous: { [key: string]: number }
 ) => {
-  const defaultHeaderHeight = getDefaultHeaderHeight(layout);
+  const defaultHeaderHeight =
+    getDefaultHeaderHeight(layout) + (insets ? insets.top : 0);
 
   return routes.reduce(
     (acc, curr) => {
@@ -198,6 +202,7 @@ export default class Stack extends React.Component<Props, State> {
       descriptors: props.descriptors,
       floatingHeaderHeights: getFloatingHeaderHeights(
         props.routes,
+        props.insets,
         state.layout,
         state.floatingHeaderHeights
       ),
@@ -234,6 +239,7 @@ export default class Stack extends React.Component<Props, State> {
       layout,
       floatingHeaderHeights: getFloatingHeaderHeights(
         this.props.routes,
+        this.props.insets,
         layout,
         {}
       ),

diff --git a/src/views/Stack/StackView.tsx b/src/views/Stack/StackView.tsx
@@ -1,6 +1,9 @@
 import * as React from 'react';
 import { Platform } from 'react-native';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
+import {
+  SafeAreaProvider,
+  SafeAreaConsumer,
+} from 'react-native-safe-area-context';
 import { SceneView, StackActions, NavigationRoute } from 'react-navigation';
 import Stack from './Stack';
 import HeaderContainer, {
@@ -339,26 +342,31 @@ class StackView extends React.Component<Props, State> {
 
     return (
       <SafeAreaProvider>
-        <Stack
-          mode={mode}
-          getPreviousRoute={this.getPreviousRoute}
-          getGesturesEnabled={this.getGesturesEnabled}
-          routes={routes}
-          openingRoutesKeys={openingRouteKeys}
-          closingRoutesKeys={closingRouteKeys}
-          onGoBack={this.handleGoBack}
-          onOpenRoute={this.handleOpenRoute}
-          onCloseRoute={this.handleCloseRoute}
-          onPageChangeStart={onPageChangeStart}
-          onPageChangeConfirm={onPageChangeConfirm}
-          onPageChangeCancel={onPageChangeCancel}
-          renderHeader={this.renderHeader}
-          renderScene={this.renderScene}
-          headerMode={headerMode}
-          navigation={navigation}
-          descriptors={descriptors}
-          {...config}
-        />
+        <SafeAreaConsumer>
+          {insets => (
+            <Stack
+              mode={mode}
+              insets={insets}
+              getPreviousRoute={this.getPreviousRoute}
+              getGesturesEnabled={this.getGesturesEnabled}
+              routes={routes}
+              openingRoutesKeys={openingRouteKeys}
+              closingRoutesKeys={closingRouteKeys}
+              onGoBack={this.handleGoBack}
+              onOpenRoute={this.handleOpenRoute}
+              onCloseRoute={this.handleCloseRoute}
+              onPageChangeStart={onPageChangeStart}
+              onPageChangeConfirm={onPageChangeConfirm}
+              onPageChangeCancel={onPageChangeCancel}
+              renderHeader={this.renderHeader}
+              renderScene={this.renderScene}
+              headerMode={headerMode}
+              navigation={navigation}
+              descriptors={descriptors}
+              {...config}
+            />
+          )}
+        </SafeAreaConsumer>
       </SafeAreaProvider>
     );
   }