From dd9c1e16ee372f419e9c4e5757dc25cb3e2dcd66 Mon Sep 17 00:00:00 2001 From: Christopher Dro Date: Thu, 3 Dec 2015 10:16:03 -0800 Subject: [PATCH] Add string as possible propType for 'systemIcon' 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 --- Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js index f220249c7..20e0cf624 100644 --- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js +++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js @@ -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.