Merge pull request #3402 from timothypage/master

fix MenuList scrolling issue in IE11 with openMenuOnFocus option
JedWatson · Feb 14, 2019 · c31ef94 · c31ef94
2 parents 51fa3de + 58de3f0
commit c31ef94
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Select.js b/src/Select.js
@@ -480,7 +480,7 @@ export default class Select extends Component<Props, State> {
   blur = this.blurInput;
 
   openMenu(focusOption: 'first' | 'last') {
-    const { menuOptions, selectValue } = this.state;
+    const { menuOptions, selectValue, isFocused } = this.state;
     const { isMulti } = this.props;
     let openAtIndex =
       focusOption === 'first' ? 0 : menuOptions.focusable.length - 1;
@@ -492,7 +492,8 @@ export default class Select extends Component<Props, State> {
       }
     }
 
-    this.scrollToFocusedOptionOnUpdate = true;
+    // only scroll if the menu isn't already open
+    this.scrollToFocusedOptionOnUpdate = !(isFocused && this.menuListRef);
     this.inputIsHiddenAfterUpdate = false;
 
     this.onMenuOpen();