Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue
index 82a28d4cb5f..b6010d4b70c 100644
--- a/app/assets/javascripts/vue_shared/components/awards_list.vue
+++ b/app/assets/javascripts/vue_shared/components/awards_list.vue
@@ -75,6 +75,9 @@ export default {
       return this.noteAuthorId === this.currentUserId;
     },
   },
+  mounted() {
+    this.virtualScrollerItem = this.$el.closest('.vue-recycle-scroller__item-view');
+  },
   methods: {
     getAwardClassBindings(awardList) {
       return {
@@ -162,6 +165,10 @@ export default {
     },
     setIsMenuOpen(menuOpen) {
       this.isMenuOpen = menuOpen;
+
+      if (this.virtualScrollerItem) {
+        this.virtualScrollerItem.style.zIndex = this.isMenuOpen ? 1 : null;
+      }
     },
   },
   safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },