From ceeb414a646810d766a5727b8a8c2fe16a74e27e Mon Sep 17 00:00:00 2001
From: Pascal Mugnier <pascal.mugnier@sonarsource.com>
Date: Mon, 30 Jul 2018 14:59:09 +0200
Subject: [PATCH] Sonar-10990 Edit global search (#550)

---
 .../src/main/js/app/components/search/Search.js     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/search/Search.js b/server/sonar-web/src/main/js/app/components/search/Search.js
index 63075e9b824..b65be42af15 100644
--- a/server/sonar-web/src/main/js/app/components/search/Search.js
+++ b/server/sonar-web/src/main/js/app/components/search/Search.js
@@ -125,10 +125,12 @@ export default class Search extends React.PureComponent {
   };
 
   handleFocus = () => {
-    // simulate click to close any other dropdowns
-    const body = document.documentElement;
-    if (body) {
-      body.click();
+    if (!this.state.open) {
+      // simulate click to close any other dropdowns
+      const body = document.documentElement;
+      if (body) {
+        body.click();
+      }
     }
     this.openSearch();
   };
@@ -237,6 +239,9 @@ export default class Search extends React.PureComponent {
             },
             selected: moreResults.length > 0 ? moreResults[0].key : state.selected
           }));
+          if (this.input) {
+            this.input.focus();
+          }
         }
       }, this.stopLoading);
     }
-- 
2.39.5