Skip to content
This repository has been archived by the owner on Feb 8, 2020. It is now read-only.

Commit

Permalink
chore: navigation-ex -> react-navigation
Browse files Browse the repository at this point in the history
  • Loading branch information
satya164 committed Aug 21, 2019
1 parent 6b9af77 commit 4128654
Show file tree
Hide file tree
Showing 48 changed files with 131 additions and 101 deletions.
16 changes: 8 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"settings": {
"react": { "version": "16" },
"import/core-modules": [
"@navigation-ex/core",
"@navigation-ex/native",
"@navigation-ex/routers",
"@navigation-ex/stack",
"@navigation-ex/drawer",
"@navigation-ex/bottom-tabs",
"@navigation-ex/material-top-tabs",
"@navigation-ex/material-bottom-tabs"
"@react-navigation/core",
"@react-navigation/native",
"@react-navigation/routers",
"@react-navigation/stack",
"@react-navigation/drawer",
"@react-navigation/bottom-tabs",
"@react-navigation/material-top-tabs",
"@react-navigation/material-bottom-tabs"
]
},
"env": { "browser": true, "node": true }
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/satya164/navigation-ex.git"
"url": "git+https://github.com/satya164/react-navigation.git"
},
"author": "Satyajit Sahoo <satyajit.happy@gmail.com> (https://github.com/satya164/)",
"scripts": {
Expand Down Expand Up @@ -61,5 +61,5 @@
"<rootDir>/jest/setup.js"
]
},
"name": "navigation-ex"
"name": "react-navigation"
}
8 changes: 4 additions & 4 deletions packages/bottom-tabs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navigation-ex/bottom-tabs",
"version": "0.0.1",
"name": "@react-navigation/bottom-tabs",
"version": "5.0.0-alpha.0",
"license": "MIT",
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
Expand All @@ -15,8 +15,8 @@
"clean": "del lib"
},
"dependencies": {
"@navigation-ex/core": "^0.0.1",
"@navigation-ex/routers": "^0.0.1",
"@react-navigation/core": "^5.0.0-alpha.0",
"@react-navigation/routers": "^5.0.0-alpha.0",
"react-native-safe-area-view": "^0.14.6"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
useNavigationBuilder,
createNavigator,
DefaultNavigatorOptions,
} from '@navigation-ex/core';
} from '@react-navigation/core';
import {
TabRouter,
TabRouterOptions,
TabNavigationState,
} from '@navigation-ex/routers';
} from '@react-navigation/routers';
import BottomTabView from '../views/BottomTabView';
import {
BottomTabNavigationConfig,
Expand Down
4 changes: 2 additions & 2 deletions packages/bottom-tabs/src/types.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
ParamListBase,
Descriptor,
Route,
} from '@navigation-ex/core';
import { TabNavigationState } from '@navigation-ex/routers';
} from '@react-navigation/core';
import { TabNavigationState } from '@react-navigation/routers';

export type BottomTabNavigationEventMap = {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/bottom-tabs/src/views/BottomTabBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Dimensions,
} from 'react-native';
import SafeAreaView from 'react-native-safe-area-view';
import { Route } from '@navigation-ex/core';
import { Route } from '@react-navigation/core';

import TabBarIcon from './TabBarIcon';
import TouchableWithoutFeedbackWrapper from './TouchableWithoutFeedbackWrapper';
Expand Down
4 changes: 2 additions & 2 deletions packages/bottom-tabs/src/views/BottomTabView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
ParamListBase,
Route,
BaseActions,
} from '@navigation-ex/core';
import { TabNavigationState } from '@navigation-ex/routers';
} from '@react-navigation/core';
import { TabNavigationState } from '@react-navigation/routers';
// eslint-disable-next-line import/no-unresolved
import { ScreenContainer } from 'react-native-screens';

Expand Down
2 changes: 1 addition & 1 deletion packages/bottom-tabs/src/views/TabBarIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
import { Route } from '@navigation-ex/core';
import { Route } from '@react-navigation/core';

type Props = {
route: Route<string>;
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navigation-ex/core",
"version": "0.0.1",
"name": "@react-navigation/core",
"version": "5.0.0-alpha.0",
"license": "MIT",
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/NavigationContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const Container = React.forwardRef(function NavigationContainer(
}, []);

const { trackState, trackAction } = useDevTools({
name: '@navigation-ex',
name: '@react-navigation',
reset,
state,
});
Expand Down
8 changes: 4 additions & 4 deletions packages/drawer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navigation-ex/drawer",
"version": "0.0.1",
"name": "@react-navigation/drawer",
"version": "5.0.0-alpha.0",
"license": "MIT",
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
Expand All @@ -15,8 +15,8 @@
"clean": "del lib"
},
"dependencies": {
"@navigation-ex/core": "^0.0.1",
"@navigation-ex/routers": "^0.0.1",
"@react-navigation/core": "^5.0.0-alpha.0",
"@react-navigation/routers": "^5.0.0-alpha.0",
"react-native-safe-area-view": "^0.14.6"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/drawer/src/navigators/createDrawerNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
createNavigator,
useNavigationBuilder,
DefaultNavigatorOptions,
} from '@navigation-ex/core';
} from '@react-navigation/core';
import {
DrawerNavigationState,
DrawerRouterOptions,
DrawerRouter,
} from '@navigation-ex/routers';
} from '@react-navigation/routers';

import DrawerView from '../views/DrawerView';
import { DrawerNavigationOptions, DrawerNavigationConfig } from '../types';
Expand Down
4 changes: 2 additions & 2 deletions packages/drawer/src/types.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
NavigationProp,
Descriptor,
NavigationHelpers,
} from '@navigation-ex/core';
import { DrawerNavigationState } from '@navigation-ex/routers';
} from '@react-navigation/core';
import { DrawerNavigationState } from '@react-navigation/routers';
import { PanGestureHandler } from 'react-native-gesture-handler';

export type Scene = {
Expand Down
7 changes: 5 additions & 2 deletions packages/drawer/src/views/DrawerSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ import {
ParamListBase,
Route,
BaseActions,
} from '@navigation-ex/core';
import { DrawerActions, DrawerNavigationState } from '@navigation-ex/routers';
} from '@react-navigation/core';
import {
DrawerActions,
DrawerNavigationState,
} from '@react-navigation/routers';

import { Scene, ContentComponentProps, DrawerDescriptorMap } from '../types';

Expand Down
7 changes: 5 additions & 2 deletions packages/drawer/src/views/DrawerView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import { Dimensions, StyleSheet, I18nManager, Platform } from 'react-native';
import { ScreenContainer } from 'react-native-screens';
import SafeAreaView from 'react-native-safe-area-view';
import { PanGestureHandler, ScrollView } from 'react-native-gesture-handler';
import { ParamListBase, NavigationHelpers } from '@navigation-ex/core';
import { DrawerNavigationState, DrawerActions } from '@navigation-ex/routers';
import { ParamListBase, NavigationHelpers } from '@react-navigation/core';
import {
DrawerNavigationState,
DrawerActions,
} from '@react-navigation/routers';

import DrawerSidebar from './DrawerSidebar';
import DrawerGestureContext from '../utils/DrawerGestureContext';
Expand Down
6 changes: 3 additions & 3 deletions packages/example/app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"expo": {
"name": "@navigation-ex/example",
"slug": "navigation-ex-example",
"name": "@react-navigation/example",
"slug": "react-navigation-example",
"privacy": "public",
"sdkVersion": "34.0.0",
"platforms": [
Expand All @@ -27,4 +27,4 @@
"supportsTablet": true
}
}
}
}
2 changes: 1 addition & 1 deletion packages/example/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@navigation-ex/example",
"name": "@react-navigation/example",
"version": "0.0.0",
"private": true,
"workspaces": {
Expand Down
2 changes: 1 addition & 1 deletion packages/example/src/Screens/BottomTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as React from 'react';
import { MaterialIcons } from '@expo/vector-icons';
import { createBottomTabNavigator } from '@navigation-ex/bottom-tabs';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
// @ts-ignore
import TouchableBounce from 'react-native/Libraries/Components/Touchable/TouchableBounce';
import Albums from '../Shared/Albums';
Expand Down
2 changes: 1 addition & 1 deletion packages/example/src/Screens/MaterialBottomTabs.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { StyleSheet } from 'react-native';
import { createMaterialBottomTabNavigator } from '@navigation-ex/material-bottom-tabs';
import { createMaterialBottomTabNavigator } from '@react-navigation/material-bottom-tabs';
import Article from '../Shared/Article';
import Albums from '../Shared/Albums';
import Contacts from '../Shared/Contacts';
Expand Down
2 changes: 1 addition & 1 deletion packages/example/src/Screens/MaterialTopTabs.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { StyleSheet } from 'react-native';
import { createMaterialTopTabNavigator } from '@navigation-ex/material-top-tabs';
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
import Albums from '../Shared/Albums';
import Contacts from '../Shared/Contacts';
import Chat from '../Shared/Chat';
Expand Down
4 changes: 2 additions & 2 deletions packages/example/src/Screens/SimpleStack.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react';
import { View, StyleSheet } from 'react-native';
import { Button } from 'react-native-paper';
import { RouteProp, ParamListBase } from '@navigation-ex/core';
import { RouteProp, ParamListBase } from '@react-navigation/core';
import {
createStackNavigator,
StackNavigationProp,
} from '@navigation-ex/stack';
} from '@react-navigation/stack';
import Article from '../Shared/Article';
import Albums from '../Shared/Albums';

Expand Down
8 changes: 4 additions & 4 deletions packages/example/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import {
InitialState,
getStateFromPath,
NavigationContainerRef,
} from '@navigation-ex/core';
import { useBackButton, useLinking } from '@navigation-ex/native';
} from '@react-navigation/core';
import { useBackButton, useLinking } from '@react-navigation/native';
import {
createDrawerNavigator,
DrawerNavigationProp,
} from '@navigation-ex/drawer';
} from '@react-navigation/drawer';
import {
createStackNavigator,
Assets as StackAssets,
StackNavigationProp,
} from '@navigation-ex/stack';
} from '@react-navigation/stack';

import SimpleStackScreen from './Screens/SimpleStack';
import BottomTabsScreen from './Screens/BottomTabs';
Expand Down
8 changes: 4 additions & 4 deletions packages/material-bottom-tabs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navigation-ex/material-bottom-tabs",
"version": "0.0.1",
"name": "@react-navigation/material-bottom-tabs",
"version": "5.0.0-alpha.0",
"license": "MIT",
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
Expand All @@ -15,8 +15,8 @@
"clean": "del lib"
},
"dependencies": {
"@navigation-ex/core": "^0.0.1",
"@navigation-ex/routers": "^0.0.1"
"@react-navigation/core": "^5.0.0-alpha.0",
"@react-navigation/routers": "^5.0.0-alpha.0"
},
"devDependencies": {
"@react-native-community/bob": "^0.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
useNavigationBuilder,
createNavigator,
DefaultNavigatorOptions,
} from '@navigation-ex/core';
} from '@react-navigation/core';
import {
TabRouter,
TabRouterOptions,
TabNavigationState,
} from '@navigation-ex/routers';
} from '@react-navigation/routers';

import MaterialBottomTabView from '../views/MaterialBottomTabView';
import {
Expand Down
8 changes: 6 additions & 2 deletions packages/material-bottom-tabs/src/types.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { BottomNavigation } from 'react-native-paper';
import { ParamListBase, Descriptor, NavigationProp } from '@navigation-ex/core';
import { TabNavigationState } from '@navigation-ex/routers';
import {
ParamListBase,
Descriptor,
NavigationProp,
} from '@react-navigation/core';
import { TabNavigationState } from '@react-navigation/routers';

export type MaterialBottomTabNavigationEventMap = {
refocus: undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import * as React from 'react';
import { StyleSheet } from 'react-native';
import { BottomNavigation } from 'react-native-paper';
import MaterialCommunityIcons from 'react-native-vector-icons/MaterialIcons';
import { NavigationHelpers, ParamListBase, Route } from '@navigation-ex/core';
import { TabNavigationState, TabActions } from '@navigation-ex/routers';
import {
NavigationHelpers,
ParamListBase,
Route,
} from '@react-navigation/core';
import { TabNavigationState, TabActions } from '@react-navigation/routers';

import {
MaterialBottomTabDescriptorMap,
Expand Down
8 changes: 4 additions & 4 deletions packages/material-top-tabs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navigation-ex/material-top-tabs",
"version": "0.0.1",
"name": "@react-navigation/material-top-tabs",
"version": "5.0.0-alpha.0",
"license": "MIT",
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
Expand All @@ -15,8 +15,8 @@
"clean": "del lib"
},
"dependencies": {
"@navigation-ex/core": "^0.0.1",
"@navigation-ex/routers": "^0.0.1"
"@react-navigation/core": "^5.0.0-alpha.0",
"@react-navigation/routers": "^5.0.0-alpha.0"
},
"devDependencies": {
"@react-native-community/bob": "^0.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
useNavigationBuilder,
createNavigator,
DefaultNavigatorOptions,
} from '@navigation-ex/core';
} from '@react-navigation/core';
import {
TabRouter,
TabRouterOptions,
TabNavigationState,
} from '@navigation-ex/routers';
} from '@react-navigation/routers';
import MaterialTopTabView from '../views/MaterialTopTabView';
import {
MaterialTopTabNavigationConfig,
Expand Down
4 changes: 2 additions & 2 deletions packages/material-top-tabs/src/types.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
NavigationHelpers,
Route,
NavigationProp,
} from '@navigation-ex/core';
import { TabNavigationState } from '@navigation-ex/routers';
} from '@react-navigation/core';
import { TabNavigationState } from '@react-navigation/routers';

export type MaterialTopTabNavigationEventMap = {
/**
Expand Down
Loading

0 comments on commit 4128654

Please sign in to comment.