diff --git a/examples/src/app.js b/examples/src/app.js
index ed588679f0..b9e0c193b3 100644
--- a/examples/src/app.js
+++ b/examples/src/app.js
@@ -18,7 +18,7 @@ ReactDOM.render(
-
+
{/*
*/}
diff --git a/examples/src/components/CustomComponents.js b/examples/src/components/CustomComponents.js
index dfe329b529..031cc12513 100644
--- a/examples/src/components/CustomComponents.js
+++ b/examples/src/components/CustomComponents.js
@@ -91,6 +91,8 @@ const UsersField = React.createClass({
this.setState({ value });
},
render () {
+ var placeholder = ☺ Select User;
+
return (
{this.props.label}
@@ -98,11 +100,14 @@ const UsersField = React.createClass({
onChange={this.setValue}
optionComponent={GravatarOption}
options={USERS}
- placeholder="Select user"
+ placeholder={placeholder}
value={this.state.value}
valueComponent={GravatarValue}
/>
-
This example implements custom Option and Value components to render a Gravatar image for each user based on their email
+
+ This example implements custom Option and Value components to render a Gravatar image for each user based on their email.
+ It also demonstrates rendering HTML elements as the placeholder.
+
);
}
diff --git a/src/Async.js b/src/Async.js
index a8ec0c7a9a..78cc95cdc2 100644
--- a/src/Async.js
+++ b/src/Async.js
@@ -46,7 +46,10 @@ const Async = React.createClass({
loadingPlaceholder: React.PropTypes.string, // replaces the placeholder while options are loading
minimumInput: React.PropTypes.number, // the minimum number of characters that trigger loadOptions
noResultsText: React.PropTypes.string, // placeholder displayed when there are no matching search results (shared with Select)
- placeholder: React.PropTypes.string, // field placeholder, displayed when there's no value (shared with Select)
+ placeholder: React.PropTypes.oneOfType([ // field placeholder, displayed when there's no value (shared with Select)
+ React.PropTypes.string,
+ React.PropTypes.node
+ ]),
searchingText: React.PropTypes.string, // message to display while options are loading
searchPromptText: React.PropTypes.string, // label to prompt for search input
},