Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
index 19fe78aca87..d8d07b4b221 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue
@@ -135,6 +135,16 @@ export default {
         this.handleLabelClick(this.visibleLabels[0]);
       }
     },
+    handleFocus(event, index) {
+      if (index === 0 && event.target.classList.contains('is-focused')) {
+        event.target.classList.remove('is-focused');
+
+        // Focus next element (if available) as the first item was already focused.
+        if (event.target.parentNode?.nextElementSibling?.querySelector('button')) {
+          event.target.parentNode.nextElementSibling.querySelector('button').focus();
+        }
+      }
+    },
   },
 };
 </script>
@@ -157,6 +167,7 @@ export default {
             :active="shouldHighlightFirstItem && index === 0"
             active-class="is-focused"
             data-testid="labels-list"
+            @focus.native.capture="handleFocus($event, index)"
             @click.native.capture.stop="handleLabelClick(label)"
           >
             <label-item :label="label" />