From ae4c0b8a35b0ca709d1a3345dd107074717ffc68 Mon Sep 17 00:00:00 2001 From: Eric Vicenti Date: Mon, 15 Oct 2018 12:30:43 -0700 Subject: [PATCH] move to react-nav core and native deps --- packages/drawer/src/navigators/createDrawerNavigator.js | 9 +++------ packages/drawer/src/views/DrawerNavigatorItems.js | 2 +- packages/drawer/src/views/DrawerSidebar.js | 2 +- packages/drawer/src/views/DrawerView.js | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/drawer/src/navigators/createDrawerNavigator.js b/packages/drawer/src/navigators/createDrawerNavigator.js index 0fe989ef..b80ed23c 100644 --- a/packages/drawer/src/navigators/createDrawerNavigator.js +++ b/packages/drawer/src/navigators/createDrawerNavigator.js @@ -1,10 +1,7 @@ import React from 'react'; import { Dimensions, Platform, ScrollView } from 'react-native'; -import { - createNavigator, - createNavigationContainer, - SafeAreaView, -} from 'react-navigation'; +import { createNavigator } from '@react-navigation/core'; +import { SafeAreaView } from '@react-navigation/native'; import DrawerRouter from '../routers/DrawerRouter'; import DrawerView from '../views/DrawerView'; import DrawerItems from '../views/DrawerNavigatorItems'; @@ -51,7 +48,7 @@ const DrawerNavigator = (routeConfigs, config = {}) => { const mergedConfig = { ...DefaultDrawerConfig, ...config }; const drawerRouter = DrawerRouter(routeConfigs, mergedConfig); const navigator = createNavigator(DrawerView, drawerRouter, mergedConfig); - return createNavigationContainer(navigator); + return navigator; }; export default DrawerNavigator; diff --git a/packages/drawer/src/views/DrawerNavigatorItems.js b/packages/drawer/src/views/DrawerNavigatorItems.js index c2181e94..d203cb00 100644 --- a/packages/drawer/src/views/DrawerNavigatorItems.js +++ b/packages/drawer/src/views/DrawerNavigatorItems.js @@ -1,6 +1,6 @@ import React from 'react'; import { View, Text, StyleSheet } from 'react-native'; -import { SafeAreaView } from 'react-navigation'; +import { SafeAreaView } from '@react-navigation/native'; import TouchableItem from './TouchableItem'; /** diff --git a/packages/drawer/src/views/DrawerSidebar.js b/packages/drawer/src/views/DrawerSidebar.js index 56943614..bbd2e3e5 100644 --- a/packages/drawer/src/views/DrawerSidebar.js +++ b/packages/drawer/src/views/DrawerSidebar.js @@ -1,7 +1,7 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { NavigationActions, StackActions } from 'react-navigation'; +import { NavigationActions, StackActions } from '@react-navigation/core'; import invariant from '../utils/invariant'; /** diff --git a/packages/drawer/src/views/DrawerView.js b/packages/drawer/src/views/DrawerView.js index 811b9745..ea41dc15 100644 --- a/packages/drawer/src/views/DrawerView.js +++ b/packages/drawer/src/views/DrawerView.js @@ -1,6 +1,6 @@ import React from 'react'; import { Dimensions } from 'react-native'; -import { SceneView } from 'react-navigation'; +import { SceneView } from '@react-navigation/core'; import DrawerActions from '../routers/DrawerActions'; import DrawerLayout from './DrawerLayout'; import DrawerSidebar from './DrawerSidebar';