From eef17a801e30f2ea74dbec186f96660e65a2bb7a Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Wed, 11 Dec 2019 17:22:59 +0100 Subject: [PATCH] refactor: import from /native instead of /core --- README.md | 6 +++--- example/src/Screens/AuthFlow.tsx | 2 +- example/src/Screens/ModalPresentationStack.tsx | 2 +- example/src/Screens/NativeStack.tsx | 2 +- example/src/Screens/SimpleStack.tsx | 2 +- example/src/index.tsx | 4 +--- packages/bottom-tabs/README.md | 2 +- packages/bottom-tabs/package.json | 2 +- .../bottom-tabs/src/navigators/createBottomTabNavigator.tsx | 2 +- packages/bottom-tabs/src/types.tsx | 2 +- packages/bottom-tabs/src/views/BottomTabBar.tsx | 2 +- packages/bottom-tabs/src/views/BottomTabItem.tsx | 2 +- packages/bottom-tabs/src/views/TabBarIcon.tsx | 2 +- packages/compat/README.md | 2 +- packages/compat/package.json | 2 +- packages/compat/src/CompatScreen.tsx | 2 +- packages/compat/src/NavigationActions.tsx | 2 +- packages/compat/src/StackActions.tsx | 2 +- packages/compat/src/createCompatNavigationProp.tsx | 2 +- packages/compat/src/createCompatNavigatorFactory.tsx | 2 +- packages/compat/src/createSwitchNavigator.tsx | 2 +- packages/compat/src/types.tsx | 2 +- packages/compat/src/useCompatNavigation.tsx | 2 +- packages/compat/src/withNavigation.tsx | 2 +- packages/compat/src/withNavigationFocus.tsx | 2 +- packages/drawer/README.md | 2 +- packages/drawer/package.json | 2 +- packages/drawer/src/navigators/createDrawerNavigator.tsx | 2 +- packages/drawer/src/types.tsx | 2 +- packages/drawer/src/views/DrawerItemList.tsx | 2 +- packages/material-bottom-tabs/README.md | 2 +- packages/material-bottom-tabs/package.json | 2 +- .../src/navigators/createMaterialBottomTabNavigator.tsx | 2 +- packages/material-bottom-tabs/src/types.tsx | 2 +- .../src/views/MaterialBottomTabView.tsx | 2 +- packages/material-top-tabs/README.md | 2 +- packages/material-top-tabs/package.json | 2 +- .../src/navigators/createMaterialTopTabNavigator.tsx | 2 +- packages/material-top-tabs/src/types.tsx | 2 +- packages/material-top-tabs/src/views/MaterialTopTabBar.tsx | 2 +- packages/material-top-tabs/src/views/MaterialTopTabView.tsx | 2 +- packages/native-stack/README.md | 2 +- packages/native-stack/package.json | 2 +- .../src/navigators/createNativeStackNavigator.tsx | 2 +- packages/native-stack/src/types.tsx | 2 +- packages/native-stack/src/views/HeaderConfig.tsx | 2 +- packages/native/README.md | 2 +- packages/native/package.json | 4 +++- packages/native/src/index.tsx | 2 ++ packages/routers/README.md | 4 ++-- packages/routers/package.json | 4 +--- packages/stack/README.md | 2 +- packages/stack/package.json | 2 +- packages/stack/src/navigators/createStackNavigator.tsx | 2 +- packages/stack/src/types.tsx | 2 +- packages/stack/src/views/Header/HeaderContainer.tsx | 2 +- packages/stack/src/views/Header/HeaderSegment.tsx | 2 +- packages/stack/src/views/Stack/CardContainer.tsx | 2 +- packages/stack/src/views/Stack/CardStack.tsx | 2 +- packages/stack/src/views/Stack/StackView.tsx | 2 +- 60 files changed, 66 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 19c9168e..ee1cdc80 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Navigators bundle a router and a view which takes the navigation state and decid A simple navigator could look like this: ```js -import { createNavigatorFactory } from '@react-navigation/core'; +import { createNavigatorFactory } from '@react-navigation/native'; function StackNavigator({ initialRouteName, children, ...rest }) { // The `navigation` object contains the navigation state and some helpers (e.g. push, pop) @@ -256,7 +256,7 @@ Sometimes we want to run side-effects when a screen is focused. A side effect ma To make this easier, the library exports a `useFocusEffect` hook: ```js -import { useFocusEffect } from '@react-navigation/core'; +import { useFocusEffect } from '@react-navigation/native'; function Profile({ userId }) { const [user, setUser] = React.useState(null); @@ -285,7 +285,7 @@ The `useFocusEffect` is analogous to React's `useEffect` hook. The only differen We might want to render different content based on the current focus state of the screen. The library exports a `useIsFocused` hook to make this easier: ```js -import { useIsFocused } from '@react-navigation/core'; +import { useIsFocused } from '@react-navigation/native'; // ... diff --git a/example/src/Screens/AuthFlow.tsx b/example/src/Screens/AuthFlow.tsx index ca4f96ab..14f9a21b 100644 --- a/example/src/Screens/AuthFlow.tsx +++ b/example/src/Screens/AuthFlow.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View, TextInput, ActivityIndicator, StyleSheet } from 'react-native'; import { Title, Button } from 'react-native-paper'; -import { ParamListBase } from '@react-navigation/core'; +import { ParamListBase } from '@react-navigation/native'; import { createStackNavigator, HeaderBackButton, diff --git a/example/src/Screens/ModalPresentationStack.tsx b/example/src/Screens/ModalPresentationStack.tsx index ef92f4e1..4088958c 100644 --- a/example/src/Screens/ModalPresentationStack.tsx +++ b/example/src/Screens/ModalPresentationStack.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; import { Button } from 'react-native-paper'; import { useSafeArea } from 'react-native-safe-area-context'; -import { RouteProp, ParamListBase } from '@react-navigation/core'; +import { RouteProp, ParamListBase } from '@react-navigation/native'; import { createStackNavigator, StackNavigationProp, diff --git a/example/src/Screens/NativeStack.tsx b/example/src/Screens/NativeStack.tsx index 760bf7db..91a0497b 100644 --- a/example/src/Screens/NativeStack.tsx +++ b/example/src/Screens/NativeStack.tsx @@ -7,7 +7,7 @@ import { RouteProp, ParamListBase, useFocusEffect, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { DrawerNavigationProp } from '@react-navigation/drawer'; import { StackNavigationProp } from '@react-navigation/stack'; import { diff --git a/example/src/Screens/SimpleStack.tsx b/example/src/Screens/SimpleStack.tsx index a72ed313..7f2b8ca9 100644 --- a/example/src/Screens/SimpleStack.tsx +++ b/example/src/Screens/SimpleStack.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; import { Button } from 'react-native-paper'; -import { RouteProp, ParamListBase } from '@react-navigation/core'; +import { RouteProp, ParamListBase } from '@react-navigation/native'; import { createStackNavigator, StackNavigationProp, diff --git a/example/src/index.tsx b/example/src/index.tsx index a6c6cd4d..14bb8456 100644 --- a/example/src/index.tsx +++ b/example/src/index.tsx @@ -6,10 +6,8 @@ import { Asset } from 'expo-asset'; import { InitialState, getStateFromPath, - NavigationContainerRef, -} from '@react-navigation/core'; -import { useLinking, + NavigationContainerRef, NavigationNativeContainer, } from '@react-navigation/native'; import { diff --git a/packages/bottom-tabs/README.md b/packages/bottom-tabs/README.md index 35d171ae..39998f2a 100644 --- a/packages/bottom-tabs/README.md +++ b/packages/bottom-tabs/README.md @@ -7,7 +7,7 @@ Bottom tab navigator for React Navigation following iOS design guidelines. Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/bottom-tabs +yarn add @react-navigation/native @react-navigation/bottom-tabs ``` Now we need to install [`react-native-safe-area-context`](https://github.com/th3rdwave/react-native-safe-area-context). diff --git a/packages/bottom-tabs/package.json b/packages/bottom-tabs/package.json index af2e8ba3..d5f54831 100644 --- a/packages/bottom-tabs/package.json +++ b/packages/bottom-tabs/package.json @@ -46,7 +46,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-safe-area-context": "^0.3.6" diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx index ced941b1..39664a3a 100644 --- a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx +++ b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx @@ -3,7 +3,7 @@ import { useNavigationBuilder, createNavigatorFactory, DefaultNavigatorOptions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabRouter, TabRouterOptions, diff --git a/packages/bottom-tabs/src/types.tsx b/packages/bottom-tabs/src/types.tsx index d4db3a40..5e717cf2 100644 --- a/packages/bottom-tabs/src/types.tsx +++ b/packages/bottom-tabs/src/types.tsx @@ -10,7 +10,7 @@ import { NavigationProp, ParamListBase, Descriptor, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabNavigationState } from '@react-navigation/routers'; export type BottomTabNavigationEventMap = { diff --git a/packages/bottom-tabs/src/views/BottomTabBar.tsx b/packages/bottom-tabs/src/views/BottomTabBar.tsx index 8682d5cf..ac79c8a0 100644 --- a/packages/bottom-tabs/src/views/BottomTabBar.tsx +++ b/packages/bottom-tabs/src/views/BottomTabBar.tsx @@ -13,7 +13,7 @@ import { Route, NavigationContext, CommonActions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { SafeAreaConsumer } from 'react-native-safe-area-context'; import BottomTabItem from './BottomTabItem'; diff --git a/packages/bottom-tabs/src/views/BottomTabItem.tsx b/packages/bottom-tabs/src/views/BottomTabItem.tsx index 8fe883c3..bdeaa408 100644 --- a/packages/bottom-tabs/src/views/BottomTabItem.tsx +++ b/packages/bottom-tabs/src/views/BottomTabItem.tsx @@ -8,7 +8,7 @@ import { ViewStyle, TextStyle, } from 'react-native'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import TabBarIcon from './TabBarIcon'; import { BottomTabBarButtonProps } from '../types'; diff --git a/packages/bottom-tabs/src/views/TabBarIcon.tsx b/packages/bottom-tabs/src/views/TabBarIcon.tsx index 9977bdff..406cff7a 100644 --- a/packages/bottom-tabs/src/views/TabBarIcon.tsx +++ b/packages/bottom-tabs/src/views/TabBarIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; type Props = { route: Route; diff --git a/packages/compat/README.md b/packages/compat/README.md index 4329f994..a98ccb56 100644 --- a/packages/compat/README.md +++ b/packages/compat/README.md @@ -7,7 +7,7 @@ Compatibility layer to write navigator definitions in static configuration forma Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/compat +yarn add @react-navigation/native @react-navigation/compat ``` ## Usage diff --git a/packages/compat/package.json b/packages/compat/package.json index c8c4e9c0..45cf7ec5 100644 --- a/packages/compat/package.json +++ b/packages/compat/package.json @@ -32,7 +32,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "~16.9.0" }, "@react-native-community/bob": { diff --git a/packages/compat/src/CompatScreen.tsx b/packages/compat/src/CompatScreen.tsx index 5e31c379..8925ab48 100644 --- a/packages/compat/src/CompatScreen.tsx +++ b/packages/compat/src/CompatScreen.tsx @@ -3,7 +3,7 @@ import { NavigationProp, ParamListBase, RouteProp, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import ScreenPropsContext from './ScreenPropsContext'; import createCompatNavigationProp from './createCompatNavigationProp'; diff --git a/packages/compat/src/NavigationActions.tsx b/packages/compat/src/NavigationActions.tsx index 7387ff36..5e9222a5 100644 --- a/packages/compat/src/NavigationActions.tsx +++ b/packages/compat/src/NavigationActions.tsx @@ -1,4 +1,4 @@ -import { CommonActions, NavigationState } from '@react-navigation/core'; +import { CommonActions, NavigationState } from '@react-navigation/native'; export function navigate({ routeName, diff --git a/packages/compat/src/StackActions.tsx b/packages/compat/src/StackActions.tsx index f3f08c46..205eb3a0 100644 --- a/packages/compat/src/StackActions.tsx +++ b/packages/compat/src/StackActions.tsx @@ -1,4 +1,4 @@ -import { CommonActions } from '@react-navigation/core'; +import { CommonActions } from '@react-navigation/native'; import { StackActions, StackActionType } from '@react-navigation/routers'; export function reset(): CommonActions.Action { diff --git a/packages/compat/src/createCompatNavigationProp.tsx b/packages/compat/src/createCompatNavigationProp.tsx index 38fc3849..528a9225 100644 --- a/packages/compat/src/createCompatNavigationProp.tsx +++ b/packages/compat/src/createCompatNavigationProp.tsx @@ -4,7 +4,7 @@ import { ParamListBase, NavigationProp, RouteProp, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import * as helpers from './helpers'; import { CompatNavigationProp } from './types'; diff --git a/packages/compat/src/createCompatNavigatorFactory.tsx b/packages/compat/src/createCompatNavigatorFactory.tsx index c167bf4b..fe9841c6 100644 --- a/packages/compat/src/createCompatNavigatorFactory.tsx +++ b/packages/compat/src/createCompatNavigatorFactory.tsx @@ -6,7 +6,7 @@ import { TypedNavigator, NavigationProp, RouteProp, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import CompatScreen from './CompatScreen'; import ScreenPropsContext from './ScreenPropsContext'; import createCompatNavigationProp from './createCompatNavigationProp'; diff --git a/packages/compat/src/createSwitchNavigator.tsx b/packages/compat/src/createSwitchNavigator.tsx index 6f2afe14..593142d6 100644 --- a/packages/compat/src/createSwitchNavigator.tsx +++ b/packages/compat/src/createSwitchNavigator.tsx @@ -2,7 +2,7 @@ import { useNavigationBuilder, createNavigatorFactory, DefaultNavigatorOptions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabRouter, TabRouterOptions, diff --git a/packages/compat/src/types.tsx b/packages/compat/src/types.tsx index 14090766..a6c262e6 100644 --- a/packages/compat/src/types.tsx +++ b/packages/compat/src/types.tsx @@ -1,4 +1,4 @@ -import { ParamListBase, NavigationProp, Route } from '@react-navigation/core'; +import { ParamListBase, NavigationProp, Route } from '@react-navigation/native'; import * as helpers from './helpers'; export type CompatNavigationProp< diff --git a/packages/compat/src/useCompatNavigation.tsx b/packages/compat/src/useCompatNavigation.tsx index a932b54c..d82b17e1 100644 --- a/packages/compat/src/useCompatNavigation.tsx +++ b/packages/compat/src/useCompatNavigation.tsx @@ -4,7 +4,7 @@ import { useRoute, NavigationProp, ParamListBase, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import createCompatNavigationProp from './createCompatNavigationProp'; import { CompatNavigationProp } from './types'; diff --git a/packages/compat/src/withNavigation.tsx b/packages/compat/src/withNavigation.tsx index 07220ee8..9f774941 100644 --- a/packages/compat/src/withNavigation.tsx +++ b/packages/compat/src/withNavigation.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { NavigationProp, ParamListBase } from '@react-navigation/core'; +import { NavigationProp, ParamListBase } from '@react-navigation/native'; import useCompatNavigation from './useCompatNavigation'; import { CompatNavigationProp } from './types'; diff --git a/packages/compat/src/withNavigationFocus.tsx b/packages/compat/src/withNavigationFocus.tsx index c52377aa..521a1c22 100644 --- a/packages/compat/src/withNavigationFocus.tsx +++ b/packages/compat/src/withNavigationFocus.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { useIsFocused } from '@react-navigation/core'; +import { useIsFocused } from '@react-navigation/native'; type InjectedProps = { isFocused: boolean; diff --git a/packages/drawer/README.md b/packages/drawer/README.md index ca216279..a298dda6 100644 --- a/packages/drawer/README.md +++ b/packages/drawer/README.md @@ -7,7 +7,7 @@ Bottom tab navigator for React Navigation following iOS design guidelines. Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/drawer +yarn add @react-navigation/native @react-navigation/drawer ``` Now we need to install [`react-native-gesture-handler`](https://github.com/kmagiera/react-native-gesture-handler), [`react-native-reanimated`](https://github.com/kmagiera/react-native-reanimated) and [`react-native-safe-area-context`](https://github.com/th3rdwave/react-native-safe-area-context). diff --git a/packages/drawer/package.json b/packages/drawer/package.json index 007e2aa5..8a58eb31 100644 --- a/packages/drawer/package.json +++ b/packages/drawer/package.json @@ -50,7 +50,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-gesture-handler": "^1.0.0", diff --git a/packages/drawer/src/navigators/createDrawerNavigator.tsx b/packages/drawer/src/navigators/createDrawerNavigator.tsx index 7ff9bba7..1bd53a0e 100644 --- a/packages/drawer/src/navigators/createDrawerNavigator.tsx +++ b/packages/drawer/src/navigators/createDrawerNavigator.tsx @@ -3,7 +3,7 @@ import { createNavigatorFactory, useNavigationBuilder, DefaultNavigatorOptions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { DrawerNavigationState, DrawerRouterOptions, diff --git a/packages/drawer/src/types.tsx b/packages/drawer/src/types.tsx index 526f1749..5a56dc05 100644 --- a/packages/drawer/src/types.tsx +++ b/packages/drawer/src/types.tsx @@ -6,7 +6,7 @@ import { NavigationProp, Descriptor, NavigationHelpers, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { DrawerNavigationState } from '@react-navigation/routers'; import { PanGestureHandler } from 'react-native-gesture-handler'; diff --git a/packages/drawer/src/views/DrawerItemList.tsx b/packages/drawer/src/views/DrawerItemList.tsx index 7daa30de..694a8489 100644 --- a/packages/drawer/src/views/DrawerItemList.tsx +++ b/packages/drawer/src/views/DrawerItemList.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { CommonActions } from '@react-navigation/core'; +import { CommonActions } from '@react-navigation/native'; import { DrawerActions, DrawerNavigationState, diff --git a/packages/material-bottom-tabs/README.md b/packages/material-bottom-tabs/README.md index e0a95428..9b8a40af 100644 --- a/packages/material-bottom-tabs/README.md +++ b/packages/material-bottom-tabs/README.md @@ -7,7 +7,7 @@ React Navigation integration for [bottom navigation](https://material.io/design/ Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/material-bottom-tabs +yarn add @react-navigation/native @react-navigation/material-bottom-tabs ``` Setup `react-native-paper` following the [Getting Started guide](https://callstack.github.io/react-native-paper/getting-started.html). diff --git a/packages/material-bottom-tabs/package.json b/packages/material-bottom-tabs/package.json index d6a024c8..ed8c6efe 100644 --- a/packages/material-bottom-tabs/package.json +++ b/packages/material-bottom-tabs/package.json @@ -49,7 +49,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-paper": "^3.0.0", diff --git a/packages/material-bottom-tabs/src/navigators/createMaterialBottomTabNavigator.tsx b/packages/material-bottom-tabs/src/navigators/createMaterialBottomTabNavigator.tsx index db5fc665..75f00437 100644 --- a/packages/material-bottom-tabs/src/navigators/createMaterialBottomTabNavigator.tsx +++ b/packages/material-bottom-tabs/src/navigators/createMaterialBottomTabNavigator.tsx @@ -3,7 +3,7 @@ import { useNavigationBuilder, createNavigatorFactory, DefaultNavigatorOptions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabRouter, TabRouterOptions, diff --git a/packages/material-bottom-tabs/src/types.tsx b/packages/material-bottom-tabs/src/types.tsx index a2039fdb..038db4ff 100644 --- a/packages/material-bottom-tabs/src/types.tsx +++ b/packages/material-bottom-tabs/src/types.tsx @@ -4,7 +4,7 @@ import { Descriptor, NavigationProp, NavigationHelpers, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabNavigationState } from '@react-navigation/routers'; export type MaterialBottomTabNavigationEventMap = { diff --git a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx index ac89a1a9..7d4138ad 100644 --- a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx +++ b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { StyleSheet } from 'react-native'; import { BottomNavigation } from 'react-native-paper'; import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { TabNavigationState, TabActions } from '@react-navigation/routers'; import { diff --git a/packages/material-top-tabs/README.md b/packages/material-top-tabs/README.md index b3fdbaff..ab680350 100644 --- a/packages/material-top-tabs/README.md +++ b/packages/material-top-tabs/README.md @@ -7,7 +7,7 @@ React Navigation integration for animated tab view component from [`react-native Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/material-top-tabs react-native-tab-view +yarn add @react-navigation/native @react-navigation/material-top-tabs react-native-tab-view ``` Now we need to install [`react-native-gesture-handler`](https://github.com/kmagiera/react-native-gesture-handler) and [`react-native-reanimated`](https://github.com/kmagiera/react-native-reanimated).. diff --git a/packages/material-top-tabs/package.json b/packages/material-top-tabs/package.json index cd5a078d..107c1bfd 100644 --- a/packages/material-top-tabs/package.json +++ b/packages/material-top-tabs/package.json @@ -49,7 +49,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-gesture-handler": "^1.0.0", diff --git a/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx b/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx index 3e509a85..d4312f02 100644 --- a/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx +++ b/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx @@ -3,7 +3,7 @@ import { useNavigationBuilder, createNavigatorFactory, DefaultNavigatorOptions, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabRouter, TabRouterOptions, diff --git a/packages/material-top-tabs/src/types.tsx b/packages/material-top-tabs/src/types.tsx index 4a57b072..8a02a0ce 100644 --- a/packages/material-top-tabs/src/types.tsx +++ b/packages/material-top-tabs/src/types.tsx @@ -6,7 +6,7 @@ import { NavigationHelpers, Route, NavigationProp, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { TabNavigationState } from '@react-navigation/routers'; export type MaterialTopTabNavigationEventMap = { diff --git a/packages/material-top-tabs/src/views/MaterialTopTabBar.tsx b/packages/material-top-tabs/src/views/MaterialTopTabBar.tsx index 61482cd7..7d5f03b6 100644 --- a/packages/material-top-tabs/src/views/MaterialTopTabBar.tsx +++ b/packages/material-top-tabs/src/views/MaterialTopTabBar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View, Text, StyleSheet } from 'react-native'; import { TabBar } from 'react-native-tab-view'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { MaterialTopTabBarProps } from '../types'; diff --git a/packages/material-top-tabs/src/views/MaterialTopTabView.tsx b/packages/material-top-tabs/src/views/MaterialTopTabView.tsx index dbe78452..552d4122 100644 --- a/packages/material-top-tabs/src/views/MaterialTopTabView.tsx +++ b/packages/material-top-tabs/src/views/MaterialTopTabView.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { TabView, SceneRendererProps } from 'react-native-tab-view'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { TabNavigationState, TabActions } from '@react-navigation/routers'; import MaterialTopTabBar from './MaterialTopTabBar'; diff --git a/packages/native-stack/README.md b/packages/native-stack/README.md index e8be4677..d07eca70 100644 --- a/packages/native-stack/README.md +++ b/packages/native-stack/README.md @@ -9,7 +9,7 @@ Expo is currently not supported as it includes an older version of `react-native Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/native-stack +yarn add @react-navigation/native @react-navigation/native-stack ``` Now we need to install [`react-native-screens`](https://github.com/kmagiera/react-native-screens). diff --git a/packages/native-stack/package.json b/packages/native-stack/package.json index d0337bbf..e8566b12 100644 --- a/packages/native-stack/package.json +++ b/packages/native-stack/package.json @@ -38,7 +38,7 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-screens": "^2.0.0-alpha.8" diff --git a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx index 0161a570..edd5567d 100644 --- a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx +++ b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx @@ -3,7 +3,7 @@ import { createNavigatorFactory, useNavigationBuilder, EventArg, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { StackRouter, diff --git a/packages/native-stack/src/types.tsx b/packages/native-stack/src/types.tsx index 0afb9df5..f2f636d0 100644 --- a/packages/native-stack/src/types.tsx +++ b/packages/native-stack/src/types.tsx @@ -6,7 +6,7 @@ import { NavigationHelpers, NavigationProp, ParamListBase, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { StackNavigationState, StackRouterOptions, diff --git a/packages/native-stack/src/views/HeaderConfig.tsx b/packages/native-stack/src/views/HeaderConfig.tsx index aba10d77..986dd1cf 100644 --- a/packages/native-stack/src/views/HeaderConfig.tsx +++ b/packages/native-stack/src/views/HeaderConfig.tsx @@ -6,7 +6,7 @@ import { ScreenStackHeaderRightView, // eslint-disable-next-line import/no-unresolved } from 'react-native-screens'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { NativeStackNavigationOptions } from '../types'; type Props = NativeStackNavigationOptions & { diff --git a/packages/native/README.md b/packages/native/README.md index f6b10904..1a450973 100644 --- a/packages/native/README.md +++ b/packages/native/README.md @@ -7,7 +7,7 @@ React Native integration for React Navigation Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/native +yarn add @react-navigation/native ``` ## Usage diff --git a/packages/native/package.json b/packages/native/package.json index 27dfcf82..a0c45d29 100644 --- a/packages/native/package.json +++ b/packages/native/package.json @@ -29,6 +29,9 @@ "prepare": "bob build", "clean": "del lib" }, + "dependencies": { + "@react-navigation/core": "^5.0.0-alpha.27" + }, "devDependencies": { "@react-native-community/bob": "^0.7.0", "@types/react": "^16.9.11", @@ -39,7 +42,6 @@ "typescript": "^3.7.2" }, "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0", "react": "*", "react-native": "*" }, diff --git a/packages/native/src/index.tsx b/packages/native/src/index.tsx index e595f7a9..17507389 100644 --- a/packages/native/src/index.tsx +++ b/packages/native/src/index.tsx @@ -1,3 +1,5 @@ +export * from '@react-navigation/core'; + export { default as NavigationNativeContainer } from './NavigationNativeContainer'; export { default as useBackButton } from './useBackButton'; diff --git a/packages/routers/README.md b/packages/routers/README.md index c7f182f4..a6a94d60 100644 --- a/packages/routers/README.md +++ b/packages/routers/README.md @@ -9,7 +9,7 @@ You probably don't need to use this package directly if you're not building cust Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/routers +yarn add @react-navigation/routers ``` ## Usage @@ -17,7 +17,7 @@ yarn add @react-navigation/core @react-navigation/routers A basic custom navigator bundling a router and a view looks like this: ```js -import { createNavigatorFactory, useNavigationBuilder } from '@react-navigation/core'; +import { createNavigatorFactory, useNavigationBuilder } from '@react-navigation/native'; import { StackRouter } from '@react-navigation/routers'; function StackNavigator({ initialRouteName, children, ...rest }) { diff --git a/packages/routers/package.json b/packages/routers/package.json index 6e46d1f8..0cad6116 100644 --- a/packages/routers/package.json +++ b/packages/routers/package.json @@ -29,6 +29,7 @@ "clean": "del lib" }, "dependencies": { + "@react-navigation/core": "^5.0.0-alpha.27", "shortid": "^2.2.15" }, "devDependencies": { @@ -36,9 +37,6 @@ "del-cli": "^3.0.0", "typescript": "^3.7.2" }, - "peerDependencies": { - "@react-navigation/core": "^5.0.0-alpha.0" - }, "@react-native-community/bob": { "source": "src", "output": "lib", diff --git a/packages/stack/README.md b/packages/stack/README.md index a6b8cffb..91bfa021 100644 --- a/packages/stack/README.md +++ b/packages/stack/README.md @@ -7,7 +7,7 @@ Stack navigator for React Navigation. Open a Terminal in your project's folder and run, ```sh -yarn add @react-navigation/core @react-navigation/stack @react-native-community/masked-view +yarn add @react-navigation/native @react-navigation/stack @react-native-community/masked-view ``` Now we need to install [`react-native-gesture-handler`](https://github.com/kmagiera/react-native-gesture-handler), [`react-native-reanimated`](https://github.com/kmagiera/react-native-reanimated), [`react-native-screens`](https://github.com/kmagiera/react-native-screens) and [`react-native-safe-area-context`](https://github.com/th3rdwave/react-native-safe-area-context). diff --git a/packages/stack/package.json b/packages/stack/package.json index a4d98e71..76b05114 100644 --- a/packages/stack/package.json +++ b/packages/stack/package.json @@ -51,7 +51,7 @@ }, "peerDependencies": { "@react-native-community/masked-view": "^0.1.1", - "@react-navigation/core": "^5.0.0-alpha.0", + "@react-navigation/native": "^5.0.0-alpha.0", "react": "*", "react-native": "*", "react-native-gesture-handler": "^1.0.0", diff --git a/packages/stack/src/navigators/createStackNavigator.tsx b/packages/stack/src/navigators/createStackNavigator.tsx index 8e06df1f..2b83f1a8 100644 --- a/packages/stack/src/navigators/createStackNavigator.tsx +++ b/packages/stack/src/navigators/createStackNavigator.tsx @@ -4,7 +4,7 @@ import { createNavigatorFactory, DefaultNavigatorOptions, EventArg, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { StackRouter, StackRouterOptions, diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx index 578da8d1..69c4df37 100644 --- a/packages/stack/src/types.tsx +++ b/packages/stack/src/types.tsx @@ -12,7 +12,7 @@ import { Descriptor, Route, NavigationHelpers, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { StackNavigationState } from '@react-navigation/routers'; export type StackNavigationEventMap = { diff --git a/packages/stack/src/views/Header/HeaderContainer.tsx b/packages/stack/src/views/Header/HeaderContainer.tsx index d8919074..dc3f0d68 100644 --- a/packages/stack/src/views/Header/HeaderContainer.tsx +++ b/packages/stack/src/views/Header/HeaderContainer.tsx @@ -4,7 +4,7 @@ import { NavigationContext, Route, ParamListBase, -} from '@react-navigation/core'; +} from '@react-navigation/native'; import { StackNavigationState } from '@react-navigation/routers'; import { EdgeInsets } from 'react-native-safe-area-context'; diff --git a/packages/stack/src/views/Header/HeaderSegment.tsx b/packages/stack/src/views/Header/HeaderSegment.tsx index f47a2b3d..9f40473b 100644 --- a/packages/stack/src/views/Header/HeaderSegment.tsx +++ b/packages/stack/src/views/Header/HeaderSegment.tsx @@ -8,7 +8,7 @@ import { } from 'react-native'; import Animated from 'react-native-reanimated'; import { EdgeInsets } from 'react-native-safe-area-context'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import HeaderBackButton from './HeaderBackButton'; import HeaderBackground from './HeaderBackground'; import memoize from '../../utils/memoize'; diff --git a/packages/stack/src/views/Stack/CardContainer.tsx b/packages/stack/src/views/Stack/CardContainer.tsx index dcd2cae9..2d0cf653 100644 --- a/packages/stack/src/views/Stack/CardContainer.tsx +++ b/packages/stack/src/views/Stack/CardContainer.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native'; import Animated from 'react-native-reanimated'; import { StackNavigationState } from '@react-navigation/routers'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { Props as HeaderContainerProps } from '../Header/HeaderContainer'; import Card from './Card'; import { Scene, Layout, StackHeaderMode, TransitionPreset } from '../../types'; diff --git a/packages/stack/src/views/Stack/CardStack.tsx b/packages/stack/src/views/Stack/CardStack.tsx index 0f863601..c8c7452c 100755 --- a/packages/stack/src/views/Stack/CardStack.tsx +++ b/packages/stack/src/views/Stack/CardStack.tsx @@ -11,7 +11,7 @@ import Animated from 'react-native-reanimated'; import { EdgeInsets } from 'react-native-safe-area-context'; // eslint-disable-next-line import/no-unresolved import * as Screens from 'react-native-screens'; // Import with * as to prevent getters being called -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { StackNavigationState } from '@react-navigation/routers'; import { getDefaultHeaderHeight } from '../Header/HeaderSegment'; diff --git a/packages/stack/src/views/Stack/StackView.tsx b/packages/stack/src/views/Stack/StackView.tsx index 8c4ed351..c0f4290b 100644 --- a/packages/stack/src/views/Stack/StackView.tsx +++ b/packages/stack/src/views/Stack/StackView.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Platform } from 'react-native'; import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context'; -import { Route } from '@react-navigation/core'; +import { Route } from '@react-navigation/native'; import { StackActions, StackNavigationState } from '@react-navigation/routers'; import CardStack from './CardStack';