kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-29 21:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: maintain backward compat for activeTintColor and inactiveTintColor

Browse Source
This commit is contained in:
Satyajit Sahoo
2018-09-07 11:55:55 +02:00
parent 4f6070d368
commit ea95fa69e1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/material-bottom-tabs/src/navigators/createMaterialBottomTabNavigator.js
View File

@@ -5,8 +5,8 @@ import { BottomNavigation } from 'react-native-paper';
import { createTabNavigator, type InjectedProps } from 'react-navigation-tabs'; import { createTabNavigator, type InjectedProps } from 'react-navigation-tabs';
type Props = InjectedProps & { type Props = InjectedProps & {
activeColor?: string, activeTintColor?: string,
inactiveColor?: string, inactiveTintColor?: string,
}; };
class BottomNavigationView extends React.Component<Props> { class BottomNavigationView extends React.Component<Props> {
@@ -32,8 +32,8 @@ class BottomNavigationView extends React.Component<Props> {
render() { render() {
const { const {
activeColor, activeTintColor,
inactiveColor, inactiveTintColor,
navigation, navigation,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
descriptors, descriptors,
@@ -49,13 +49,14 @@ class BottomNavigationView extends React.Component<Props> {
return ( return (
<BottomNavigation <BottomNavigation
// Pass these for backward compaibility
activeColor={activeTintColor}
inactiveColor={inactiveTintColor}
{...rest} {...rest}
renderIcon={this._renderIcon} renderIcon={this._renderIcon}
barStyle={[barStyle, extraStyle]} barStyle={[barStyle, extraStyle]}
navigationState={navigation.state} navigationState={navigation.state}
getColor={this._getColor} getColor={this._getColor}
activeColor={activeColor}
inactiveColor={inactiveColor}
/> />
); );
} }