Browse files

Merge pull request JedWatson#1260 from DanielHeath/patch-1

Allow react nodes to be passed as loadingPlaceholder
  • Loading branch information...
JedWatson committed Sep 29, 2016
2 parents 962f138 + 2e37a5d commit 0b3622402d2dbbbd2d87600f2b99ec17097f8417
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/Async.js
@@ -8,7 +8,10 @@ const propTypes = {
children: React.PropTypes.func.isRequired, // Child function responsible for creating the inner Select component; (props: Object): PropTypes.element
ignoreAccents: React.PropTypes.bool, // strip diacritics when filtering; defaults to true
ignoreCase: React.PropTypes.bool, // perform case-insensitive filtering; defaults to true
loadingPlaceholder: PropTypes.string.isRequired, // replaces the placeholder while options are loading
loadingPlaceholder: React.PropTypes.oneOfType([ // replaces the placeholder while options are loading
loadOptions: React.PropTypes.func.isRequired, // callback to load options asynchronously; (inputValue: string, callback: Function): ?Promise
options: PropTypes.array.isRequired, // array of options
placeholder: React.PropTypes.oneOfType([ // field placeholder, displayed when there's no value (shared with Select)

0 comments on commit 0b36224

Please sign in to comment.