chore: release 4.0.9

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation",
-  "version": "4.0.6",
+  "version": "4.0.9",
   "description": "Routing and navigation for your React Native apps",
   "main": "src/react-navigation.js",
   "types": "typescript/react-navigation.d.ts",

typescript/react-navigation.d.ts

@@ -164,9 +164,13 @@ declare module 'react-navigation' {
       params?: NavigationParams;
     };
 
-    getComponentForRouteName: (routeName: string) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
+    getComponentForRouteName: (
+      routeName: string
+    ) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
 
-    getComponentForState: (state: State) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
+    getComponentForState: (
+      state: State
+    ) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
 
     getActionCreators: (
       route: NavigationRoute,
@@ -186,20 +190,36 @@ declare module 'react-navigation' {
     getScreenOptions: NavigationScreenOptionsGetter<Options>;
   }
 
-  export type NavigationScreenComponent<Options, NavigationScreenPropType> = React.ComponentType<any> & {
-    navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
+  export type NavigationScreenComponent<
+    Options,
+    NavigationScreenPropType
+  > = React.ComponentType<any> & {
+    navigationOptions?: NavigationScreenConfig<
+      Options,
+      NavigationScreenPropType
+    >;
   };
 
-  export interface NavigationScreenConfigProps<NavigationScreenPropType> {
+  export interface NavigationScreenConfigProps<
+    NavigationScreenPropType,
+    ScreenProps = unknown
+  > {
     navigation: NavigationScreenPropType;
-    screenProps: unknown;
+    screenProps: ScreenProps;
     theme: SupportedThemes;
   }
 
-  export type NavigationScreenConfig<Options, NavigationScreenPropType> =
+  export type NavigationScreenConfig<
+    Options,
+    NavigationScreenPropType,
+    ScreenProps = unknown
+  > =
     | Options
     | ((
-        navigationOptionsContainer: NavigationScreenConfigProps<NavigationScreenPropType> & {
+        navigationOptionsContainer: NavigationScreenConfigProps<
+          NavigationScreenPropType,
+          ScreenProps
+        > & {
           navigationOptions: Options;
         }
       ) => Options);
@@ -208,7 +228,10 @@ declare module 'react-navigation' {
     | NavigationScreenComponent<Options, NavigationPropType>
     | NavigationNavigator<Options, NavigationPropType>;
 
-  export type NavigationNavigator<Options, NavigationPropType> = React.ComponentType<NavigationNavigatorProps<Options>> & {
+  export type NavigationNavigator<
+    Options,
+    NavigationPropType
+  > = React.ComponentType<NavigationNavigatorProps<Options>> & {
     router: NavigationRouter<Options>;
     navigationOptions?: NavigationScreenConfig<Options, NavigationPropType>;
   };
@@ -399,6 +422,33 @@ declare module 'react-navigation' {
     config?: NavigationSwitchRouterConfig
   ): NavigationRouter<any, any>;
 
+  export type NavigationSwitchProp<
+    State = NavigationRoute,
+    Params = NavigationParams
+  > = NavigationScreenProp<State, Params> & {
+    jumpTo(routeName: string, key?: string): void;
+  };
+
+  export type NavigationSwitchScreenProps<
+    Params = NavigationParams,
+    ScreenProps = unknown
+  > = {
+    theme: SupportedThemes;
+    navigation: NavigationSwitchProp<NavigationRoute, Params>;
+    screenProps: ScreenProps;
+  };
+
+  export type NavigationSwitchScreenComponent<
+    Params = NavigationParams,
+    ScreenProps = unknown
+  > = React.ComponentType<NavigationSwitchScreenProps<Params, ScreenProps>> & {
+    navigationOptions?: NavigationScreenConfig<
+      {},
+      NavigationSwitchProp<NavigationRoute, Params>,
+      ScreenProps
+    >;
+  };
+
   export type NavigationStackAction =
     | NavigationInitAction
     | NavigationNavigateAction
@@ -437,9 +487,17 @@ declare module 'react-navigation' {
     | NavigationComponent<Options, NavigationScreenPropType>
     | (
         | { screen: NavigationComponent<Options, NavigationScreenPropType> }
-        | { getScreen(): NavigationScreenComponent<Options, NavigationScreenPropType> }) & {
-        navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
-        params?: { [key: string]: any }
+        | {
+            getScreen(): NavigationScreenComponent<
+              Options,
+              NavigationScreenPropType
+            >;
+          }) & {
+        navigationOptions?: NavigationScreenConfig<
+          Options,
+          NavigationScreenPropType
+        >;
+        params?: { [key: string]: any };
         path?: string;
       };
 
@@ -458,7 +516,10 @@ declare module 'react-navigation' {
   }
 
   export interface NavigationRouteConfigMap<Options, NavigationScreenPropType> {
-    [routeName: string]: NavigationRouteConfig<Options, NavigationScreenPropType>;
+    [routeName: string]: NavigationRouteConfig<
+      Options,
+      NavigationScreenPropType
+    >;
   }
 
   export type NavigationDispatch = (action: NavigationAction) => boolean;
@@ -542,12 +603,16 @@ declare module 'react-navigation' {
     dangerouslyGetParent: () => NavigationScreenProp<S> | undefined;
   }
 
-  export interface NavigationNavigatorProps<O = {}, S = {}> {
+  export interface NavigationNavigatorProps<
+    Options = {},
+    State = {},
+    ScreenProps = unknown
+  > {
     theme?: SupportedThemes | 'no-preference';
     detached?: boolean;
-    navigation?: NavigationProp<S>;
-    screenProps?: unknown;
-    navigationOptions?: O;
+    navigation?: NavigationProp<State>;
+    screenProps?: ScreenProps;
+    navigationOptions?: Options;
   }
 
   export type NavigatorType =
@@ -555,7 +620,11 @@ declare module 'react-navigation' {
     | 'react-navigation/TABS'
     | 'react-navigation/DRAWER';
 
-  export interface NavigationContainerProps<S = {}, O = {}> {
+  export interface NavigationContainerProps<
+    State = {},
+    Options = {},
+    ScreenProps = unknown
+  > {
     uriPrefix?: string | RegExp;
     /**
      * Controls whether the navigation container handles URLs opened via 'Linking'
@@ -568,7 +637,7 @@ declare module 'react-navigation' {
       nextNavigationState: NavigationState,
       action: NavigationAction
     ) => void | null | undefined;
-    navigation?: NavigationScreenProp<S>;
+    navigation?: NavigationScreenProp<State>;
     /*
      * This prop is no longer supported. Use `loadNavigationState` and
      * `persistNavigationState` instead.
@@ -579,8 +648,8 @@ declare module 'react-navigation' {
     persistNavigationState?: (state: NavigationState) => Promise<any>;
 
     renderLoadingExperimental?: React.ComponentType;
-    screenProps?: unknown;
-    navigationOptions?: O;
+    screenProps?: ScreenProps;
+    navigationOptions?: Options;
     style?: StyleProp<ViewStyle>;
   }
 
@@ -606,19 +675,14 @@ declare module 'react-navigation' {
     state: { nav: NavigationState | null };
   }
 
-  export interface SwitchNavigatorConfig {
-    initialRouteName: string;
-    resetOnBlur?: boolean;
-    paths?: NavigationPathsConfig;
-    backBehavior?: 'none' | 'initialRoute';
-  }
-
-  // Return createNavigationContainer
-  export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
-
   export function createSwitchNavigator(
-    routeConfigMap: NavigationRouteConfigMap<SwitchNavigatorConfig, NavigationScreenProp<NavigationRoute>>,
-    switchConfig?: SwitchNavigatorConfig
+    routeConfigMap: NavigationRouteConfigMap<{}, NavigationSwitchProp>,
+    switchConfig?: CreateNavigatorConfig<
+      {},
+      NavigationSwitchRouterConfig,
+      {},
+      NavigationSwitchProp
+    >
   ): NavigationNavigator<{}, NavigationProp<NavigationState>>;
 
   /**
@@ -738,18 +802,34 @@ declare module 'react-navigation' {
     getComponent: () => React.ComponentType;
   }
 
-  export type NavigationView<O, S> = React.ComponentType<
+  export type NavigationView<
+    Options,
+    State,
+    ScreenProps = unknown
+  > = React.ComponentType<
     {
       descriptors: { [key: string]: NavigationDescriptor };
-      navigationConfig: O;
-      screenProps?: unknown;
+      navigationConfig: Options;
+      screenProps?: ScreenProps;
     } & NavigationInjectedProps
   >;
 
-  export type CreateNavigatorConfig<NavigatorConfig, RouterConfig, Options, NavigationScreenPropType> = NavigatorConfig & RouterConfig & {
-    defaultNavigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
-    navigationOptions?: NavigationScreenConfig<{ [key: string]: any }, NavigationScreenProp<NavigationRoute>>;
-  }
+  export type CreateNavigatorConfig<
+    NavigatorConfig,
+    RouterConfig,
+    Options,
+    NavigationScreenPropType
+  > = NavigatorConfig &
+    RouterConfig & {
+      defaultNavigationOptions?: NavigationScreenConfig<
+        Options,
+        NavigationScreenPropType
+      >;
+      navigationOptions?: NavigationScreenConfig<
+        { [key: string]: any },
+        NavigationScreenProp<NavigationRoute>
+      >;
+    };
 
   export function createNavigator<S, Options>(
     view: NavigationView<Options, S>,
@@ -779,28 +859,6 @@ declare module 'react-navigation' {
     Component: NavigationNavigator<Options, NavigationPropType>
   ): NavigationContainer;
 
-  /**
-   * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
-   */
-
-  /**
-   * BEGIN CUSTOM CONVENIENCE INTERFACES
-   */
-
-  export interface NavigationScreenProps<
-    Params = NavigationParams,
-    Options = {},
-    NavigationScreenPropType = NavigationScreenProp<NavigationRoute>
-  > {
-    navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
-    screenProps?: unknown;
-    navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
-  }
-
-  /**
-   * END CUSTOM CONVENIENCE INTERFACES
-   */
-
   export type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
 
   export type InferProps<