Clee/resolve regression

examples/src/components/States.js

@@ -27,6 +27,9 @@ var StatesField = createClass({
 			rtl: false,
 		};
 	},
+	clearValue (e) {
+		this.select.setInputValue('');
+	},
 	switchCountry (e) {
 		var newCountry = e.target.value;
 		this.setState({
@@ -54,7 +57,9 @@ var StatesField = createClass({
 				<h3 className="section-heading">{this.props.label} <a href="https://github.com/JedWatson/react-select/tree/master/examples/src/components/States.js">(Source)</a></h3>
 				<Select
 					id="state-select"
-					ref="stateSelect"
+					ref={(ref) => { this.select = ref; }}
+					onBlurResetsInput={false}
+					onSelectResetsInput={false}
 					autoFocus
 					options={options}
 					simpleValue
@@ -68,6 +73,8 @@ var StatesField = createClass({
 					searchable={this.state.searchable}
 				/>
 				<button style={{ marginTop: '15px' }} type="button" onClick={this.focusStateSelect}>Focus Select</button>
+				<button style={{ marginTop: '15px' }} type="button" onClick={this.clearValue}>Clear Value</button>
+
 				<div className="checkbox-list">
 
 					<label className="checkbox">

src/Select.js

@@ -416,6 +416,18 @@ class Select extends React.Component {
 		});
 	}
 
+	setInputValue(newValue) {
+		if (this.props.onInputChange) {
+			let nextState = this.props.onInputChange(newValue);
+			if (nextState != null && typeof nextState !== 'object') {
+				newValue = '' + nextState;
+			}
+		}
+		this.setState({
+			inputValue: newValue
+		});
+	}
+
 	handleInputValueChange(newValue) {
 		if (this.props.onInputChange) {
 			let nextState = this.props.onInputChange(newValue);
@@ -589,10 +601,10 @@ class Select extends React.Component {
 			const required = this.handleRequired(value, this.props.multi);
 			this.setState({ required });
 		}
+		if (this.props.simpleValue && value) {
+			value = this.props.multi ? value.map(i => i[this.props.valueKey]).join(this.props.delimiter) : value[this.props.valueKey];
+		}
 		if (this.props.onChange) {
-			if (this.props.simpleValue && value) {
-				value = this.props.multi ? value.map(i => i[this.props.valueKey]).join(this.props.delimiter) : value[this.props.valueKey];
-			}
 			this.props.onChange(value);
 		}
 	}
@@ -719,11 +731,15 @@ class Select extends React.Component {
 			.filter(option => !option.option.disabled);
 		this._scrollToFocusedOptionOnUpdate = true;
 		if (!this.state.isOpen) {
-			this.setState({
+			const newState = {
+				...this.state,
 				isOpen: true,
-				inputValue: '',
 				focusedOption: this._focusedOption || (options.length ? options[dir === 'next' ? 0 : options.length - 1].option : null)
-			});
+			};
+			if (this.props.onSelectResetsInput) {
+				newState.inputValue = '';
+			}
+			this.setState(newState);
 			return;
 		}
 		if (!options.length) return;

test/Async-test.js

@@ -515,7 +515,7 @@ describe('Async', () => {
 		});
 
 		it('should not update options on componentWillReceiveProps', () => {
-			const props = {options: []};
+			const props = { options: [] };
 			createControl(props);
 
 			const setStateStub = sinon.stub(asyncInstance, 'setState');

test/Select-test.js

@@ -2138,6 +2138,24 @@ describe('Select', () => {
 		];
 
 		describe('with single select', () => {
+			it('should have retained inputValue after accepting selection with onSelectResetsInput=false, when navigating via keyboard', () => {
+				wrapper = createControlWithWrapper({
+					value: '',
+					options: options,
+					onSelectResetsInput: false,
+					onCloseResetsInput: false,
+					onBlurResetsInput: false,
+					simpleValue: true,
+				});
+				clickArrowToOpen();
+				typeSearchText('tw');
+				pressEnterToAccept();
+				setValueProp('two');
+
+				expect(instance.state.inputValue, 'to equal', 'tw');
+				expect(instance, 'to contain', <div><span className="Select-value-label">Two</span></div>);
+				expect(instance, 'to contain', <input value="tw"/>);
+			});
 			it('should have retained inputValue after accepting selection with onSelectResetsInput=false', () => {
 				// Render an instance of the component
 				wrapper = createControlWithWrapper({
@@ -2146,6 +2164,7 @@ describe('Select', () => {
 					onSelectResetsInput: false,
 					onCloseResetsInput: false,
 					onBlurResetsInput: false,
+					simpleValue: true,
 				});
 
 				clickArrowToOpen();
@@ -2199,7 +2218,8 @@ describe('Select', () => {
 					value: '',
 					options: options,
 					multi: true,
-					onSelectResetsInput: false
+					onSelectResetsInput: false,
+					simpleValue: true,
 				});
 
 				clickArrowToOpen();
@@ -2216,6 +2236,7 @@ describe('Select', () => {
 					value: '',
 					options: options,
 					multi: true,
+					simpleValue: true,
 				});
 
 				clickArrowToOpen();