Merge branch 'ph/335168/fixMoreActionsVirtualScroller' into 'master'

Fixed diff more actions overlapping with virtual scroller

See merge request gitlab-org/gitlab!65446

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -207,6 +207,19 @@ export default {
       return this.codequalityDiff?.length > 0 && !this.glFeatures.codequalityMrDiffAnnotations;
     },
   },
+  watch: {
+    'idState.moreActionsShown': {
+      handler(val) {
+        const el = this.$el.closest('.vue-recycle-scroller__item-view');
+
+        if (this.glFeatures.diffsVirtualScrolling && el) {
+          // We can't add a class with Vue because of the way the virtual
+          // scroller library renders the diff files
+          el.classList.toggle('gl-z-index-1', val);
+        }
+      },
+    },
+  },
   methods: {
     ...mapActions('diffs', [
       'toggleFileDiscussions',