Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 10 deletions

diff --git a/app/assets/javascripts/header_search/constants.js b/app/assets/javascripts/header_search/constants.js
index c9b05c3deb5..a026386b2bd 100644
--- a/app/assets/javascripts/header_search/constants.js
+++ b/app/assets/javascripts/header_search/constants.js
@@ -49,3 +49,5 @@ export const SEARCH_RESULTS_DESCRIPTION = 'search-results-description';
 export const SCOPE_TOKEN_MAX_LENGTH = 36;
 
 export const INPUT_FIELD_PADDING = 52;
+
+export const HEADER_INIT_EVENTS = ['input', 'focus'];
diff --git a/app/assets/javascripts/header_search/init.js b/app/assets/javascripts/header_search/init.js
index 2b9fac0b395..4e9404007ec 100644
--- a/app/assets/javascripts/header_search/init.js
+++ b/app/assets/javascripts/header_search/init.js
@@ -1,4 +1,5 @@
 import * as Sentry from '@sentry/browser';
+import { HEADER_INIT_EVENTS } from './constants';
 
 async function eventHandler(callback = () => {}) {
   if (this.newHeaderSearchFeatureFlag) {
@@ -28,21 +29,25 @@ async function eventHandler(callback = () => {}) {
 }
 
 function cleanEventListeners() {
-  document.querySelector('#search').removeEventListener('focus', eventHandler);
+  HEADER_INIT_EVENTS.forEach((eventType) => {
+    document.querySelector('#search').removeEventListener(eventType, eventHandler);
+  });
 }
 
 function initHeaderSearch() {
   const searchInputBox = document.querySelector('#search');
 
-  searchInputBox?.addEventListener(
-    'focus',
-    eventHandler.bind(
-      { searchInputBox, newHeaderSearchFeatureFlag: gon?.features?.newHeaderSearch },
-      cleanEventListeners,
-    ),
-    { once: true },
-  );
+  HEADER_INIT_EVENTS.forEach((eventType) => {
+    searchInputBox?.addEventListener(
+      eventType,
+      eventHandler.bind(
+        { searchInputBox, newHeaderSearchFeatureFlag: gon?.features?.newHeaderSearch },
+        cleanEventListeners,
+      ),
+      { once: true },
+    );
+  });
 }
 
 export default initHeaderSearch;
-export { eventHandler };
+export { eventHandler, cleanEventListeners };