Merge branch 'master' into master

This commit is contained in:
Matt Hamil 2017-06-12 14:17:18 -05:00 committed by GitHub
commit 75b4f2371f

View File

@ -121,6 +121,7 @@ class TabView extends PureComponent<void, Props, void> {
<TabBarComponent
{...props}
{...tabBarOptions}
screenProps={this.props.screenProps}
navigation={this.props.navigation}
getLabel={this._getLabel}
renderIcon={this._renderIcon}