From a67c5484454a086c152a436057b4c327833abf10 Mon Sep 17 00:00:00 2001
From: ankush29 <saini.ankush29@gmail.com>
Date: Fri, 28 Jun 2019 14:37:35 +0530
Subject: [PATCH] focus start from selected option

---
 packages/react-select/src/Select.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-select/src/Select.js b/packages/react-select/src/Select.js
index c8d59039d0..f5ee8dbf9e 100644
--- a/packages/react-select/src/Select.js
+++ b/packages/react-select/src/Select.js
@@ -484,12 +484,12 @@ export default class Select extends Component<Props, State> {
 
   openMenu(focusOption: 'first' | 'last') {
     const { menuOptions, selectValue, isFocused } = this.state;
-    const { isMulti } = this.props;
+    const { isMulti, options } = this.props;
     let openAtIndex =
       focusOption === 'first' ? 0 : menuOptions.focusable.length - 1;
 
     if (!isMulti) {
-      const selectedIndex = menuOptions.focusable.indexOf(selectValue[0]);
+      const selectedIndex = options.indexOf(selectValue[0]);
       if (selectedIndex > -1) {
         openAtIndex = selectedIndex;
       }
@@ -502,7 +502,7 @@ export default class Select extends Component<Props, State> {
     this.onMenuOpen();
     this.setState({
       focusedValue: null,
-      focusedOption: menuOptions.focusable[openAtIndex],
+      focusedOption: options[openAtIndex],
     });
 
     this.announceAriaLiveContext({ event: 'menu' });
@@ -773,9 +773,9 @@ export default class Select extends Component<Props, State> {
   }
 
   getNextFocusedOption(options: OptionsType) {
-    const { focusedOption: lastFocusedOption } = this.state;
-    return lastFocusedOption && options.indexOf(lastFocusedOption) > -1
-      ? lastFocusedOption
+    const { selectValue: lastFocusedOption } = this.state;
+    return lastFocusedOption && options.indexOf(lastFocusedOption[0]) > -1
+      ? lastFocusedOption[0]
       : options[0];
   }
   getOptionLabel = (data: OptionType): string => {