Merge pull request JedWatson#2225 from aravindsrivats/master

Pass placeholder prop to ValueComponent
sevenval · Dec 19, 2017 · f79c0ff · f79c0ff
2 parents 801eb63 + 63dc230
commit f79c0ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/examples/src/components/CustomComponents.js b/examples/src/components/CustomComponents.js
@@ -7,6 +7,11 @@ import Gravatar from 'react-gravatar';
 const USERS = require('../data/users');
 const GRAVATAR_SIZE = 15;
 
+const stringOrNode = PropTypes.oneOfType([
+	PropTypes.string,
+	PropTypes.node,
+]);
+
 const GravatarOption = createClass({
 	propTypes: {
 		children: PropTypes.node,
@@ -55,7 +60,7 @@ const GravatarOption = createClass({
 const GravatarValue = createClass({
 	propTypes: {
 		children: PropTypes.node,
-		placeholder: PropTypes.string,
+		placeholder: stringOrNode,
 		value: PropTypes.object
 	},
 	render () {

diff --git a/src/Select.js b/src/Select.js
@@ -789,6 +789,7 @@ class Select extends React.Component {
 						onClick={onClick}
 						onRemove={this.removeValue}
 						value={value}
+						placeholder={this.props.placeholder}
 					>
 						{renderLabel(value, i)}
 						<span className="Select-aria-only">&nbsp;</span>
@@ -804,6 +805,7 @@ class Select extends React.Component {
 					instancePrefix={this._instancePrefix}
 					onClick={onClick}
 					value={valueArray[0]}
+					placeholder={this.props.placeholder}
 				>
 					{renderLabel(valueArray[0])}
 				</ValueComponent>