Merge pull request #1837 from karaggeorge/tab-focus-bug

Prevent default event from firing on Tab and Enter press
JedWatson · Oct 27, 2017 · 572dd50 · 572dd50
2 parents 6a017ea + 00b25df
commit 572dd50
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Select.js b/src/Select.js
@@ -381,15 +381,18 @@ class Select extends React.Component {
 				if (event.shiftKey || !this.state.isOpen || !this.props.tabSelectsValue) {
 					return;
 				}
+				event.preventDefault();
 				this.selectFocusedOption();
 			return;
 			case 13: // enter
-				if (!this.state.isOpen) {
+				event.preventDefault();
+				event.stopPropagation();
+				if (this.state.isOpen) {
+					this.selectFocusedOption();
+				} else {
 					this.focusNextOption();
-					return;
 				}
-				event.stopPropagation();
-				this.selectFocusedOption();
+				return;
 			break;
 			case 27: // escape
 				if (this.state.isOpen) {