From b0c0de0a559025254302cafaaf7032a258cb77c2 Mon Sep 17 00:00:00 2001 From: tkow Date: Tue, 5 Mar 2019 13:00:57 +0900 Subject: [PATCH 1/2] remove deprecated methods --- types/react-navigation/index.d.ts | 23 ------------------- .../react-navigation-tests.tsx | 15 ------------ 2 files changed, 38 deletions(-) diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts index f2b0b968fb..9b2aee84e2 100644 --- a/types/react-navigation/index.d.ts +++ b/types/react-navigation/index.d.ts @@ -872,10 +872,6 @@ export interface StackNavigatorConfig } // Return createNavigationContainer -export function StackNavigator( - routeConfigMap: NavigationRouteConfigMap, - stackConfig?: StackNavigatorConfig -): NavigationContainer; export function createStackNavigator( routeConfigMap: NavigationRouteConfigMap, @@ -892,11 +888,6 @@ export interface SwitchNavigatorConfig { // Return createNavigationContainer export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig; -export function SwitchNavigator( - routeConfigMap: NavigationRouteConfigMap, - switchConfig?: SwitchNavigatorConfig -): NavigationContainer; - export function createSwitchNavigator( routeConfigMap: NavigationRouteConfigMap, switchConfig?: SwitchNavigatorConfig @@ -962,11 +953,6 @@ export interface DrawerNavigatorConfig drawerLockMode?: DrawerLockMode; } -export function DrawerNavigator( - routeConfigMap: NavigationRouteConfigMap, - drawerConfig?: DrawerNavigatorConfig -): NavigationContainer; - export function createDrawerNavigator( routeConfigMap: NavigationRouteConfigMap, drawerConfig?: DrawerNavigatorConfig @@ -1021,15 +1007,6 @@ export interface BottomTabNavigatorConfig } // From navigators/TabNavigator.js -export function TabNavigator( - routeConfigMap: NavigationRouteConfigMap, - drawConfig?: TabNavigatorConfig -): NavigationContainer; - -export function createTabNavigator( - routeConfigMap: NavigationRouteConfigMap, - drawConfig?: TabNavigatorConfig -): NavigationContainer; export function createBottomTabNavigator( routeConfigMap: NavigationRouteConfigMap, diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx index 777a8fa9f3..cf933d43ba 100644 --- a/types/react-navigation/react-navigation-tests.tsx +++ b/types/react-navigation/react-navigation-tests.tsx @@ -36,7 +36,6 @@ import { createSwitchNavigator, SwitchNavigatorConfig, TabBarTop, - createTabNavigator, TabNavigatorConfig, Transitioner, HeaderBackButton, @@ -245,20 +244,6 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = { }, }; -const BasicTabNavigator = createTabNavigator( - routeConfigMap, - tabNavigatorConfig, -); - -function renderBasicTabNavigator(): JSX.Element { - return ( - { }} - style={[viewStyle, undefined]} // Test that we are using StyleProp - /> - ); -} - /** * Stack navigator. */ From c018882991198c685b6c38741242bab5435839dc Mon Sep 17 00:00:00 2001 From: tkow Date: Tue, 5 Mar 2019 13:02:16 +0900 Subject: [PATCH 2/2] add createMaterialTopTabNavigator test --- types/react-navigation/react-navigation-tests.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx index cf933d43ba..2f7c65f9cd 100644 --- a/types/react-navigation/react-navigation-tests.tsx +++ b/types/react-navigation/react-navigation-tests.tsx @@ -36,6 +36,7 @@ import { createSwitchNavigator, SwitchNavigatorConfig, TabBarTop, + createMaterialTopTabNavigator, TabNavigatorConfig, Transitioner, HeaderBackButton, @@ -244,6 +245,20 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = { }, }; +const BasicTabNavigator = createMaterialTopTabNavigator( + routeConfigMap, + tabNavigatorConfig, +); + +function renderBasicTabNavigator(): JSX.Element { + return ( + { }} + style={[viewStyle, undefined]} // Test that we are using StyleProp + /> + ); +} + /** * Stack navigator. */