Merge branch 'JedWatson:master'

Author: James Rogers

README.md

@@ -389,6 +389,7 @@ function onInputKeyDown(event) {
 scrollMenuIntoView |	bool	|	true	|	whether the viewport will shift to display the entire menu when engaged
 searchable	|	bool	|	true	|	whether to enable searching feature or not
 searchPromptText |	string\|node	|	'Type to search'	|	label to prompt for search input
+loadingPlaceholder |	string\|node	|	'Loading...'	|	label to prompt for loading search result
 tabSelectsValue	|	bool	|	true	|	whether to select the currently focused value when the `[tab]` key is pressed
 value	|	any	|	undefined	|	initial field value
 valueKey	|	string	|	'value'	|	the option property to use for the value

lib/Select.js

@@ -451,7 +451,7 @@ var Select = _react2['default'].createClass({
 });
 } else {
 // otherwise, focus the input and open the menu
-this._openAfterFocus = true;
+this._openAfterFocus = this.props.openOnFocus;
 this.focus();
 }
 },
@@ -1346,4 +1346,4 @@ var Select = _react2['default'].createClass({
 });
 
 exports['default'] = Select;
-module.exports = exports['default'];
+module.exports = exports['default'];

src/Async.js

@@ -13,6 +13,7 @@ const propTypes = {
 React.PropTypes.node
 ]),
 loadOptions: React.PropTypes.func.isRequired, // callback to load options asynchronously; (inputValue: string, callback: Function): ?Promise
+multi: React.PropTypes.bool, // multi-value input
 options: PropTypes.array.isRequired, // array of options
 placeholder: React.PropTypes.oneOfType([ // field placeholder, displayed when there's no value (shared with Select)
 React.PropTypes.string,

src/Select.js

@@ -399,7 +399,7 @@ const Select = React.createClass({
 });
 } else {
 // otherwise, focus the input and open the menu
-this._openAfterFocus = true;
+this._openAfterFocus = this.props.openOnFocus;
 this.focus();
 }
 },
@@ -1132,7 +1132,14 @@ const Select = React.createClass({
 
 let focusedOption = this.state.focusedOption || selectedOption;
 if (focusedOption && !focusedOption.disabled) {
-const focusedOptionIndex = options.indexOf(focusedOption);
+let focusedOptionIndex = -1;
+options.some((option, index) => {
+const isOptionEqual = option.value === focusedOption.value;
+if (isOptionEqual) {
+focusedOptionIndex = index;
+}
+return isOptionEqual;
+});
 if (focusedOptionIndex !== -1) {
 return focusedOptionIndex;
 }