Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 6 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.vue b/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.vue
index 7d20e0ce10b..015f024cffb 100644
--- a/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.vue
@@ -35,13 +35,9 @@ export default {
       title: '',
       body: null,
       open: false,
+      drawerTop: '0px',
     };
   },
-  computed: {
-    drawerOffsetTop() {
-      return `${contentTop()}px`;
-    },
-  },
   watch: {
     documentPath: {
       immediate: true,
@@ -77,6 +73,9 @@ export default {
         cache[this.documentPath] = { title, body };
       }
     },
+    getDrawerTop() {
+      this.drawerTop = `${contentTop()}px`;
+    },
     renderGLFM() {
       this.$nextTick(() => {
         $(this.$refs['content-element']).renderGFM();
@@ -86,9 +85,11 @@ export default {
       this.open = false;
     },
     toggleDrawer() {
+      this.getDrawerTop();
       this.open = !this.open;
     },
     openDrawer() {
+      this.getDrawerTop();
       this.open = true;
     },
   },
@@ -98,7 +99,7 @@ export default {
 };
 </script>
 <template>
-  <gl-drawer :header-height="drawerOffsetTop" :open="open" header-sticky @close="closeDrawer">
+  <gl-drawer :header-height="drawerTop" :open="open" header-sticky @close="closeDrawer">
     <template #title>
       <h4 data-testid="title-element" class="gl-m-0">{{ title }}</h4>
     </template>