added 3-in-1 modal

libs/blocks/global-navigation/features/search/gnav-search.js

@@ -5,7 +5,6 @@ import {
   trigger,
   closeAllDropdowns,
   logErrorFor,
-  lanaLog,
 } from '../../utilities/utilities.js';
 import { replaceKeyArray } from '../../../../features/placeholders.js';
 import { getConfig } from '../../../../utils/utils.js';
@@ -31,12 +30,11 @@ class Search {
     this.icon = config.icon;
     this.trigger = config.trigger;
     this.parent = this.trigger.closest('.feds-nav-wrapper');
-    lanaLog({ message: `Search integrated on URL : ${window.location.href}`, tags: 'gnav-search', errorType: 'info' });
     const observer = new MutationObserver(() => {
       this.clearSearchForm();
     });
     observer.observe(this.trigger, { attributeFilter: ['aria-expanded'] });
-    logErrorFor(this.init.bind(this), 'Search init has failed', 'gnav-search', 'error');
+    logErrorFor(this.init.bind(this), 'Search init has failed', 'errorType=error,module=gnav-search');
   }
 
   async init() {

libs/blocks/merch/merch.css

@@ -27,6 +27,26 @@ a[is='checkout-link'].con-button > span {
   content: "\00a0";
 }
 
+.three-in-one {
+  display: flex;
+  height: 100%;
+}
+
+.three-in-one .loading iframe {
+  visibility: hidden;
+}
+
+.three-in-one sp-theme {
+  height: 100%;
+  width: 100%;
+  align-content: center;
+}
+
+.three-in-one sp-theme sp-progress-circle {
+  inset-inline-start: 50%;
+  transform: translate(-50%);
+}
+
 @media (max-width: 1199px) {
   #checkout-link-modal {
     height: 100vh;

libs/blocks/merch/merch.js

@@ -2,6 +2,7 @@ import {
   createTag, getConfig, loadArea, loadScript, loadStyle, localizeLink, SLD,
 } from '../../utils/utils.js';
 import { replaceKey } from '../../features/placeholders.js';
+import { MODAL_TYPE_3_IN_1 } from '../../deps/mas/constants.js';
 
 export const CHECKOUT_LINK_CONFIG_PATH = '/commerce/checkout-link.json'; // relative to libs.
 
@@ -478,7 +479,7 @@ async function openExternalModal(url, getModal, extraOptions) {
 
 const isInternalModal = (url) => /\/fragments\//.test(url);
 
-export async function openModal(e, url, offerType, hash, extraOptions) {
+export async function openModal(e, url, offerType, hash, extraOptions, el) {
   e.preventDefault();
   e.stopImmediatePropagation();
   const { getModal } = await import('../modal/modal.js');
@@ -489,14 +490,20 @@ export async function openModal(e, url, offerType, hash, extraOptions) {
     const prevHash = window.location.hash.replace('#', '') === hash ? '' : window.location.hash;
     window.location.hash = hash;
     window.addEventListener('milo:modal:closed', () => {
-      window.history.pushState({}, document.title, `#${prevHash}`);
+      window.history.pushState({}, document.title, prevHash !== '' ? `#${prevHash}` : `${window.location.pathname}${window.location.search}`);
     }, { once: true });
   }
   if (isInternalModal(url)) {
     const fragmentPath = url.split(/(hlx|aem).(page|live)/).pop();
     modal = await openFragmentModal(fragmentPath, getModal);
   } else {
-    modal = await openExternalModal(url, getModal, extraOptions);
+    const isThreeInOneModal = Object.values(MODAL_TYPE_3_IN_1).includes(el?.getAttribute('data-modal-type')) && el?.href;
+    if (isThreeInOneModal) {
+      const { default: openThreeInOneModal } = await import('./three-in-one.js');
+      modal = await openThreeInOneModal(el);
+    } else {
+      modal = await openExternalModal(url, getModal, extraOptions, el);
+    }
   }
   if (modal) {
     modal.classList.add(offerTypeClass);
@@ -539,7 +546,10 @@ export async function getModalAction(offers, options, el) {
   if (!url) return undefined;
   url = isInternalModal(url) || isProdModal(url)
     ? localizeLink(checkoutLinkConfig[columnName]) : checkoutLinkConfig[columnName];
-  return { url, handler: (e) => openModal(e, url, offerType, hash, options.extraOptions) };
+  return {
+    url,
+    handler: (e) => openModal(e, url, offerType, hash, options.extraOptions, el),
+  };
 }
 
 export async function getCheckoutAction(offers, options, imsSignedInPromise, el) {
@@ -760,19 +770,3 @@ export default async function init(el) {
   log.warn('Failed to get context:', { el });
   return null;
 }
-
-export async function handleHashChange() {
-  const modalDialog = document.querySelector('.dialog-modal');
-  if (window.location.hash) {
-    const modalId = window.location.hash.replace('#', '');
-    const cta = document.querySelector(`.con-button[data-modal-id="${modalId}"]`);
-    if (!modalDialog) {
-      reopenModal(cta);
-    }
-  } else if (modalDialog) {
-    const { closeModal } = await import('../modal/modal.js');
-    closeModal(modalDialog);
-  }
-}
-
-window.addEventListener('hashchange', handleHashChange);

libs/blocks/merch/three-in-one.js

@@ -0,0 +1,95 @@
+/* eslint-disable import/no-relative-packages */
+import { createTag } from '../../utils/utils.js';
+import { MODAL_TYPE_3_IN_1 } from '../../deps/mas/constants.js';
+import '../../features/spectrum-web-components/dist/theme.js';
+import '../../features/spectrum-web-components/dist/progress-circle.js';
+
+export const MSG_SUBTYPE = {
+  AppLoaded: 'AppLoaded',
+  EXTERNAL: 'EXTERNAL',
+  SWITCH: 'SWITCH',
+  RETURN_BACK: 'RETURN_BACK',
+  OrderComplete: 'OrderComplete',
+  Error: 'Error',
+  Close: 'Close',
+};
+
+export const LANA_OPTIONS = {
+  clientId: 'merch-at-scale',
+  sampleRate: 10,
+  tags: 'three-in-one',
+};
+
+export const handle3in1IFrameEvents = ({ data: msgData }) => {
+  let parsedMsg = null;
+  try {
+    parsedMsg = JSON.parse(msgData);
+  } catch (error) {
+    return;
+  }
+  const { app, subType, data } = parsedMsg || {};
+  if (app !== 'ucv3') return;
+  window.lana?.log(`3-in-1 modal: ${subType}`, LANA_OPTIONS);
+  const threeInOne = document.querySelector('.three-in-one');
+  const closeBtn = threeInOne?.querySelector('.dialog-close');
+  switch (subType) {
+    case MSG_SUBTYPE.AppLoaded:
+      threeInOne?.querySelector('iframe')?.classList.remove('loading');
+      threeInOne?.querySelector('sp-theme')?.remove();
+      if (closeBtn) {
+        closeBtn.setAttribute('aria-hidden', 'true');
+        closeBtn.style.opacity = '0';
+      }
+      break;
+    case MSG_SUBTYPE.EXTERNAL:
+    case MSG_SUBTYPE.SWITCH:
+    case MSG_SUBTYPE.RETURN_BACK:
+      if (data?.externalUrl && data.target) {
+        window.open(data.externalUrl, data.target);
+      }
+      break;
+    case MSG_SUBTYPE.Close:
+      document.querySelector('.dialog-modal.three-in-one')?.dispatchEvent(new Event('closeModal'));
+      break;
+    default:
+      break;
+  }
+};
+
+export async function createContent(iframeUrl, modalType) {
+  const content = createTag('div', { class: 'milo-iframe' });
+  const title = modalType === MODAL_TYPE_3_IN_1.CRM ? 'Single App' : modalType;
+  const iframe = createTag('iframe', {
+    src: iframeUrl,
+    title,
+    frameborder: '0',
+    marginwidth: '0',
+    marginheight: '0',
+    allowfullscreen: 'true',
+    loading: 'lazy',
+    class: 'loading',
+  });
+  const pCircle = createTag('sp-progress-circle', { label: 'progress circle', indeterminate: true, size: 'l' });
+  const theme = createTag('sp-theme', { theme: 'spectrum', color: 'light', scale: 'medium', dir: 'ltr' });
+  theme.append(pCircle);
+  content.append(theme);
+  content.append(iframe);
+  return content;
+}
+
+export default async function openThreeInOneModal(el) {
+  const iframeUrl = el?.href;
+  const modalType = el?.getAttribute('data-modal-type');
+  if (!modalType || !iframeUrl) return undefined;
+
+  window.addEventListener('message', handle3in1IFrameEvents);
+
+  const { getModal } = await import('../modal/modal.js');
+  const content = await createContent(iframeUrl, modalType);
+  return getModal(null, {
+    id: 'three-in-one',
+    content,
+    closeEvent: 'closeModal',
+    class: 'three-in-one',
+  });
+}

libs/blocks/modal/modal.css

@@ -21,6 +21,31 @@
   z-index: 102;
 }
 
+.dialog-modal.upgrade-flow-modal,
+.dialog-modal.three-in-one {
+  height: 100%;
+  width: 100%;
+  max-height: 100%;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.upgrade-flow-modal .dialog-close {
+  display: none;
+}
+
+.upgrade-flow-modal .upgrade-flow-iframe,
+.three-in-one .milo-iframe {
+  overflow: hidden;
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.three-in-one iframe {
+  width: 100%;
+}
+
 #locale-modal-v2 .dialog-close,
 #locale-modal-v2 .georouting-wrapper {
   display: block;
@@ -72,25 +97,6 @@
   }
 }
 
-.dialog-modal.upgrade-flow-modal {
-  height: 100%;
-  width: 100%;
-  max-height: 100%;
-  max-width: 100%;
-  overflow: hidden;
-}
-
-.upgrade-flow-modal .dialog-close {
-  display: none;
-}
-
-.upgrade-flow-modal .upgrade-flow-iframe {
-  overflow: hidden;
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box; 
-}
-
 .modal-curtain.is-open {
   position: fixed;
   top: 0;
@@ -238,6 +244,10 @@
     width: fit-content;
   }
 
+  .dialog-modal.three-in-one {
+    width: 100%;
+  }
+
   .dialog-modal .embed-vimeo {
     min-width: 80vw;
   }
@@ -282,7 +292,7 @@
     max-width: 100%;
     max-height: 100%;
   }
-  
+
   .dialog-modal.upgrade-flow-modal {
     border-radius: 0;
   }
@@ -355,14 +365,21 @@
   .dialog-modal.commerce-frame .milo-iframe iframe {
     height: 0%;
   }
-  
+
   .dialog-modal.upgrade-flow-modal {
     height: 820px;
     max-width: 1100px;
     overflow: hidden;
     width: 80%;
   }
 
+  .dialog-modal.three-in-one {
+    height: 820px;
+    width: 80%;
+    max-width: 1100px;
+    overflow: hidden;
+  }
+
   .dialog-modal.tall-video,
   .dialog-modal.tall-video .milo-video {
     --modal-width-var: 35vw;