From d8c3df968cffa4bc0497eef77b81d4d057b6acf5 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Thu, 2 Jun 2022 17:24:09 -0400
Subject: [PATCH] WIP footer modal code updates.

---
 jest.config.js                                              | 1 -
 src/common-components/funnel-footer/funnel-footer.vue       | 1 +
 src/common-components/funnel-header/funnel-header.vue       | 2 +-
 .../{ => funnel-header}/menu-modal/menu-modal.spec.js       | 0
 .../{ => funnel-header}/menu-modal/menu-modal.vue           | 6 ++++++
 src/layouts/component-test/component-test.vue               | 2 +-
 src/styles/common-styles.scss                               | 3 +--
 7 files changed, 10 insertions(+), 5 deletions(-)
 rename src/common-components/{ => funnel-header}/menu-modal/menu-modal.spec.js (100%)
 rename src/common-components/{ => funnel-header}/menu-modal/menu-modal.vue (93%)

diff --git a/jest.config.js b/jest.config.js
index 0dd06d9be..38de219c9 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -25,7 +25,6 @@ module.exports = {
     "!src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue",
     "!src/ux-components/alert\alert.vue",
     "!src/helpers/validation-rules.js",
-    "!src/common-components/menu-modal/menu-modal.vue",
     // END
   ], // ! means exclude from coverage.
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index ab4796325..2c4152cfa 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="row" :style="`padding-bottom: ${paddingHeight}px`"></div>
     <footer class="footer container-fluid fixed-bottom g-5 bg-light py-4" id="infoBox">
       <div class="row d-flex flex-row-reverse align-items-center vw-100">
         <div class="col button-col d-flex" id="stacked">
diff --git a/src/common-components/funnel-header/funnel-header.vue b/src/common-components/funnel-header/funnel-header.vue
index 2244a52ab..1fa13094f 100644
--- a/src/common-components/funnel-header/funnel-header.vue
+++ b/src/common-components/funnel-header/funnel-header.vue
@@ -20,7 +20,7 @@
 import alert from "@/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
-import menuModal from "@/common-components/menu-modal/menu-modal";
+import menuModal from "@/common-components/funnel-header/menu-modal/menu-modal";
 
 export default {
   name: "funnel-header",
diff --git a/src/common-components/menu-modal/menu-modal.spec.js b/src/common-components/funnel-header/menu-modal/menu-modal.spec.js
similarity index 100%
rename from src/common-components/menu-modal/menu-modal.spec.js
rename to src/common-components/funnel-header/menu-modal/menu-modal.spec.js
diff --git a/src/common-components/menu-modal/menu-modal.vue b/src/common-components/funnel-header/menu-modal/menu-modal.vue
similarity index 93%
rename from src/common-components/menu-modal/menu-modal.vue
rename to src/common-components/funnel-header/menu-modal/menu-modal.vue
index de26738f0..6c6b165ce 100644
--- a/src/common-components/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -41,10 +41,15 @@ export default {
     var self = this;
     myModalEl.addEventListener('hide.bs.modal', function (event) {
       self.isActive = false;
+      event.prevenDefault();
     });
     myModalEl.addEventListener('show.bs.modal', function (event) {
       self.currentFooterAndHeaderHeight = self.getFooterInfoBoxHeight() + 72;
       self.isActive = true;
+      console.log("scroll!!!");
+      document.querySelector('.page-container-grouped-styles').scrollTo({
+        top: 0,  behavior: 'smooth'
+      });
     })
   },
   components: {
@@ -71,6 +76,7 @@ export default {
       flex-direction: column;
       justify-content: center;
       align-items: center;
+      padding: 0;//Required to prevent 'squish' on iPhone
       z-index: 1056;
       .bar1,
       .bar2,
diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index 9cc376249..6cc264405 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -1089,7 +1089,7 @@
   import textboxQuestion from "@/common-components/textbox-question/textbox-question";
   import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
   import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
-  import menuModal from "@/common-components/menu-modal/menu-modal";
+  import menuModal from "@/common-components/funnel-header/menu-modal/menu-modal";
   export default {
     name: "App",
     components: {
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 13eb42d53..cac5f1f42 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -53,8 +53,7 @@ body {
     left: 50%;
     transform: translateX(-50%);
     max-width: 576px;
-    height: calc(100% - 152px);
-    top: 72px;
+    height: calc(100% - 72px);
   }
 
 }