Skip to content

Commit

Permalink
Merge pull request #869 from mgroeneman/master
Browse files Browse the repository at this point in the history
Change noResultsText prop type to stringOrNode for Async component
  • Loading branch information
JedWatson committed Apr 7, 2016
2 parents 98c479b + 21e51ab commit 0257628
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Async.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const Async = React.createClass({
loadOptions: React.PropTypes.func.isRequired, // function to call to load options asynchronously
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)
noResultsText: stringOrNode, // placeholder displayed when there are no matching search results (shared with Select)
placeholder: stringOrNode, // field placeholder, displayed when there's no value (shared with Select)
searchPromptText: React.PropTypes.string, // label to prompt for search input
searchingText: React.PropTypes.string, // message to display while options are loading
Expand Down

0 comments on commit 0257628

Please sign in to comment.