Commit 350dda5c authored by Phil Hughes's avatar Phil Hughes

Fix emoji menu being behind diff file tree list

Changelog: fixed

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/349230
parent a9c82335
...@@ -653,7 +653,7 @@ export default { ...@@ -653,7 +653,7 @@ export default {
<div <div
v-if="renderFileTree" v-if="renderFileTree"
:style="{ width: `${treeWidth}px` }" :style="{ width: `${treeWidth}px` }"
class="diff-tree-list js-diff-tree-list px-3 pr-md-0" class="diff-tree-list js-diff-tree-list gl-px-5"
> >
<panel-resizer <panel-resizer
:size.sync="treeWidth" :size.sync="treeWidth"
......
...@@ -75,6 +75,9 @@ export default { ...@@ -75,6 +75,9 @@ export default {
return this.noteAuthorId === this.currentUserId; return this.noteAuthorId === this.currentUserId;
}, },
}, },
mounted() {
this.virtualScrollerItem = this.$el.closest('.vue-recycle-scroller__item-view');
},
methods: { methods: {
getAwardClassBindings(awardList) { getAwardClassBindings(awardList) {
return { return {
...@@ -162,6 +165,10 @@ export default { ...@@ -162,6 +165,10 @@ export default {
}, },
setIsMenuOpen(menuOpen) { setIsMenuOpen(menuOpen) {
this.isMenuOpen = menuOpen; this.isMenuOpen = menuOpen;
if (this.virtualScrollerItem) {
this.virtualScrollerItem.style.zIndex = this.isMenuOpen ? 1 : null;
}
}, },
}, },
safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
......
...@@ -45,11 +45,9 @@ ...@@ -45,11 +45,9 @@
top: calc(#{$top-pos} + var(--system-header-height, 0px) + var(--performance-bar-height, 0px)); top: calc(#{$top-pos} + var(--system-header-height, 0px) + var(--performance-bar-height, 0px));
// stylelint-disable-next-line length-zero-no-unit // stylelint-disable-next-line length-zero-no-unit
max-height: calc(100vh - #{$top-pos} - var(--system-header-height, 0px) - var(--performance-bar-height, 0px) - var(--review-bar-height, 0px)); max-height: calc(100vh - #{$top-pos} - var(--system-header-height, 0px) - var(--performance-bar-height, 0px) - var(--review-bar-height, 0px));
z-index: 205;
.drag-handle { .drag-handle {
bottom: 16px; bottom: 16px;
transform: translateX(10px);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment