Merge master (v1.33.2) into develop (#1158)

Merge master (v1.33.2) into develop
yext · Dec 8, 2023 · 7aff0d8 · 7aff0d8
2 parents 1999838 + c66bc3f
commit 7aff0d8
Show file tree

Hide file tree

Showing 8 changed files with 513 additions and 2,447 deletions.
diff --git a/.github/run_browserstack_acceptance.sh b/.github/run_browserstack_acceptance.sh
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "answers-hitchhiker-theme",
-  "version": "1.33.0",
+  "version": "1.33.2",
   "description": "A starter Search theme for hitchhikers",
   "keywords": [
     "jambo",
@@ -60,7 +60,6 @@
     "serve": "^13.0.4",
     "simple-git": "^2.24.0",
     "testcafe": "^1.18.6",
-    "testcafe-browser-provider-browserstack": "^1.13.1",
     "underscore.string": "^3.3.6",
     "urijs": "^1.19.11",
     "yargs": "^17.0.1"

diff --git a/static/js/iframe-common.js b/static/js/iframe-common.js
@@ -29,7 +29,7 @@ export function generateIFrame(domain, answersExperienceFrame) {
     // Parse the params out of the URL
     var params = paramString.split('&'),
                  verticalUrl;
-    var referrerPageUrl = document.referrer.split('?')[0].split('#')[0];
+    var referrerPageUrl = encodeURIComponent(document.referrer.split('?')[0].split('#')[0]);
 
     if (pathToIndex) {
       verticalUrl = pathToIndex;
@@ -164,4 +164,4 @@ export function sendToIframe (obj) {
   else {
     iframe.iFrameResizer.sendMessage(obj);
   }
-}
+}
diff --git a/static/js/theme-map/VerticalFullPageMapOrchestrator.js b/static/js/theme-map/VerticalFullPageMapOrchestrator.js
@@ -238,7 +238,7 @@ class VerticalFullPageMapOrchestrator extends ANSWERS.Component {
 
     function setFixedHeight(selector) {
       const el = getSingleElement(selector)
-      el.style.height = `${el.scrollHeight}px`
+      el.style.minHeight = `${el.scrollHeight}px`
     }
   }