fix: fix types for navigationConfig

closes #211, #222
react-navigation · Sep 30, 2019 · 1fc659d · 1fc659d
1 parent 5cbb835
commit 1fc659d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/src/types.tsx b/src/types.tsx
@@ -66,7 +66,7 @@ export type HeaderLayoutPreset = 'left' | 'center';
 
 export type HeaderTransitionPreset = 'fade-in-place' | 'uikit';
 
-export type HeaderBackgroundTransitionPreset = 'translate' | 'fade';
+export type HeaderBackgroundTransitionPreset = 'translate' | 'fade' | 'toggle';
 
 export type HeaderProps = {
   mode: HeaderMode;
@@ -142,15 +142,17 @@ export type NavigationStackConfig = {
   headerBackgroundTransitionPreset?: HeaderBackgroundTransitionPreset;
   headerBackTitleVisible?: boolean;
   disableKeyboardHandling?: boolean;
+  transparentCard?: boolean;
   cardShadowEnabled?: boolean;
   cardOverlayEnabled?: boolean;
+  cardStyle?: StyleProp<ViewStyle>;
   onTransitionStart?: () => void;
   onTransitionEnd?: () => void;
   transitionConfig?: (
     transitionProps: TransitionProps,
     prevTransitionProps?: TransitionProps,
     isModal?: boolean
-  ) => HeaderTransitionConfig;
+  ) => TransitionConfig;
 };
 
 export type NavigationStackScreenProps<

diff --git a/src/views/StackView/StackView.tsx b/src/views/StackView/StackView.tsx
@@ -103,7 +103,7 @@ class StackView extends React.Component<Props> {
     return (
       <StackViewLayout
         {...navigationConfig}
-        shadowEnabled={this.getShadowEnabled()}
+        cardShadowEnabled={this.getShadowEnabled()}
         cardOverlayEnabled={this.getCardOverlayEnabled()}
         onGestureBegin={this.props.onGestureBegin}
         onGestureCanceled={this.props.onGestureCanceled}

diff --git a/src/views/StackView/StackViewLayout.tsx b/src/views/StackView/StackViewLayout.tsx
@@ -7,7 +7,6 @@ import {
   I18nManager,
   Easing,
   Dimensions,
-  StyleProp,
   ViewStyle,
   LayoutChangeEvent,
 } from 'react-native';
@@ -42,27 +41,18 @@ import {
   TransitionConfig,
   HeaderTransitionConfig,
   HeaderProps,
+  NavigationStackConfig,
 } from '../../types';
 
-type Props = {
-  mode?: 'modal' | 'card';
-  headerMode?: 'screen' | 'float' | 'none';
-  headerLayoutPreset?: 'left' | 'center';
-  headerTransitionPreset?: 'fade-in-place' | 'uikit';
-  headerBackgroundTransitionPreset?: 'fade' | 'translate' | 'toggle';
-  headerBackTitleVisible?: boolean;
+type Props = NavigationStackConfig & {
   isLandscape: boolean;
-  shadowEnabled?: boolean;
-  cardOverlayEnabled?: boolean;
-  transparentCard?: boolean;
-  cardStyle?: StyleProp<ViewStyle>;
   transitionProps: TransitionProps;
   lastTransitionProps?: TransitionProps;
   transitionConfig?: (
     transitionProps: TransitionProps,
     prevTransitionProps?: TransitionProps,
     isModal?: boolean
-  ) => HeaderTransitionConfig;
+  ) => TransitionConfig;
   onGestureBegin?: () => void;
   onGestureEnd?: () => void;
   onGestureCanceled?: () => void;
@@ -137,6 +127,7 @@ const getDefaultHeaderHeight = (isLandscape: boolean) => {
 
 class StackViewLayout extends React.Component<Props, State> {
   static contextType = ThemeContext;
+
   context!: React.ContextType<typeof ThemeContext>;
 
   private panGestureRef: React.RefObject<PanGestureHandler>;
@@ -945,7 +936,7 @@ class StackViewLayout extends React.Component<Props, State> {
   private renderCard = (scene: Scene) => {
     const {
       transitionProps,
-      shadowEnabled,
+      cardShadowEnabled,
       cardOverlayEnabled,
       transparentCard,
       cardStyle,
@@ -956,7 +947,7 @@ class StackViewLayout extends React.Component<Props, State> {
       screenInterpolator &&
       screenInterpolator({
         ...transitionProps,
-        shadowEnabled,
+        shadowEnabled: cardShadowEnabled,
         cardOverlayEnabled,
         position: this.position,
         scene,