diff --git a/flow-typed/npm/react-navigation-tabs_vx.x.x.js b/flow-typed/npm/react-navigation-tabs_vx.x.x.js deleted file mode 100644 index b33140d4bd1..00000000000 --- a/flow-typed/npm/react-navigation-tabs_vx.x.x.js +++ /dev/null @@ -1,178 +0,0 @@ -// flow-typed signature: 66582a0e4da4613bd0cd2f73b6f3df6c -// flow-typed version: <>/react-navigation-tabs_v0.8.4/flow_v0.92.0 - -/** - * This is an autogenerated libdef stub for: - * - * 'react-navigation-tabs' - * - * Fill this stub out by replacing all the `any` types. - * - * Once filled out, we encourage you to share your work with the - * community by sending a pull request to: - * https://github.com/flowtype/flow-typed - */ - -declare module 'react-navigation-tabs' { - declare module.exports: any; -} - -/** - * We include stubs for each file inside this npm package in case you need to - * require those files directly. Feel free to delete any files that aren't - * needed. - */ -declare module 'react-navigation-tabs/createBottomTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/createMaterialTopTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/navigators/createBottomTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/navigators/createMaterialBottomTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/navigators/createMaterialTopTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/utils/createTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/utils/withDimensions' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/views/BottomTabBar' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/views/CrossFadeIcon' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/views/MaterialTopTabBar' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/dist/views/ResourceSavingScene' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/navigators/createBottomTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/navigators/createMaterialTopTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/utils/createTabNavigator' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/utils/withDimensions' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/views/BottomTabBar' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/views/CrossFadeIcon' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/views/MaterialTopTabBar' { - declare module.exports: any; -} - -declare module 'react-navigation-tabs/src/views/ResourceSavingScene' { - declare module.exports: any; -} - -// Filename aliases -declare module 'react-navigation-tabs/createBottomTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/createBottomTabNavigator'>; -} -declare module 'react-navigation-tabs/createMaterialTopTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/createMaterialTopTabNavigator'>; -} -declare module 'react-navigation-tabs/dist/index' { - declare module.exports: $Exports<'react-navigation-tabs/dist'>; -} -declare module 'react-navigation-tabs/dist/index.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist'>; -} -declare module 'react-navigation-tabs/dist/navigators/createBottomTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/navigators/createBottomTabNavigator'>; -} -declare module 'react-navigation-tabs/dist/navigators/createMaterialBottomTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/navigators/createMaterialBottomTabNavigator'>; -} -declare module 'react-navigation-tabs/dist/navigators/createMaterialTopTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/navigators/createMaterialTopTabNavigator'>; -} -declare module 'react-navigation-tabs/dist/utils/createTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/utils/createTabNavigator'>; -} -declare module 'react-navigation-tabs/dist/utils/withDimensions.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/utils/withDimensions'>; -} -declare module 'react-navigation-tabs/dist/views/BottomTabBar.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/views/BottomTabBar'>; -} -declare module 'react-navigation-tabs/dist/views/CrossFadeIcon.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/views/CrossFadeIcon'>; -} -declare module 'react-navigation-tabs/dist/views/MaterialTopTabBar.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/views/MaterialTopTabBar'>; -} -declare module 'react-navigation-tabs/dist/views/ResourceSavingScene.js' { - declare module.exports: $Exports<'react-navigation-tabs/dist/views/ResourceSavingScene'>; -} -declare module 'react-navigation-tabs/src/index' { - declare module.exports: $Exports<'react-navigation-tabs/src'>; -} -declare module 'react-navigation-tabs/src/index.js' { - declare module.exports: $Exports<'react-navigation-tabs/src'>; -} -declare module 'react-navigation-tabs/src/navigators/createBottomTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/navigators/createBottomTabNavigator'>; -} -declare module 'react-navigation-tabs/src/navigators/createMaterialTopTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/navigators/createMaterialTopTabNavigator'>; -} -declare module 'react-navigation-tabs/src/utils/createTabNavigator.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/utils/createTabNavigator'>; -} -declare module 'react-navigation-tabs/src/utils/withDimensions.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/utils/withDimensions'>; -} -declare module 'react-navigation-tabs/src/views/BottomTabBar.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/views/BottomTabBar'>; -} -declare module 'react-navigation-tabs/src/views/CrossFadeIcon.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/views/CrossFadeIcon'>; -} -declare module 'react-navigation-tabs/src/views/MaterialTopTabBar.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/views/MaterialTopTabBar'>; -} -declare module 'react-navigation-tabs/src/views/ResourceSavingScene.js' { - declare module.exports: $Exports<'react-navigation-tabs/src/views/ResourceSavingScene'>; -} diff --git a/package.json b/package.json index 27a04b5780b..a91d7d8a548 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,6 @@ "react-native-webview": "~10.0.0", "react-navigation": "^2.18.3", "react-navigation-redux-helpers": "^2.0.9", - "react-navigation-tabs": "0.8.4", "react-redux": "^5.0.7", "redux": "^4.0.0", "redux-action-buffer": "^1.2.0", diff --git a/src/main/MainTabs.js b/src/main/MainTabs.js index aecb99194bc..a33dfb26f42 100644 --- a/src/main/MainTabs.js +++ b/src/main/MainTabs.js @@ -1,7 +1,7 @@ /* @flow strict-local */ import React from 'react'; import { Platform } from 'react-native'; -import { createBottomTabNavigator } from 'react-navigation-tabs'; +import { createBottomTabNavigator } from 'react-navigation'; import type { TabNavigationOptionsPropsType } from '../types'; import tabsOptions from '../styles/tabs'; @@ -17,6 +17,7 @@ import ProfileCard from '../account-info/ProfileCard'; export default createBottomTabNavigator( { home: { + // $FlowFixMe `navigationOptions` property on component type screen: HomeTab, navigationOptions: { tabBarLabel: 'Home', @@ -26,6 +27,8 @@ export default createBottomTabNavigator( }, }, streams: { + // No fixme needed; StreamTabs is a navigator from + // `createMaterialTopTabNavigator`. screen: StreamTabs, navigationOptions: { tabBarLabel: 'Streams', @@ -35,6 +38,7 @@ export default createBottomTabNavigator( }, }, conversations: { + // $FlowFixMe `navigationOptions` property on component type screen: PmConversationsCard, navigationOptions: { tabBarLabel: 'Conversations', @@ -44,6 +48,7 @@ export default createBottomTabNavigator( }, }, settings: { + // $FlowFixMe `navigationOptions` property on component type screen: SettingsCard, navigationOptions: { tabBarLabel: 'Settings', @@ -53,6 +58,7 @@ export default createBottomTabNavigator( }, }, profile: { + // $FlowFixMe `navigationOptions` property on component type screen: ProfileCard, navigationOptions: { tabBarLabel: 'Profile', diff --git a/src/main/StreamTabs.js b/src/main/StreamTabs.js index f28708b986c..0c5d537b39f 100644 --- a/src/main/StreamTabs.js +++ b/src/main/StreamTabs.js @@ -2,7 +2,7 @@ import React from 'react'; import { Text } from 'react-native'; import { FormattedMessage } from 'react-intl'; -import { createMaterialTopTabNavigator } from 'react-navigation-tabs'; +import { createMaterialTopTabNavigator } from 'react-navigation'; import type { TabNavigationOptionsPropsType } from '../types'; import { createStyleSheet } from '../styles'; @@ -20,6 +20,7 @@ const styles = createStyleSheet({ export default createMaterialTopTabNavigator( { subscribed: { + // $FlowFixMe `navigationOptions` property on component type screen: SubscriptionsCard, navigationOptions: { tabBarLabel: (props: TabNavigationOptionsPropsType) => ( @@ -30,6 +31,7 @@ export default createMaterialTopTabNavigator( }, }, allStreams: { + // $FlowFixMe `navigationOptions` property on component type screen: StreamListCard, navigationOptions: { tabBarLabel: (props: TabNavigationOptionsPropsType) => (