@economist/web-apple-pay 1.7.9 → 1.8.0

package/dist/index.js

@@ -66,12 +66,13 @@ function formatPrice(price, currencyCode, shouldFixDecimalPlaces = true, roundUp
 // src/apple-pay-logo.ts
 var LOGO_DEFS_ID = "apple-pay-logo-defs";
 var LOGO_PATH = "M10.2651 4.21143C10.4299 4.21143 10.7106 4.23763 11.1074 4.29004C11.5042 4.34245 11.9385 4.49219 12.4102 4.73926C12.8893 4.97884 13.3236 5.37939 13.7129 5.94092C13.6904 5.96338 13.5819 6.04574 13.3872 6.18799C13.1925 6.32275 12.9754 6.5249 12.7358 6.79443C12.4963 7.05648 12.2866 7.39339 12.1069 7.80518C11.9272 8.20947 11.8374 8.69238 11.8374 9.25391C11.8374 9.89779 11.9497 10.4443 12.1743 10.8936C12.4064 11.3428 12.6722 11.7059 12.9717 11.9829C13.2786 12.2524 13.5482 12.4508 13.7803 12.5781C14.0199 12.7054 14.1471 12.7728 14.1621 12.7803C14.1546 12.8102 14.0573 13.076 13.8701 13.5776C13.6904 14.0793 13.391 14.637 12.9717 15.251C12.6048 15.7826 12.208 16.2729 11.7812 16.7222C11.362 17.1714 10.8566 17.396 10.2651 17.396C9.86833 17.396 9.54264 17.3398 9.28809 17.2275C9.03353 17.1077 8.77148 16.9917 8.50195 16.8794C8.23242 16.7596 7.8693 16.6997 7.4126 16.6997C6.97087 16.6997 6.60026 16.7596 6.30078 16.8794C6.00879 16.9992 5.72803 17.119 5.4585 17.2388C5.19645 17.3586 4.88574 17.4185 4.52637 17.4185C3.97982 17.4185 3.50065 17.2013 3.08887 16.7671C2.67708 16.3328 2.25407 15.8125 1.81982 15.2061C1.3182 14.4873 0.887695 13.6113 0.52832 12.5781C0.176432 11.5374 0.000488281 10.4893 0.000488281 9.43359C0.000488281 8.30306 0.213867 7.35596 0.640625 6.59229C1.06738 5.82113 1.61393 5.24089 2.28027 4.85156C2.9541 4.45475 3.65039 4.25635 4.36914 4.25635C4.75098 4.25635 5.11035 4.31999 5.44727 4.44727C5.78418 4.56706 6.09863 4.69059 6.39062 4.81787C6.6901 4.94515 6.95964 5.00879 7.19922 5.00879C7.43132 5.00879 7.70085 4.94141 8.00781 4.80664C8.31478 4.67188 8.65918 4.54085 9.04102 4.41357C9.42285 4.27881 9.83089 4.21143 10.2651 4.21143ZM9.64746 2.78516C9.35547 3.13704 8.98861 3.43278 8.54688 3.67236C8.10514 3.90446 7.68587 4.02051 7.28906 4.02051C7.20671 4.02051 7.12809 4.01302 7.05322 3.99805C7.04574 3.97559 7.03825 3.93441 7.03076 3.87451C7.02327 3.81462 7.01953 3.75098 7.01953 3.68359C7.01953 3.23438 7.11686 2.80013 7.31152 2.38086C7.50618 1.9541 7.72705 1.60221 7.97412 1.3252C8.28857 0.950846 8.68538 0.640137 9.16455 0.393066C9.64372 0.145996 10.1004 0.014974 10.5347 0C10.5571 0.0973307 10.5684 0.213379 10.5684 0.348145C10.5684 0.797363 10.4823 1.23535 10.3101 1.66211C10.1379 2.08138 9.91699 2.45573 9.64746 2.78516ZM17.6885 11.5112V9.71436H22.0459C23.2064 9.71436 24.1048 9.41488 24.7412 8.81592C25.3776 8.20947 25.6958 7.37467 25.6958 6.31152V6.28906C25.6958 5.21842 25.3776 4.38363 24.7412 3.78467C24.1048 3.18571 23.2064 2.88623 22.0459 2.88623H17.6885V1.08936H22.5625C23.5807 1.08936 24.4792 1.30648 25.2578 1.74072C26.0365 2.17497 26.6466 2.78141 27.0884 3.56006C27.5376 4.3387 27.7622 5.24089 27.7622 6.2666V6.28906C27.7622 7.31478 27.5376 8.2207 27.0884 9.00684C26.6466 9.79297 26.0365 10.4069 25.2578 10.8486C24.4792 11.2904 23.5807 11.5112 22.5625 11.5112H17.6885ZM16.6777 17.2949V1.08936H18.6992V17.2949H16.6777ZM32.6699 17.5195C31.9062 17.5195 31.2249 17.3735 30.626 17.0815C30.0345 16.7896 29.5703 16.3778 29.2334 15.8462C28.904 15.3071 28.7393 14.682 28.7393 13.9707V13.9482C28.7393 13.2594 28.9077 12.668 29.2446 12.1738C29.5815 11.6797 30.0682 11.2904 30.7046 11.0059C31.3485 10.7139 32.1234 10.5417 33.0293 10.4893L37.3979 10.2422V11.7695L33.2539 12.0278C32.4303 12.0728 31.8052 12.2599 31.3784 12.5894C30.9517 12.9188 30.7383 13.3643 30.7383 13.9258V13.9482C30.7383 14.5322 30.9554 14.9927 31.3896 15.3296C31.8239 15.659 32.3929 15.8237 33.0967 15.8237C33.7331 15.8237 34.2983 15.6927 34.7925 15.4307C35.2941 15.1686 35.6909 14.813 35.9829 14.3638C36.2749 13.9071 36.4209 13.3979 36.4209 12.8364V9.27637C36.4209 8.55762 36.1963 7.99609 35.7471 7.5918C35.2979 7.1875 34.6502 6.98535 33.8042 6.98535C33.063 6.98535 32.4603 7.13883 31.9961 7.4458C31.5394 7.74528 31.2474 8.14958 31.1201 8.65869L31.0977 8.7373H29.1885L29.1997 8.625C29.2746 7.98861 29.5067 7.41585 29.896 6.90674C30.2928 6.39762 30.8244 5.99707 31.4907 5.70508C32.1646 5.4056 32.9469 5.25586 33.8379 5.25586C34.7812 5.25586 35.5898 5.41683 36.2637 5.73877C36.945 6.05322 37.4653 6.50244 37.8247 7.08643C38.1916 7.66292 38.375 8.35173 38.375 9.15283V17.2949H36.4209V15.4307H36.3311C36.0915 15.8574 35.7845 16.228 35.4102 16.5425C35.0433 16.8569 34.6278 17.1003 34.1636 17.2725C33.6994 17.4372 33.2015 17.5195 32.6699 17.5195ZM42.1484 21.3267C41.9837 21.3267 41.8115 21.3192 41.6318 21.3042C41.4521 21.2892 41.2987 21.2705 41.1714 21.248V19.6421C41.2612 19.6646 41.366 19.6795 41.4858 19.687C41.6056 19.702 41.7292 19.7095 41.8564 19.7095C42.4554 19.7095 42.9383 19.5897 43.3052 19.3501C43.672 19.1105 43.9678 18.6576 44.1924 17.9912L44.4282 17.3062L40.0371 5.48047H42.126L45.6187 15.981L45.0796 15.2734H45.7759L45.248 15.981L48.7407 5.48047H50.7959L46.1802 18.0249C45.8807 18.826 45.555 19.4661 45.2031 19.9453C44.8512 20.432 44.432 20.7839 43.9453 21.001C43.4587 21.2181 42.8597 21.3267 42.1484 21.3267Z";
+var APPLE_LOGO_PATH = LOGO_PATH.slice(0, LOGO_PATH.indexOf("M17.6885"));
 function ensureApplePayLogoSymbol() {
   if (document.getElementById(LOGO_DEFS_ID)) {
     return;
   }
   const tmp = document.createElement("div");
-  tmp.innerHTML = `<svg aria-hidden="true" style="display:none" id="${LOGO_DEFS_ID}"><defs><symbol id="apple-pay-logo" viewBox="0 0 51 22"><path d="${LOGO_PATH}" fill="currentColor"/></symbol></defs></svg>`;
+  tmp.innerHTML = `<svg aria-hidden="true" style="display:none" id="${LOGO_DEFS_ID}"><defs><symbol id="apple-pay-logo" viewBox="0 0 51 22"><path d="${LOGO_PATH}" fill="currentColor"/></symbol><symbol id="apple-logo" viewBox="0 0 15 18"><path d="${APPLE_LOGO_PATH}" fill="currentColor"/></symbol></defs></svg>`;
   document.body.prepend(tmp.firstElementChild);
 }
 
@@ -575,10 +576,9 @@ var loadRecaptchaScript = (siteKey) => {
     );
     if (existingScript) {
       existingScript.addEventListener("load", () => resolve());
-      existingScript.addEventListener(
-        "error",
-        () => reject(new Error("Failed to load existing reCAPTCHA script"))
-      );
+      existingScript.addEventListener("error", () => {
+        reject(new Error("Failed to load existing reCAPTCHA script"));
+      });
       return;
     }
     const script = document.createElement("script");
@@ -586,7 +586,9 @@ var loadRecaptchaScript = (siteKey) => {
     script.async = true;
     script.defer = true;
     script.onload = () => resolve();
-    script.onerror = () => reject(new Error("Failed to load reCAPTCHA script"));
+    script.onerror = () => {
+      reject(new Error("Failed to load reCAPTCHA script"));
+    };
     document.head.appendChild(script);
   });
 };
@@ -835,17 +837,14 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
   #country = "";
   #triggerElement = null;
   #keyHandler = null;
-  #recaptchaTokens = null;
-  #recaptchaTokensPromise = null;
+  #isClosed = false;
   /**
-   * Synchronous callback invoked directly from the CTA click handler once the
-   * user confirms. The caller (ApplePayButton) must call startApplePaySession
-   * inside this callback to preserve the browser's user-gesture chain — Safari
-   * requires new ApplePaySession() to execute within the original click stack.
-   *
-   * reCAPTCHA tokens are guaranteed non-null here: the CTA remains disabled
-   * until the token pre-fetch resolves, so this callback is never reached
-   * without valid tokens.
+   * Callback invoked synchronously from the CTA click handler.
+   * Receives a Promise of reCAPTCHA tokens — the promise is already in-flight
+   * by the time this is called. The caller (ApplePayButton) must call
+   * new ApplePaySession() synchronously inside this callback to stay within
+   * Safari's user-gesture window. The token promise resolves before
+   * onPaymentAuthorized fires (user still needs to authenticate on the sheet).
    */
   onConfirm = null;
   set offer(value) {
@@ -942,28 +941,32 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
         }
       });
     }
-    if (this.#recaptchaTokensPromise) {
-      if (cta) {
-        cta.setAttribute("disabled", "");
-        cta.setAttribute("aria-disabled", "true");
-        cta.setAttribute("aria-busy", "true");
+    cta?.addEventListener("click", () => {
+      if (cta.disabled) return;
+      if (isUS && checkbox && !checkbox.checked) {
+        errorElement?.classList.add("apm__error--visible");
+        checkboxLabel?.classList.add("apm__checkbox-label--error");
+        return;
       }
-      this.#recaptchaTokensPromise.then((tokens) => {
-        this.#recaptchaTokens = tokens;
-        if (cta) {
-          cta.removeAttribute("disabled");
-          cta.removeAttribute("aria-disabled");
-          cta.removeAttribute("aria-busy");
-        }
-      }).catch(() => {
-        if (cta) {
-          cta.removeAttribute("aria-busy");
-        }
+      errorElement?.classList.remove("apm__error--visible");
+      this.querySelector('[role="alert"]:not(#apple-pay-modal-error)')?.remove();
+      cta.disabled = true;
+      cta.setAttribute("aria-busy", "true");
+      const recaptchaTokensPromise = getPurchaseRecaptchaTokens();
+      if (!this.#isClosed && this.onConfirm) {
+        this.onConfirm(recaptchaTokensPromise);
+        this.close();
+      }
+      recaptchaTokensPromise.catch(() => {
+        if (this.#isClosed) return;
+        cta.disabled = false;
+        cta.removeAttribute("aria-busy");
         const existingError = this.querySelector("#apple-pay-modal-error");
         if (existingError) {
           const icon = existingError.querySelector("svg");
           existingError.textContent = MSG_RECAPTCHA_LOAD_ERROR;
           if (icon) existingError.prepend(icon);
+          existingError.setAttribute("role", "alert");
           existingError.classList.add("apm__error--visible");
         } else {
           const errorNotice = document.createElement("div");
@@ -973,25 +976,14 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
           cta?.insertAdjacentElement("beforebegin", errorNotice);
         }
       });
-    }
-    cta?.addEventListener("click", () => {
-      if (isUS && checkbox && !checkbox.checked) {
-        errorElement?.classList.add("apm__error--visible");
-        checkboxLabel?.classList.add("apm__checkbox-label--error");
-        return;
-      }
-      if (this.#recaptchaTokens) {
-        this.onConfirm?.(this.#recaptchaTokens);
-        this.close();
-      }
     });
     this.querySelector("#apple-pay-modal-close")?.addEventListener(
       "click",
       () => this.close()
     );
   }
-  open(recaptchaTokensPromise) {
-    this.#recaptchaTokensPromise = recaptchaTokensPromise ?? getPurchaseRecaptchaTokens();
+  open() {
+    this.#isClosed = false;
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -1006,6 +998,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     this.querySelector("#apple-pay-modal")?.focus();
   }
   close() {
+    this.#isClosed = true;
     if (this.#keyHandler) {
       document.removeEventListener("keydown", this.#keyHandler, {
         capture: true
@@ -1019,8 +1012,27 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
 
 // src/templates/apple-pay-button.template.html
 var apple_pay_button_template_default = `<style>
-  /* Use CSS variables for layout so parent walls can easily override placement and sizing */
+  /*
+   * Entry CTA only: \u201CSubscribe with [apple logo] Apple Pay\u201D.
+   * Uses OS SF Pro via local() (no Marber). Modal styling is unchanged.
+   */
+  @font-face {
+    font-family: 'WAP Apple Pay Text';
+    src:
+      local('SF Pro Text Light'),
+      local('SFProText-Light'),
+      local('SF Pro Text'),
+      local('SFProText-Regular'),
+      local('-apple-system'),
+      local('BlinkMacSystemFont'),
+      local('Helvetica Neue');
+    font-weight: 300;
+    font-style: normal;
+    font-display: swap;
+  }
+
   teg-apple-pay-button {
+    --wap-apple-pay-scale: 1.375; /* default height 44px / 32 */
     display: block;
     margin: var(--apple-pay-margin, 0);
     width: 100%;
@@ -1036,27 +1048,43 @@ var apple_pay_button_template_default = `<style>
   }
 
   teg-apple-pay-button .apple-pay-btn {
-    display: flex;
+    display: inline-flex;
     align-items: center;
     justify-content: center;
-    gap: 0.375rem;
     width: 100%;
     min-width: 0;
     height: 100%;
     min-height: var(--apple-pay-height, 2.75rem);
+    padding: 0 calc(8px * var(--wap-apple-pay-scale));
+    box-sizing: border-box;
     background-color: var(--apple-pay-background-color, #000);
     color: var(--apple-pay-foreground-color, #fff);
     border: none;
-    border-radius: var(--apple-pay-border-radius, 1.375rem);
+    border-radius: var(--apple-pay-border-radius, 5px);
     cursor: pointer;
-    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));
-    font-size: 1.0625rem;
-    font-weight: 500;
+    font-family: 'WAP Apple Pay Text', -apple-system, BlinkMacSystemFont,
+      'SF Pro Text', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    font-size: calc(12px * var(--wap-apple-pay-scale));
+    font-weight: 300;
+    font-style: normal;
+    line-height: 1;
+    letter-spacing: -0.01em;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+
+  teg-apple-pay-button .apple-pay-btn__label {
+    display: inline-flex;
+    align-items: center;
+    gap: calc(4px * var(--wap-apple-pay-scale));
+    white-space: nowrap;
   }
 
-  teg-apple-pay-button .apple-pay-btn svg {
+  teg-apple-pay-button .apple-pay-btn__apple-logo {
     flex-shrink: 0;
     display: block;
+    width: calc(12px * var(--wap-apple-pay-scale));
+    height: calc(14px * var(--wap-apple-pay-scale));
     color: currentColor;
   }
 
@@ -1065,6 +1093,10 @@ var apple_pay_button_template_default = `<style>
     cursor: default;
   }
 
+  teg-apple-pay-button .apple-pay-btn.wap-loading .apple-pay-btn__label {
+    visibility: hidden;
+  }
+
   teg-apple-pay-button .apple-pay-btn.wap-loading::before {
     content: '';
     position: absolute;
@@ -1078,11 +1110,6 @@ var apple_pay_button_template_default = `<style>
     animation: wap-button-spinner 0.8s linear infinite;
   }
 
-  teg-apple-pay-button .apple-pay-btn__logo {
-    display: inline-flex;
-    align-items: center;
-  }
-
   teg-apple-pay-button .apple-pay-btn__loading {
     display: none;
   }
@@ -1097,17 +1124,26 @@ var apple_pay_button_template_default = `<style>
   }
 </style>
 
-<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">
+<div class="apple-pay-container" aria-label="Subscribe with Apple Pay">
   <button
     class="apple-pay-btn"
     type="button"
-    aria-label="Pay with Apple Pay"
+    aria-label="Subscribe with Apple Pay"
     data-analytics="paywall:apple-pay-checkout"
   >
-    <span class="apple-pay-btn__logo">
-      <svg width="51" height="22" aria-label="Apple Pay" role="img">
-        <use href="#apple-pay-logo" />
+    <span class="apple-pay-btn__label">
+      Subscribe with
+      <svg
+        class="apple-pay-btn__apple-logo"
+        width="17"
+        height="19"
+        viewBox="0 0 15 18"
+        aria-hidden="true"
+        role="img"
+      >
+        <use href="#apple-logo" />
       </svg>
+      Apple Pay
     </span>
     <span class="apple-pay-btn__loading" aria-hidden="true">Loading...</span>
   </button>
@@ -1418,7 +1454,10 @@ function startApplePaySession(config) {
     };
     session.onpaymentauthorized = (event) => {
       trackWalletPaymentAuthorised(config.skuId);
-      config.onPaymentAuthorized(event, session);
+      config.onPaymentAuthorized(event, session).catch(() => {
+        session.completePayment({ status: ApplePaySession.STATUS_FAILURE });
+        redirectToFallbackCheckout(config);
+      });
     };
     session.oncancel = () => {
       config.onCancel?.();
@@ -1969,7 +2008,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #returnUrl = "";
   #supportedBillingCountries = [];
   #entryPoint = "";
-  #recaptchaTokensPromise = null;
   // ─── Public API ─────────────────────────────────────────────────────────────
   get offer() {
     return this.#offer;
@@ -2034,7 +2072,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     this.#paymentOptions = null;
     this.#returnUrl = "";
     this.#supportedBillingCountries = [];
-    this.#recaptchaTokensPromise = null;
     this.querySelector(SEL_CONTAINER)?.remove();
   }
   // ─── Render pipeline ────────────────────────────────────────────────────────
@@ -2137,7 +2174,6 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     if (button) {
       button.classList.remove("wap-loading");
       this.#updateDisabledState();
-      this.#scheduleRecaptchaTokens();
       trackExpressWalletImpression(this.#offer.sku_id, {
         entryPoint: this.#entryPoint,
         country: this.#country
@@ -2174,27 +2210,10 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     }
     const skuId = this.#offer.sku_id;
     const country = this.#country;
-    modal.onConfirm = (recaptchaTokens) => {
-      this.#initiateApplePay(skuId, country, recaptchaTokens);
-      this.#scheduleRecaptchaTokens();
+    modal.onConfirm = (recaptchaTokensPromise) => {
+      this.#initiateApplePay(skuId, country, recaptchaTokensPromise);
     };
-    modal.open(this.#recaptchaTokensPromise);
-  }
-  /**
-   * Starts a fresh reCAPTCHA token pre-fetch and stores its promise.
-   * If the fetch rejects, the field is cleared so the next `modal.open()` call
-   * falls back to a new attempt via the modal's own null-fallback path — preventing
-   * a single transient failure from permanently disabling the CTA on all retries.
-   * The identity guard prevents a late rejection from clobbering a newer attempt.
-   */
-  #scheduleRecaptchaTokens() {
-    const attempt = getPurchaseRecaptchaTokens();
-    attempt.catch(() => {
-      if (this.#recaptchaTokensPromise === attempt) {
-        this.#recaptchaTokensPromise = null;
-      }
-    });
-    this.#recaptchaTokensPromise = attempt;
+    modal.open();
   }
   async #fetchSession() {
     try {
@@ -2215,7 +2234,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       return null;
     }
   }
-  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokens) {
+  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokensPromise) {
     const offer = this.#offer;
     const totalAmount = offer.price?.purchase ? `${offer.price.purchase}` : DEFAULT_TOTAL;
     return {
@@ -2227,30 +2246,41 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       skuId,
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
-      onPaymentAuthorized: (event, session) => handlePaymentAuthorized(event, session, sessionData, {
-        skuId,
-        country,
-        currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-        returnUrl: this.#returnUrl,
-        supportedBillingCountries: this.#supportedBillingCountries,
-        recaptchaTokens
-      })
+      onPaymentAuthorized: async (event, session) => {
+        const recaptchaTokens = await recaptchaTokensPromise;
+        return handlePaymentAuthorized(event, session, sessionData, {
+          skuId,
+          country,
+          currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
+          returnUrl: this.#returnUrl,
+          supportedBillingCountries: this.#supportedBillingCountries,
+          recaptchaTokens
+        });
+      }
     };
   }
-  #initiateApplePay(skuId, country, recaptchaTokens) {
+  #initiateApplePay(skuId, country, recaptchaTokensPromise) {
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
+      if (!paymentOptions) {
+        return;
+      }
       startApplePaySession(
         this.#buildSessionParams(
           skuId,
           country,
           sessionData,
           paymentOptions,
-          recaptchaTokens
+          recaptchaTokensPromise
         )
       );
     } catch {
+      redirectToFallbackCheckout({
+        returnUrl: this.#returnUrl,
+        skuId,
+        countryCode: country
+      });
     }
   }
 };