chore: release 4.0.4

example/src/SimpleStack.tsx

@@ -21,7 +21,8 @@ import SampleText from './SampleText';
 const DEBUG = false;
 
 interface MyNavScreenProps {
-  navigation: NavigationScreenProp<NavigationState>;
+  // TODO: satya164 - use stack's navigation type
+  navigation: any;
   banner: React.ReactNode;
 }
 
@@ -144,8 +145,10 @@ class MyHomeScreen extends React.Component<MyHomeScreenProps> {
 }
 
 interface MyPhotosScreenProps {
-  navigation: NavigationScreenProp<NavigationState>;
+  // TODO: satya164 - use stack's navigation type
+  navigation: any;
 }
+
 class MyPhotosScreen extends React.Component<MyPhotosScreenProps> {
   static navigationOptions = {
     headerLeft: () => <MyBackButtonWithNavigation />,

example/src/StackWithCustomHeaderBackImage.tsx

@@ -124,7 +124,10 @@ const StackWithCustomHeaderBackImage = createStackNavigator(
     },
   },
   {
-    defaultNavigationOptions: ({ theme }: NavigationScreenConfigProps) => ({
+    // TODO: satya164 - use stack's navigation type
+    defaultNavigationOptions: ({
+      theme,
+    }: NavigationScreenConfigProps<any>) => ({
       headerBackImage: (
         <MyCustomHeaderBackImage
           style={[

example/src/StackWithHeaderPreset.tsx

@@ -1,16 +1,12 @@
 import * as React from 'react';
-import {
-  NavigationScreenProp,
-  NavigationState,
-  SafeAreaView,
-  Themed,
-} from 'react-navigation';
+import { SafeAreaView, Themed } from 'react-navigation';
 import { createStackNavigator } from 'react-navigation-stack';
 
 import { Button } from './commonComponents/ButtonWithMargin';
 
 interface NavScreenProps {
-  navigation: NavigationScreenProp<NavigationState>;
+  // TODO: satya164 - use stack's navigation type
+  navigation: any;
 }
 
 class HomeScreen extends React.Component<NavScreenProps> {

example/src/StackWithTranslucentHeader.tsx

@@ -20,7 +20,8 @@ import { HeaderButtons } from './commonComponents/HeaderButtons';
 import SampleText from './SampleText';
 
 interface MyNavScreenProps {
-  navigation: NavigationScreenProp<NavigationState>;
+  // TODO: satya164 - use stack's navigation type
+  navigation: any;
   banner: React.ReactNode;
 }
 
@@ -226,7 +227,7 @@ const StackWithTranslucentHeader = createStackNavigator(
     },
   },
   {
-    defaultNavigationOptions: ({ theme }) => ({
+    defaultNavigationOptions: ({ theme }: { theme: SupportedThemes }) => ({
       headerBackground:
         Platform.OS === 'ios' ? (
           <BlurView

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation",
-  "version": "4.0.1",
+  "version": "4.0.4",
   "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

@@ -81,7 +81,7 @@ declare module 'react-navigation' {
     routes: NavigationRoute[];
     isTransitioning: boolean;
     key: string;
-    params: NavigationParams | undefined;
+    params?: NavigationParams | undefined;
   }
 
   export interface DrawerNavigationState extends NavigationState {
@@ -164,9 +164,9 @@ declare module 'react-navigation' {
       params?: NavigationParams;
     };
 
-    getComponentForRouteName: (routeName: string) => NavigationComponent;
+    getComponentForRouteName: (routeName: string) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
 
-    getComponentForState: (state: State) => NavigationComponent;
+    getComponentForState: (state: State) => NavigationComponent<{}, NavigationScreenProp<NavigationRoute>>;
 
     getActionCreators: (
       route: NavigationRoute,
@@ -186,50 +186,31 @@ declare module 'react-navigation' {
     getScreenOptions: NavigationScreenOptionsGetter<Options>;
   }
 
-  export type NavigationScreenOption<T> =
-    | T
-    | ((navigation: NavigationScreenProp<NavigationRoute>, config: T) => T);
+  export type NavigationScreenComponent<Options, NavigationScreenPropType> = React.ComponentType<any> & {
+    navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
+  };
 
-  export interface NavigationScreenDetails<T> {
-    options: T;
-    state: NavigationRoute;
-    navigation: NavigationScreenProp<NavigationRoute>;
-  }
-
-  export interface NavigationScreenConfigProps {
-    navigation: NavigationScreenProp<NavigationRoute>;
+  export interface NavigationScreenConfigProps<NavigationScreenPropType> {
+    navigation: NavigationScreenPropType;
     screenProps: unknown;
     theme: SupportedThemes;
   }
 
-  export type NavigationScreenConfig<Options> =
+  export type NavigationScreenConfig<Options, NavigationScreenPropType> =
     | Options
     | ((
-        navigationOptionsContainer: NavigationScreenConfigProps & {
-          navigationOptions: NavigationScreenConfig<Options>;
+        navigationOptionsContainer: NavigationScreenConfigProps<NavigationScreenPropType> & {
+          navigationOptions: Options;
         }
       ) => Options);
 
-  export type NavigationComponent =
-    | NavigationScreenComponent<NavigationParams, any, any>
-    | NavigationNavigator<any, any, any>
-    | any;
+  export type NavigationComponent<Options, NavigationPropType> =
+    | NavigationScreenComponent<Options, NavigationPropType>
+    | NavigationNavigator<Options, NavigationPropType>;
 
-  export type NavigationScreenComponent<
-    Params = NavigationParams,
-    Options = {},
-    Props = {}
-  > = React.ComponentType<Navigationunknown<Params, Options> & Props> & {
-    navigationOptions?: NavigationScreenConfig<Options>;
-  };
-
-  export type NavigationNavigator<
-    State = NavigationState,
-    Options = {},
-    Props = {}
-  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
-    router: NavigationRouter<State, Options>;
-    navigationOptions?: NavigationScreenConfig<Options>;
+  export type NavigationNavigator<Options, NavigationPropType> = React.ComponentType<NavigationNavigatorProps<Options>> & {
+    router: NavigationRouter<Options>;
+    navigationOptions?: NavigationScreenConfig<Options, NavigationPropType>;
   };
 
   export interface NavigationParams {
@@ -414,7 +395,7 @@ declare module 'react-navigation' {
   }
 
   export function SwitchRouter(
-    routeConfigs: NavigationRouteConfigMap,
+    routeConfigs: NavigationRouteConfigMap<any, any>,
     config?: NavigationSwitchRouterConfig
   ): NavigationRouter<any, any>;
 
@@ -452,20 +433,14 @@ declare module 'react-navigation' {
     | NavigationSwitchAction
     | { type: 'CHILD_ACTION'; key?: string };
 
-  export type NavigationRouteConfig =
-    | NavigationComponent
-    | ({
-        navigationOptions?: NavigationScreenConfig<any>;
+  export type NavigationRouteConfig<Options, NavigationScreenPropType> =
+    | NavigationComponent<Options, NavigationScreenPropType>
+    | (
+        | { screen: NavigationComponent<Options, NavigationScreenPropType> }
+        | { getScreen(): NavigationScreenComponent<Options, NavigationScreenPropType> }) & {
+        navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
+        params?: { [key: string]: any }
         path?: string;
-      } & NavigationScreenRouteConfig);
-
-  export type NavigationScreenRouteConfig =
-    | NavigationComponent
-    | {
-        screen: NavigationComponent;
-      }
-    | {
-        getScreen: () => NavigationComponent;
       };
 
   export interface NavigationPathsConfig {
@@ -473,7 +448,7 @@ declare module 'react-navigation' {
   }
 
   // tslint:disable-next-line:strict-export-declare-modifiers
-  interface NavigationTabRouterConfig {
+  export interface NavigationTabRouterConfig {
     initialRouteName?: string;
     initialRouteParams?: NavigationParams;
     paths?: NavigationPathsConfig;
@@ -482,8 +457,8 @@ declare module 'react-navigation' {
     resetOnBlur?: boolean;
   }
 
-  export interface NavigationRouteConfigMap {
-    [routeName: string]: NavigationRouteConfig;
+  export interface NavigationRouteConfigMap<Options, NavigationScreenPropType> {
+    [routeName: string]: NavigationRouteConfig<Options, NavigationScreenPropType>;
   }
 
   export type NavigationDispatch = (action: NavigationAction) => boolean;
@@ -516,7 +491,6 @@ declare module 'react-navigation' {
   }
 
   export interface NavigationEventsProps extends ViewProps {
-    navigation?: NavigationNavigator;
     onWillFocus?: NavigationEventCallback;
     onDidFocus?: NavigationEventCallback;
     onWillBlur?: NavigationEventCallback;
@@ -557,23 +531,11 @@ declare module 'react-navigation' {
     ): NonNullable<P[T]>;
     getParam<T extends keyof P>(param: T): P[T];
     setParams: (newParams: Partial<P>) => boolean;
+    emit: (eventName: 'refocus') => void;
     addListener: (
-      eventName: 'willBlur' | 'willFocus' | 'didFocus' | 'didBlur',
+      eventName: string,
       callback: NavigationEventCallback
     ) => NavigationEventSubscription;
-    push: (
-      routeName: string,
-      params?: NavigationParams,
-      action?: NavigationNavigateAction
-    ) => boolean;
-    replace: (
-      routeName: string,
-      params?: NavigationParams,
-      action?: NavigationNavigateAction
-    ) => boolean;
-    reset: (actions: NavigationAction[], index: number) => boolean;
-    pop: (n?: number, params?: { immediate?: boolean }) => boolean;
-    popToTop: (params?: { immediate?: boolean }) => boolean;
     isFocused: () => boolean;
     isFirstRouteInParent: () => boolean;
     router?: NavigationRouter;
@@ -655,7 +617,7 @@ declare module 'react-navigation' {
   export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
 
   export function createSwitchNavigator(
-    routeConfigMap: NavigationRouteConfigMap,
+    routeConfigMap: NavigationRouteConfigMap<SwitchNavigatorConfig, NavigationScreenProp<NavigationRoute>>,
     switchConfig?: SwitchNavigatorConfig
   ): NavigationContainer;
 
@@ -738,7 +700,7 @@ declare module 'react-navigation' {
    * @desc from react-navigation/src/routers/TabRouter.js
    */
   export function TabRouter(
-    routeConfigs: NavigationRouteConfigMap,
+    routeConfigs: NavigationRouteConfigMap<any, any>,
     config: NavigationTabRouterConfig
   ): NavigationRouter<any, any>;
 
@@ -748,7 +710,7 @@ declare module 'react-navigation' {
    * @desc from react-navigation/src/routers/StackRouter.js
    */
   export function StackRouter(
-    routeConfigs: NavigationRouteConfigMap,
+    routeConfigs: NavigationRouteConfigMap<any, any>,
     config?: NavigationTabRouterConfig
   ): NavigationRouter<any, any>;
 
@@ -766,11 +728,12 @@ declare module 'react-navigation' {
    */
   export interface NavigationDescriptor<
     Params = NavigationParams,
-    Options = {}
+    Options = {},
+    NavigationScreenPropType = NavigationScreenProp<NavigationRoute>
   > {
     key: string;
     state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
-    navigation: NavigationScreenProp<any>;
+    navigation: NavigationScreenPropType;
     options: Options;
     getComponent: () => React.ComponentType;
   }
@@ -783,6 +746,11 @@ declare module 'react-navigation' {
     } & NavigationInjectedProps
   >;
 
+  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>,
     router: NavigationRouter<S, Options>,
@@ -798,8 +766,8 @@ declare module 'react-navigation' {
    *
    * @see https://github.com/react-navigation/react-navigation/blob/master/src/createNavigationContainer.js
    */
-  export function createNavigationContainer(
-    Component: NavigationNavigator<any, any, any>
+  export function createNavigationContainer<Options, NavigationPropType>(
+    Component: NavigationNavigator<Options, NavigationPropType>
   ): NavigationContainer;
 
   /**
@@ -807,8 +775,8 @@ declare module 'react-navigation' {
    *
    * @see https://github.com/react-navigation/react-navigation-native/blob/098e2e52b349d37357109d5aee545fa74699d3d4/src/createAppContainer.js#L64
    */
-  export function createAppContainer(
-    Component: NavigationNavigator<any, any, any>
+  export function createAppContainer<Options, NavigationPropType>(
+    Component: NavigationNavigator<Options, NavigationPropType>
   ): NavigationContainer;
 
   /**
@@ -819,13 +787,14 @@ declare module 'react-navigation' {
    * BEGIN CUSTOM CONVENIENCE INTERFACES
    */
 
-  export interface Navigationunknown<
+  export interface NavigationScreenProps<
     Params = NavigationParams,
-    Options = any
+    Options = {},
+    NavigationScreenPropType = NavigationScreenProp<NavigationRoute>
   > {
     navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
     screenProps?: unknown;
-    navigationOptions?: NavigationScreenConfig<Options>;
+    navigationOptions?: NavigationScreenConfig<Options, NavigationScreenPropType>;
   }
 
   /**