From 0b7de3654e65d7bd3101561d03a019ac7ac8fbf1 Mon Sep 17 00:00:00 2001
From: Abhishek  Chaudhary <98864225+Abhishekzod007@users.noreply.github.com>
Date: Fri, 22 Mar 2024 02:21:37 +0530
Subject: [PATCH 1/2] change lifecycle events in FullscreenModal for
 hideHTMLScroll logic - The logic was handled by using the mount/destroy
 lifecycle events - To account for all cases, replaced it with activation
 based lifecycle events - Previous events led to sometimes having dual
 scrollbars"

---
 .../frontend/shared/views/FullscreenModal.vue               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
index 2173e500d1..1772b06593 100644
--- a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
@@ -100,11 +100,13 @@
         this.hideHTMLScroll(!!val);
       },
     },
-    beforeDestroy() {
+    activated(){
+      this.hideHTMLScroll(true);
+    },
+    deactivated() {
       this.hideHTMLScroll(false); // Ensure scroll is restored when the component is destroyed
     },
     mounted() {
-      this.hideHTMLScroll(true);
       this.$refs.dialog.initDetach();
     },
     methods: {

From b0a0e446d185b5371341b300bae0c57f7da1e464 Mon Sep 17 00:00:00 2001
From: Alex Velez <velezllaquealex@gmail.com>
Date: Fri, 28 Jun 2024 10:40:19 -0500
Subject: [PATCH 2/2] Lint files

---
 .../contentcuration/frontend/shared/views/FullscreenModal.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
index 1772b06593..720e149ceb 100644
--- a/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
@@ -100,7 +100,7 @@
         this.hideHTMLScroll(!!val);
       },
     },
-    activated(){
+    activated() {
       this.hideHTMLScroll(true);
     },
     deactivated() {