kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-02-05 22:47:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add string as possible propType for 'systemIcon'

Browse Source 
Summary:
Fixes #2361
Closes https://github.com/facebook/react-native/pull/4523

Reviewed By: svcscm

Differential Revision: D2718568

Pulled By: androidtrunkagent

fb-gh-sync-id: a15c94acaac899dfdaeb397c8c764053d1430854
This commit is contained in:
Christopher Dro
2015-12-03 10:16:03 -08:00
committed by facebook-github-bot-0
parent a2f1be097e
commit dd9c1e16ee
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
View File

@@ -52,7 +52,10 @@ var TabBarItemIOS = React.createClass({
/**
* A custom icon for the tab. It is ignored when a system icon is defined.
*/
icon: Image.propTypes.source,
icon: React.PropTypes.oneOfType([
React.PropTypes.string,
Image.propTypes.source,
]),
/**
* A custom icon when the tab is selected. It is ignored when a system
* icon is defined. If left empty, the icon will be tinted in blue.