Cleaning up order of focusing

The calls to setState should be batched, but this protects against an edge-case where they may not be
underdogio · Jan 31, 2017 · 2821f0a · 2821f0a
1 parent bba9077
commit 2821f0a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Select.js b/src/Select.js
@@ -632,13 +632,13 @@ const Select = React.createClass({
 
 	addValue (value) {
 		var valueArray = this.getValueArray(this.props.value);
-		this.setValue(valueArray.concat(value));
 		const visibleOptions = this._visibleOptions.filter(val => !val.disabled);
-		const index = visibleOptions.indexOf(value);
-		if (visibleOptions.length > index + 1) {
-			this.focusOption(visibleOptions[index + 1]);
+		const valueIndex = visibleOptions.indexOf(value);
+		this.setValue(valueArray.concat(value));
+		if (visibleOptions.length > valueIndex + 1) {
+			this.focusOption(visibleOptions[valueIndex + 1]);
 		} else if (index > 0) {
-			this.focusOption(visibleOptions[index - 1]);
+			this.focusOption(visibleOptions[valueIndex - 1]);
 		}
 	},