Compare commits

...

4 Commits

Author SHA1 Message Date
Brent Vatne
ee40dd7d24 Release 1.5.6 2018-03-14 21:50:20 -07:00
Brent Vatne
18a48105c2 Missed a case where we should not have flexGrow 2018-03-14 21:50:06 -07:00
Brent Vatne
fbac47b696 Release 1.5.5 2018-03-14 21:35:26 -07:00
Brent Vatne
9aab47dac2 Apply horizontal icon style whenever we should use horizontal tabs in icon 2018-03-14 21:35:07 -07:00
5 changed files with 22 additions and 12 deletions

View File

@@ -119,6 +119,9 @@ const StacksInTabs = TabNavigator(
tabBarPosition: 'bottom',
animationEnabled: false,
swipeEnabled: false,
tabBarOptions: {
showLabel: false,
},
}
);

View File

@@ -1,6 +1,6 @@
{
"name": "react-navigation",
"version": "1.5.4",
"version": "1.5.6",
"description": "Routing and navigation for your React Native apps",
"main": "src/react-navigation.js",
"repository": {

View File

@@ -137,9 +137,12 @@ exports[`TabNavigator renders successfully 1`] = `
>
<View
style={
Object {
"flexGrow": 1,
}
Array [
false,
Object {
"flexGrow": 1,
},
]
}
>
<View

View File

@@ -101,6 +101,8 @@ class TabBarBottom extends React.PureComponent {
return null;
}
const horizontal = this._shouldUseHorizontalTabs();
return (
<TabBarIcon
position={position}
@@ -109,11 +111,10 @@ class TabBarBottom extends React.PureComponent {
inactiveTintColor={inactiveTintColor}
renderIcon={renderIcon}
scene={scene}
style={
showLabel && this._shouldUseHorizontalTabs()
? styles.horizontalIcon
: styles.icon
}
style={[
horizontal && styles.horizontalIcon,
showLabel !== false && !horizontal && styles.icon,
]}
/>
);
};

View File

@@ -83,9 +83,12 @@ exports[`TabBarBottom renders successfully 1`] = `
>
<View
style={
Object {
"flexGrow": 1,
}
Array [
false,
Object {
"flexGrow": 1,
},
]
}
>
<View