@automattic/newspack-blocks 4.11.0 → 4.12.0

package/dist/modal.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'ca25042ae4f3573f9bfc');
+<?php return array('dependencies' => array(), 'version' => 'b5f530bd0370ec7ca0ff');

package/dist/modal.js

@@ -1 +1 @@
-(()=>{"use strict";function e(e,t=!1){const n=e.querySelectorAll('button, [href], input:not([type="hidden"]), select, textarea, [tabindex]:not([tabindex="-1"])');if(0===n.length)return!1;const o=n?.[0];let c;o.focus(),t?(document.addEventListener("keydown",(function(e){if(("Tab"===e.key||9===e.keyCode)&&e.shiftKey&&document.activeElement===o){const n=t.contentWindow.document,o=n.getElementById("customer_details"),a=n.getElementById("after_customer_details"),r=n.getElementById("checkout-after-success");null!==r?c=r:null!==o.offsetParent?c=n.getElementById("checkout_continue"):null!==a.offsetParent&&(c=n.getElementById("checkout_back")),c.focus(),e.preventDefault()}})),document.getElementById("newspack-a11y-last-element").addEventListener("focus",(()=>{o.focus()}))):(c=n[n.length-1],document.addEventListener("keydown",(function(e){("Tab"===e.key||9===e.keyCode)&&(e.shiftKey?document.activeElement===o&&(c.focus(),e.preventDefault()):document.activeElement===c&&(o.focus(),e.preventDefault()))})))}const t=(e,t={})=>({...t,action:e}),n=(e,t="np_modal_checkout_interaction")=>{"function"==typeof window.gtag&&e&&window.gtag("event",t,e)},o=e=>{if("function"!=typeof window.gtag)return;let o="opened";const{action_type:c,amount:a="",currency:r,is_variable:i="",price:s="",product_id:l,product_type:d,recurrence:u,referrer:p,variation_id:m=""}=e,_={action_type:c,currency:r,product_id:l,product_type:d,referrer:p};(a||s)&&(_.amount=a||s),i&&(_.is_variable=i),m&&(_.variation_id=m),u&&(_.recurrence=u),i&&!m&&(o="opened_variations");const y=t(o,_);n(y)},c=e=>{if("function"!=typeof window.gtag)return;e=e||(e=>{const t=document.getElementById("newspack_modal_checkout"),n=!!t&&t.getAttribute("data-order-details");return!!n&&JSON.parse(n)||{}})();const{action_type:o,amount:c="",currency:a,price:r="",product_id:i,product_type:s,recurrence:l,referrer:d,variation_id:u=""}=e,p={action_type:o,currency:a,product_id:i,product_type:s,recurrence:l,referrer:d};(c||r)&&(p.amount=c||r),u&&(p.variation_id=u);const m=t("dismissed",p);n(m)};function a(e,t=null){const n=document.createElement("input");return n.type="hidden",n.name=e,t&&(n.value=t),n}const r=newspackBlocksModal.newspack_class_prefix,i="newspack_modal_checkout_iframe",s="newspack_modal_checkout_container",l=`${r}__modal`,d="newspack-blocks__modal-variation";let u={},p=!1;const m=e=>{e.overlayId&&window.newspackReaderActivation?.overlays&&window.newspackReaderActivation?.overlays.remove(e.overlayId),e.setAttribute("data-state","closed"),document.body.style.overflow="auto"};var _;window.onpageshow=e=>{e.persisted&&(document.querySelectorAll(".modal-processing").forEach((e=>e.classList.remove("modal-processing"))),document.querySelectorAll(".non-modal-checkout-loading").forEach((e=>e.classList.remove("non-modal-checkout-loading"))),document.querySelectorAll(`.${l}-container`).forEach((e=>m(e))))},_=()=>{const t=document.querySelector("#newspack_modal_checkout");if(!t)return;const n=t.querySelector(`.${l}__content`),_=a("modal_checkout","1"),y=n.querySelector(`.${r}__spinner`);let w=document.querySelector(".newspack-reader__account-link")?.[0];const h="600px",f=document.createElement("iframe");function k(){const n=f.contentWindow?.location;if(window.newspackReaderActivation&&n?.href?.includes("order-received")){const e=window.newspackReaderActivation,t=new Proxy(new URLSearchParams(n.search),{get:(e,t)=>e.get(t)});t.email&&(e.setReaderEmail(t.email),e.setAuthenticated(!0))}const o=f?.contentDocument?.querySelector(`#${s}`),c=()=>{E.observe(o),"none"!==y.style.display&&(y.style.display="none"),"visible"!==f.style.visibility&&(f.style.visibility="visible"),f._ready=!0};o&&(o.checkoutComplete?(window?.newspackReaderActivation?.refreshNewslettersSignupModal&&window?.newspackReaderActivation?.getReader()?.email&&window.newspackReaderActivation.refreshNewslettersSignupModal(window.newspackReaderActivation.getReader().email),R("small"),L(newspackBlocksModal.labels.thankyou_modal_title),c(),e(t.querySelector(`.${l}`))):(R(),L(newspackBlocksModal.labels.checkout_modal_title),f.contentWindow?.newspackBlocksModalCheckout?.checkout_nonce&&(t.checkout_nonce=f.contentWindow.newspackBlocksModalCheckout.checkout_nonce)),o.checkoutReady?c():o.addEventListener("checkout-ready",c))}f.name=i,f.style.height=h,f.style.visibility="hidden",f.addEventListener("load",k);const g=e=>new Promise(((t,n)=>{const o=new URLSearchParams(e);o.append("action","modal_checkout_request"),fetch(newspackBlocksModal.ajax_url+"?"+o.toString()).then((e=>{e.ok||n(e),e.json().then((e=>{t(e.url)})).catch(n)})).catch(n)})),v=()=>"undefined"!=typeof newspack_ras_config&&!newspack_ras_config?.is_logged_in&&!window?.newspackReaderActivation?.getReader?.()?.authenticated&&newspackBlocksModal?.is_registration_required&&window?.newspackReaderActivation?.openAuthModal,b=t=>{const n=!newspackBlocksModal.has_unsupported_payment_gateway;n||t.preventDefault();const s=t.target;s.classList.add("modal-processing");const l=s.dataset.product;if(l){const e=JSON.parse(l);Object.keys(e).forEach((t=>{0===s.querySelectorAll('input[name="'+t+'"]').length&&s.appendChild(a(t,e[t]))}))}const _=new FormData(s);_.get("variation_id")||(w=t.submitter);const y=document.querySelectorAll(`.${d}`);if(y.forEach((e=>{(v()||n)&&m(e)})),_.get("is_variable")&&!_.get("variation_id")){const n=[...y].find((e=>e.dataset.productId===_.get("product_id")));if(n){n.querySelectorAll(`form[target="${i}"]`).forEach((e=>{["after_success_behavior","after_success_url","after_success_button_label"].forEach((t=>{0===e.querySelectorAll('input[name="'+t+'"]').length&&e.appendChild(a(t,_.get(t)))}));const t=e.dataset.product;if(t){const n=JSON.parse(t);Object.keys(n).forEach((t=>{0===e.querySelectorAll('input[name="'+t+'"]').length&&e.appendChild(a(t,n[t]))}))}})),t.preventDefault(),s.classList.remove("modal-processing"),$(n),e(n,!1);const c=s.getAttribute("data-product");return u=c?JSON.parse(c):{},p||o(u),void document.getElementById("newspack_modal_checkout").setAttribute("data-order-details",JSON.stringify(u))}}if(!n&&!v())return g(_).then((e=>{window.location.href=e})),void((!_.get("is_variable")||_.get("variation_id"))&&s.querySelectorAll("button[type=submit]:focus").forEach((e=>{e.classList.add("non-modal-checkout-loading");const t=e.innerHTML;e.innerHTML="<span>"+t+"</span>"})));s.classList.remove("modal-processing");const h=_.get("newspack_donate"),f=_.get("newspack_checkout");if(f){const e=s.getAttribute("data-product");u=e?JSON.parse(e):{}}else if(h){const e=_.get("donation_frequency");let t="",n="";for(const n of _.keys())n.indexOf("donation_value_"+e)>=0&&"other"!==_.get(n)&&""!==_.get(n)&&(t=_.get(n));const o=JSON.parse(_.get("frequency_ids"));for(const t in o)t===e&&(n=o[t].toString());u={amount:t,action_type:"donation",currency:_.get("donation_currency"),product_id:n,product_type:"donation",recurrence:e,referrer:_.get("_wp_http_referer")}}if(p||o(u),p=!0,v()){t.preventDefault();let e="",o="0",a="";if(h){const e=_.get("donation_frequency"),t=s.querySelectorAll(`.donation-tier__${e}, .donation-frequency__${e}`);if(t?.length){const n=_.get("donation_tier_index");if(n){const o=JSON.parse(t?.[n].dataset.product);o.hasOwnProperty(`donation_price_summary_${e}`)&&(a=o[`donation_price_summary_${e}`])}else{const n=s.querySelectorAll(`input[name="donation_value_${e}"], input[name="donation_value_${e}_untiered"]`);n?.length&&(n.forEach((e=>{e.checked&&"other"!==e.value&&(o=e.value)})),t.forEach((t=>{const n=JSON.parse(t.dataset.product);if(n.hasOwnProperty(`donation_price_summary_${e}`)){const t=n[`donation_price_summary_${e}`];new RegExp(`(?<=\\D)${o}(?=\\D)`).test(t)&&(a=t)}if("0"===o&&a){let t=_.get(`donation_value_${e}_other`);t||(t=_.get(`donation_value_${e}_untiered`)),t&&(a=a.replace("0",t))}})))}}}else if(f){const e=s.querySelector('input[name="product_price_summary"]');e&&(a=e.value)}a&&(e=`<div class="order-details-summary ${r}__box ${r}__box--text-center"><p><strong>${a}</strong></p></div>`);const i=g(_);i.then((e=>{window.newspackReaderActivation?.setPendingCheckout?.(e)})),window.newspackReaderActivation.openAuthModal({title:newspackBlocksModal.labels.auth_modal_title,onSuccess:(e,t)=>{i.then((e=>{if(t?.registered&&n&&(e+=`&${newspackBlocksModal.checkout_registration_flag}=1`),n){const t=S(e);M(t)}else g(_).then(window.location.href=e)})).catch((e=>{console.warn("Unable to generate cart:",e),A()}))},onError:()=>{A()},onDismiss:()=>{c(u),p=!1,document.getElementById("newspack_modal_checkout").removeAttribute("data-order-details")},skipSuccess:!0,skipNewslettersSignup:!0,labels:{signin:{title:newspackBlocksModal.labels.signin_modal_title},register:{title:newspackBlocksModal.labels.register_modal_title}},content:e,trigger:t.submitter,closeOnSuccess:n})}else q(),document.getElementById("newspack_modal_checkout").setAttribute("data-order-details",JSON.stringify(u))},S=e=>{const t=document.createElement("form");t.method="POST",t.action=e,t.target=i,t.style.display="none";const n=document.createElement("button");return n.setAttribute("type","submit"),t.appendChild(n),document.body.appendChild(t),t.addEventListener("submit",b),t},E=new ResizeObserver((e=>{if(!e||!e.length)return;if(!f.contentDocument)return;const o=e[0].contentRect;if(o){const e=.01*Math.max(document.documentElement.clientHeight,window.innerHeight||0)*90-(t.querySelector(`.${l}__header`)?.offsetHeight||0),c=o.top+o.bottom,a=Math.min(c,e);if(0===a)return void(f.style.visibility="hidden");n.style.height=a+"px",f.style.height=a+"px"}})),A=()=>{const e=f?.contentDocument?.querySelector(`#${s}`),o=e?.querySelector('input[name="after_success_url"]'),a=e?.querySelector('input[name="after_success_behavior"]'),r=document?.querySelector(".newspack-newsletters-signup-modal");e?.checkoutComplete||(()=>{const e=new FormData;newspackBlocksModal.has_unsupported_payment_gateway||e.append("modal_checkout","1"),e.append("action","abandon_modal_checkout"),e.append("_wpnonce",t.checkout_nonce),t.checkout_nonce=null,fetch(newspackBlocksModal.ajax_url,{method:"POST",body:e})})();const i=!(f.contentDocument&&o&&a&&e?.checkoutComplete);if((i||r)&&(y.style.display="flex",f&&n.contains(f)&&(f._ready=!1,f.src="about:blank",f.style.height=h,f.style.visibility="hidden",n.style.height=h,n.removeChild(f)),E&&E.disconnect(),document.querySelectorAll(`.${l}-container`).forEach((e=>m(e))),w&&w.focus()),e?.checkoutComplete){const e=()=>{if(o&&a){const e=o.getAttribute("value"),t=a.getAttribute("value");"custom"===t?window.location.href=e:"referrer"===t&&window.history.back()}window?.newspackReaderActivation?.setPendingCheckout?.(),p=!1};window?.newspackReaderActivation?.openNewslettersSignupModal?window.newspackReaderActivation.openNewslettersSignupModal({onSuccess:e,onError:e,closeOnSuccess:i}):e(),i&&(R(),L(newspackBlocksModal.labels.checkout_modal_title))}else window?.newspackReaderActivation?.setPendingCheckout?.(),c(),p=!1,document.getElementById("newspack_modal_checkout").removeAttribute("data-order-details")},q=()=>{y.style.display="flex",$(t),n.appendChild(f),t.addEventListener("click",(e=>{e.target===t&&A()})),e(t,f),function(e){f._readyTimer&&clearTimeout(f._readyTimer);let t=!1;function n(){t||(t=!0,clearTimeout(f._readyTimer),e.call(this))}function o(){"complete"===this.readyState&&n.call(this)}!function e(){if(f._ready)return void clearTimeout(f._readyTimer);const t=f.contentDocument||f.contentWindow?.document;t&&0!==t.URL.indexOf("about:")?"complete"===t?.readyState?n.call(t):(t.addEventListener("DOMContentLoaded",n),t.addEventListener("readystatechange",o)):f._readyTimer=setTimeout(e,10)}()}(k)},$=e=>{window.newspackReaderActivation?.overlays&&(e.overlayId=window.newspackReaderActivation?.overlays.add()),e.setAttribute("data-state","open"),document.body.style.overflow="hidden"},L=e=>{const n=t.querySelector(`.${l}__header h2`);n&&(n.innerText=e)},R=(e="default")=>{const n=t.querySelector(`.${l}`);n&&("small"===e?n.classList.add(`${l}--small`):n.classList.remove(`${l}--small`))};window.newspackCloseModalCheckout=A,t.querySelectorAll(`.${l}__close`).forEach((e=>{e.addEventListener("click",(e=>{e.preventDefault(),A()}))})),document.querySelectorAll(".newspack-blocks__modal-variation").forEach((e=>{e.addEventListener("click",(t=>{t.target===e&&A()})),e.querySelectorAll(`.${l}__close`).forEach((e=>{e.addEventListener("click",(e=>{e.preventDefault(),A()}))}))})),document.addEventListener("keydown",(function(e){"Escape"===e.key&&A()})),document.querySelectorAll(".wpbnbd.wpbnbd--platform-wc, .wp-block-newspack-blocks-checkout-button, .newspack-blocks__modal-variation").forEach((e=>{e.querySelectorAll("form").forEach((e=>{newspackBlocksModal.has_unsupported_payment_gateway||e.appendChild(_.cloneNode()),e.target=i,e.addEventListener("submit",b)}))}));const M=e=>{e.requestSubmit(e.querySelector('button[type="submit"]'))};(()=>{const e=new URLSearchParams(window.location.search);if(!e.has("checkout"))return;const t=e.get("type");if("donate"===t){const t=e.get("layout"),n=e.get("frequency"),o=e.get("amount"),c=e.get("other");t&&n&&o&&((e,t,n,o=null)=>{let c;document.querySelectorAll(".wpbnbd.wpbnbd--platform-wc form").forEach((a=>{const r=a.querySelector(`input[name="donation_frequency"][value="${t}"]`);if(r)if("tiered"===e){const e=document.querySelector(`button[data-frequency-slug="${t}"]`);if(!e)return;e.click();const o=a.querySelector(`button[type="submit"][name="donation_value_${t}"][value="${n}"]`);if(!o)return;o.click()}else{const i="untiered"===e?a.querySelector(`input[name="donation_value_${t}_untiered"]`):a.querySelector(`input[name="donation_value_${t}"][value="${n}"]`);if(r&&i){if(r.checked=!0,"untiered"===e)i.value=n;else if("other"===n){i.click();const e=a.querySelector(`input[name="donation_value_${t}_other"]`);e&&o&&(e.value=o)}else i.checked=!0;c=a}}})),c&&M(c)})(t,n,o,c)}else if("checkout_button"===t){const t=e.get("product_id"),n=e.get("variation_id");t&&((e,t=null)=>{let n;if(t&&t!==e){const o=[...document.querySelectorAll(`.${d}`)].find((t=>t.dataset.productId===e));o&&o.querySelectorAll(`form[target="${i}"]`).forEach((e=>{const o=JSON.parse(e.dataset.product);o?.variation_id===Number(t)&&(n=e)}))}else document.querySelectorAll(".wp-block-newspack-blocks-checkout-button").forEach((t=>{const o=t.querySelector("form");if(!o)return;const c=JSON.parse(o.dataset.product);c?.product_id===e&&(n=o)}));n&&M(n)})(t,n)}else{const e=window.newspackReaderActivation?.getPendingCheckout?.();if(e){const t=S(e);M(t)}}window.history.replaceState(null,null,window.location.pathname)})()},"undefined"!=typeof document&&("complete"!==document.readyState&&"interactive"!==document.readyState?document.addEventListener("DOMContentLoaded",_):_())})();
+(()=>{"use strict";function e(e,t=!1){const n=e.querySelectorAll('button, [href], input:not([type="hidden"]), select, textarea, [tabindex]:not([tabindex="-1"])');if(0===n.length)return!1;const o=n?.[0];let c;o.focus(),t?(document.addEventListener("keydown",(function(e){if(("Tab"===e.key||9===e.keyCode)&&e.shiftKey&&document.activeElement===o){const n=t.contentWindow.document,o=n.getElementById("customer_details"),a=n.getElementById("after_customer_details"),r=n.getElementById("checkout-after-success");null!==r?c=r:null!==o.offsetParent?c=n.getElementById("checkout_continue"):null!==a.offsetParent&&(c=n.getElementById("checkout_back")),c.focus(),e.preventDefault()}})),document.getElementById("newspack-a11y-last-element").addEventListener("focus",(()=>{o.focus()}))):(c=n[n.length-1],document.addEventListener("keydown",(function(e){("Tab"===e.key||9===e.keyCode)&&(e.shiftKey?document.activeElement===o&&(c.focus(),e.preventDefault()):document.activeElement===c&&(o.focus(),e.preventDefault()))})))}const t=(e,t={})=>({...t,action:e}),n=(e,t="np_modal_checkout_interaction")=>{"function"==typeof window.gtag&&e&&window.gtag("event",t,e)},o=e=>{const t=document.getElementById(e),n=!!t&&t.getAttribute("data-order-details");return!!n&&JSON.parse(n)||{}},c=e=>{if("function"!=typeof window.gtag)return;let o="opened";const{amount:c="",is_variable:a="",price:r="",variation_id:i=""}=e,s={...e};(c||r)&&(s.amount=c||r),a&&!i&&(o="opened_variations");const l=t(o,s);n(l)},a=e=>{if("function"!=typeof window.gtag)return;e=e||o("newspack_modal_checkout");const c=t("dismissed",e);n(c)};function r(e,t=null){const n=document.createElement("input");return n.type="hidden",n.name=e,t&&(n.value=t),n}const i=newspackBlocksModal.newspack_class_prefix,s="newspack_modal_checkout_iframe",l="newspack_modal_checkout_container",d="newspack_modal_checkout",u=`${i}__modal`,p="newspack-blocks__modal-variation";let m={},_=!1;const w=e=>{e.overlayId&&window.newspackReaderActivation?.overlays&&window.newspackReaderActivation?.overlays.remove(e.overlayId),e.setAttribute("data-state","closed"),document.body.style.overflow="auto"};var h;window.onpageshow=e=>{e.persisted&&(document.querySelectorAll(".modal-processing").forEach((e=>e.classList.remove("modal-processing"))),document.querySelectorAll(".non-modal-checkout-loading").forEach((e=>e.classList.remove("non-modal-checkout-loading"))),document.querySelectorAll(`.${u}-container`).forEach((e=>w(e))))},h=()=>{const t=document.querySelector(`#${d}`);if(!t)return;const n=t.querySelector(`.${u}__content`),h=r("modal_checkout","1"),y=n.querySelector(`.${i}__spinner`);let f=document.querySelector(".newspack-reader__account-link")?.[0];const k="600px",g=document.createElement("iframe");function v(){const n=g.contentWindow?.location;if(window.newspackReaderActivation&&n?.href?.includes("order-received")){const e=window.newspackReaderActivation,t=new Proxy(new URLSearchParams(n.search),{get:(e,t)=>e.get(t)});t.email&&(e.setReaderEmail(t.email),e.setAuthenticated(!0))}const c=g?.contentDocument?.querySelector(`#${l}`),a=()=>{q.observe(c),"none"!==y.style.display&&(y.style.display="none"),"visible"!==g.style.visibility&&(g.style.visibility="visible"),g._ready=!0};if(c){if(c.checkoutComplete){const n=o(d);window.newspackRAS=window.newspackRAS||[],window.newspackRAS.push((function(e){e.dispatchActivity("checkout_completed",n)})),window?.newspackReaderActivation?.refreshNewslettersSignupModal&&window?.newspackReaderActivation?.getReader()?.email&&window.newspackReaderActivation.refreshNewslettersSignupModal(window.newspackReaderActivation.getReader().email),B("small"),M(newspackBlocksModal.labels.thankyou_modal_title),a(),e(t.querySelector(`.${u}`))}else B(),M(newspackBlocksModal.labels.checkout_modal_title),g.contentWindow?.newspackBlocksModalCheckout?.checkout_nonce&&(t.checkout_nonce=g.contentWindow.newspackBlocksModalCheckout.checkout_nonce);c.checkoutReady?a():c.addEventListener("checkout-ready",a)}}g.name=s,g.style.height=k,g.style.visibility="hidden",g.addEventListener("load",v);const b=e=>new Promise(((t,n)=>{const o=new URLSearchParams(e);o.append("action","modal_checkout_request"),fetch(newspackBlocksModal.ajax_url+"?"+o.toString()).then((e=>{e.ok||n(e),e.json().then((e=>{t(e.url)})).catch(n)})).catch(n)})),S=()=>"undefined"!=typeof newspack_ras_config&&!newspack_ras_config?.is_logged_in&&!window?.newspackReaderActivation?.getReader?.()?.authenticated&&newspackBlocksModal?.is_registration_required&&window?.newspackReaderActivation?.openAuthModal,A=t=>{const n=!newspackBlocksModal.has_unsupported_payment_gateway;n||t.preventDefault();const o=t.target;o.classList.add("modal-processing");const l=o.dataset.product;if(l){const e=JSON.parse(l);Object.keys(e).forEach((t=>{0===o.querySelectorAll('input[name="'+t+'"]').length&&o.appendChild(r(t,e[t]))}))}const d=new FormData(o);d.get("variation_id")||(f=t.submitter);const u=document.querySelectorAll(`.${p}`);if(u.forEach((e=>{(S()||n)&&w(e)})),d.get("is_variable")&&!d.get("variation_id")){const n=[...u].find((e=>e.dataset.productId===d.get("product_id")));if(n){n.querySelectorAll(`form[target="${s}"]`).forEach((e=>{["after_success_behavior","after_success_url","after_success_button_label"].forEach((t=>{0===e.querySelectorAll('input[name="'+t+'"]').length&&e.appendChild(r(t,d.get(t)))}));const t=e.dataset.product;if(t){const n=JSON.parse(t);Object.keys(n).forEach((t=>{0===e.querySelectorAll('input[name="'+t+'"]').length&&e.appendChild(r(t,n[t]))}))}})),t.preventDefault(),o.classList.remove("modal-processing"),L(n),e(n,!1);const a=o.getAttribute("data-product");return m=a?JSON.parse(a):{},_||c(m),void document.getElementById("newspack_modal_checkout").setAttribute("data-order-details",JSON.stringify(m))}}if(!n&&!S())return b(d).then((e=>{window.location.href=e})),void((!d.get("is_variable")||d.get("variation_id"))&&o.querySelectorAll("button[type=submit]:focus").forEach((e=>{e.classList.add("non-modal-checkout-loading");const t=e.innerHTML;e.innerHTML="<span>"+t+"</span>"})));o.classList.remove("modal-processing");const h=d.get("newspack_donate"),y=d.get("newspack_checkout");if(y){const e=o.getAttribute("data-product");m=e?JSON.parse(e):{}}else if(h){const e=d.get("donation_frequency");let t="",n="";for(const n of d.keys())n.indexOf("donation_value_"+e)>=0&&"other"!==d.get(n)&&""!==d.get(n)&&(t=d.get(n));const o=JSON.parse(d.get("frequency_ids"));for(const t in o)t===e&&(n=o[t].toString());m={amount:t,action_type:"donation",currency:d.get("donation_currency"),product_id:n,product_type:"donation",recurrence:e,referrer:d.get("_wp_http_referer")}}const k=d.get("memberships_content_gate");k&&(m.gate_post_id=k);const g=d.get("newspack_popup_id");if(g&&(m.newspack_popup_id=g),_||c(m),_=!0,S()){t.preventDefault();let e="",c="0",r="";if(h){const e=d.get("donation_frequency"),t=o.querySelectorAll(`.donation-tier__${e}, .donation-frequency__${e}`);if(t?.length){const n=d.get("donation_tier_index");if(n){const o=JSON.parse(t?.[n].dataset.product);o.hasOwnProperty(`donation_price_summary_${e}`)&&(r=o[`donation_price_summary_${e}`])}else{const n=o.querySelectorAll(`input[name="donation_value_${e}"], input[name="donation_value_${e}_untiered"]`);n?.length&&(n.forEach((e=>{e.checked&&"other"!==e.value&&(c=e.value)})),t.forEach((t=>{const n=JSON.parse(t.dataset.product);if(n.hasOwnProperty(`donation_price_summary_${e}`)){const t=n[`donation_price_summary_${e}`];new RegExp(`(?<=\\D)${c}(?=\\D)`).test(t)&&(r=t)}if("0"===c&&r){let t=d.get(`donation_value_${e}_other`);t||(t=d.get(`donation_value_${e}_untiered`)),t&&(r=r.replace("0",t))}})))}}}else if(y){const e=o.querySelector('input[name="product_price_summary"]');e&&(r=e.value)}r&&(e=`<div class="order-details-summary ${i}__box ${i}__box--text-center"><p><strong>${r}</strong></p></div>`);const s=b(d);s.then((e=>{window.newspackReaderActivation?.setPendingCheckout?.(e)})),window.newspackReaderActivation.openAuthModal({title:newspackBlocksModal.labels.auth_modal_title,onSuccess:(e,t)=>{s.then((e=>{if(t?.registered&&n&&(e+=`&${newspackBlocksModal.checkout_registration_flag}=1`),n){const t=E(e);O(t)}else b(d).then(window.location.href=e)})).catch((e=>{console.warn("Unable to generate cart:",e),$()}))},onError:()=>{$()},onDismiss:()=>{a(m),_=!1,document.getElementById("newspack_modal_checkout").removeAttribute("data-order-details")},skipSuccess:!0,skipNewslettersSignup:!0,labels:{signin:{title:newspackBlocksModal.labels.signin_modal_title},register:{title:newspackBlocksModal.labels.register_modal_title}},content:e,trigger:t.submitter,closeOnSuccess:n})}else R(),document.getElementById("newspack_modal_checkout").setAttribute("data-order-details",JSON.stringify(m))},E=e=>{const t=document.createElement("form");t.method="POST",t.action=e,t.target=s,t.style.display="none";const n=document.createElement("button");return n.setAttribute("type","submit"),t.appendChild(n),document.body.appendChild(t),t.addEventListener("submit",A),t},q=new ResizeObserver((e=>{if(!e||!e.length)return;if(!g.contentDocument)return;const o=e[0].contentRect;if(o){const e=.01*Math.max(document.documentElement.clientHeight,window.innerHeight||0)*90-(t.querySelector(`.${u}__header`)?.offsetHeight||0),c=o.top+o.bottom,a=Math.min(c,e);if(0===a)return void(g.style.visibility="hidden");n.style.height=a+"px",g.style.height=a+"px"}})),$=()=>{const e=g?.contentDocument?.querySelector(`#${l}`),o=e?.querySelector('input[name="after_success_url"]'),c=e?.querySelector('input[name="after_success_behavior"]'),r=document?.querySelector(".newspack-newsletters-signup-modal");e?.checkoutComplete||(()=>{const e=new FormData;newspackBlocksModal.has_unsupported_payment_gateway||e.append("modal_checkout","1"),e.append("action","abandon_modal_checkout"),e.append("_wpnonce",t.checkout_nonce),t.checkout_nonce=null,fetch(newspackBlocksModal.ajax_url,{method:"POST",body:e})})();const i=!(g.contentDocument&&o&&c&&e?.checkoutComplete);if((i||r)&&(y.style.display="flex",g&&n.contains(g)&&(g._ready=!1,g.src="about:blank",g.style.height=k,g.style.visibility="hidden",n.style.height=k,n.removeChild(g)),q&&q.disconnect(),document.querySelectorAll(`.${u}-container`).forEach((e=>w(e))),f&&f.focus()),e?.checkoutComplete){const e=()=>{if(o&&c){const e=o.getAttribute("value"),t=c.getAttribute("value");"custom"===t?window.location.href=e:"referrer"===t&&window.history.back()}window?.newspackReaderActivation?.setPendingCheckout?.(),_=!1};window?.newspackReaderActivation?.openNewslettersSignupModal?window.newspackReaderActivation.openNewslettersSignupModal({onSuccess:e,onError:e,closeOnSuccess:i}):e(),i&&(B(),M(newspackBlocksModal.labels.checkout_modal_title))}else window?.newspackReaderActivation?.setPendingCheckout?.(),a(),_=!1,document.getElementById("newspack_modal_checkout").removeAttribute("data-order-details")},R=()=>{y.style.display="flex",L(t),n.appendChild(g),t.addEventListener("click",(e=>{e.target===t&&$()})),e(t,g),function(e){g._readyTimer&&clearTimeout(g._readyTimer);let t=!1;function n(){t||(t=!0,clearTimeout(g._readyTimer),e.call(this))}function o(){"complete"===this.readyState&&n.call(this)}!function e(){if(g._ready)return void clearTimeout(g._readyTimer);const t=g.contentDocument||g.contentWindow?.document;t&&0!==t.URL.indexOf("about:")?"complete"===t?.readyState?n.call(t):(t.addEventListener("DOMContentLoaded",n),t.addEventListener("readystatechange",o)):g._readyTimer=setTimeout(e,10)}()}(v)},L=e=>{window.newspackReaderActivation?.overlays&&(e.overlayId=window.newspackReaderActivation?.overlays.add()),e.setAttribute("data-state","open"),document.body.style.overflow="hidden"},M=e=>{const n=t.querySelector(`.${u}__header h2`);n&&(n.innerText=e)},B=(e="default")=>{const n=t.querySelector(`.${u}`);n&&("small"===e?n.classList.add(`${u}--small`):n.classList.remove(`${u}--small`))};window.newspackCloseModalCheckout=$,t.querySelectorAll(`.${u}__close`).forEach((e=>{e.addEventListener("click",(e=>{e.preventDefault(),$()}))})),document.querySelectorAll(".newspack-blocks__modal-variation").forEach((e=>{e.addEventListener("click",(t=>{t.target===e&&$()})),e.querySelectorAll(`.${u}__close`).forEach((e=>{e.addEventListener("click",(e=>{e.preventDefault(),$()}))}))})),document.addEventListener("keydown",(function(e){"Escape"===e.key&&$()})),document.querySelectorAll(".wpbnbd.wpbnbd--platform-wc, .wp-block-newspack-blocks-checkout-button, .newspack-blocks__modal-variation").forEach((e=>{e.querySelectorAll("form").forEach((e=>{newspackBlocksModal.has_unsupported_payment_gateway||e.appendChild(h.cloneNode()),e.target=s,e.addEventListener("submit",A)}))}));const O=e=>{e.requestSubmit(e.querySelector('button[type="submit"]'))};(()=>{const e=new URLSearchParams(window.location.search);if(!e.has("checkout"))return;const t=e.get("type");if("donate"===t){const t=e.get("layout"),n=e.get("frequency"),o=e.get("amount"),c=e.get("other");t&&n&&o&&((e,t,n,o=null)=>{let c;document.querySelectorAll(".wpbnbd.wpbnbd--platform-wc form").forEach((a=>{const r=a.querySelector(`input[name="donation_frequency"][value="${t}"]`);if(r)if("tiered"===e){const e=document.querySelector(`button[data-frequency-slug="${t}"]`);if(!e)return;e.click();const o=a.querySelector(`button[type="submit"][name="donation_value_${t}"][value="${n}"]`);if(!o)return;o.click()}else{const i="untiered"===e?a.querySelector(`input[name="donation_value_${t}_untiered"]`):a.querySelector(`input[name="donation_value_${t}"][value="${n}"]`);if(r&&i){if(r.checked=!0,"untiered"===e)i.value=n;else if("other"===n){i.click();const e=a.querySelector(`input[name="donation_value_${t}_other"]`);e&&o&&(e.value=o)}else i.checked=!0;c=a}}})),c&&O(c)})(t,n,o,c)}else if("checkout_button"===t){const t=e.get("product_id"),n=e.get("variation_id");t&&((e,t=null)=>{let n;if(t&&t!==e){const o=[...document.querySelectorAll(`.${p}`)].find((t=>t.dataset.productId===e));o&&o.querySelectorAll(`form[target="${s}"]`).forEach((e=>{const o=JSON.parse(e.dataset.product);o?.variation_id===Number(t)&&(n=e)}))}else document.querySelectorAll(".wp-block-newspack-blocks-checkout-button").forEach((t=>{const o=t.querySelector("form");if(!o)return;const c=JSON.parse(o.dataset.product);c?.product_id===e&&(n=o)}));n&&O(n)})(t,n)}else{const e=window.newspackReaderActivation?.getPendingCheckout?.();if(e){const t=E(e);O(t)}}window.history.replaceState(null,null,window.location.pathname)})()},"undefined"!=typeof document&&("complete"!==document.readyState&&"interactive"!==document.readyState?document.addEventListener("DOMContentLoaded",h):h())})();

package/dist/modalCheckout.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'e30e3b91b298c26dec0a');
+<?php return array('dependencies' => array(), 'version' => 'f994d978f4aa233ad919');

package/dist/modalCheckout.js

@@ -1 +1 @@
-(()=>{"use strict";const e=(e,t={})=>({...t,action:e}),t=(e,t="np_modal_checkout_interaction")=>{"function"==typeof window.gtag&&e&&window.gtag("event",t,e)},o=e=>{const t=document.getElementById(e),o=!!t&&t.getAttribute("data-order-details");return!!o&&JSON.parse(o)||{}};function c(e){"undefined"!=typeof document&&"function"==typeof e&&("complete"!==document.readyState&&"interactive"!==document.readyState?document.addEventListener("DOMContentLoaded",e):e())}const n=(c="continue")=>{if("function"!=typeof window.gtag)return;const{action_type:n,amount:i,currency:r,product_id:a,product_type:s,recurrence:d,referrer:u,variation_id:l=""}=o("modal-checkout-product-details"),p={action_type:n,amount:i,currency:r,product_id:a,product_type:s,recurrence:d,referrer:u};l&&(p.variation_id=l);const _=e(c,p);t(_)};var i;i=jQuery,c((()=>{if(!i)return void console.warn("jQuery is not available.");const r=newspackBlocksModalCheckout.newspack_class_prefix,a=new CustomEvent("checkout-ready");function s(){i(`.woocommerce-NoticeGroup-checkout, .${r}__inline-error, .woocommerce-error, .woocommerce-message, .wc-block-components-notice-banner, .woocommerce-notices-wrapper`).remove()}function d(n=!0){const i=document.querySelector("#newspack_modal_checkout_container");i.checkoutReady=!0,i.dispatchEvent(a),n&&c((function(){if("function"!=typeof window.gtag)return;const{action_type:c,amount:n,currency:i,product_id:r,product_type:a,recurrence:s,referrer:d,variation_id:u=""}=o("modal-checkout-product-details"),l={action_type:c,amount:n,currency:i,product_id:r,product_type:a,recurrence:s,referrer:d};u&&(l.variation_id=u);const p=e("loaded",l);t(p)}))}if(newspackBlocksModalCheckout.is_checkout_complete){const l=document.querySelector("#newspack_modal_checkout_container");l&&(l.checkoutComplete=!0)}else{function p(){i("#wcpay-express-checkout-button-separator, #wc-stripe-payment-request-button-separator").after('<div class="newspack-ui__word-divider">'+newspackBlocksModalCheckout.divider_text+"</div>");let c=[];const a=i("form.checkout");if(!a.length)return void console.warn("Form is not available");const l=i("form.modal_checkout_coupon"),p=i("form.modal_checkout_nyp"),_=i("#checkout_continue"),m=i("#customer_details"),h=i("#after_customer_details"),f=i(".newspack-wcsg--wrapper");function g(){const e=i('input[name="payment_method"]:checked').val();i(".wc_payment_method").removeClass("selected"),i(".wc_payment_method.payment_method_"+e).addClass("selected")}function k(){let e;if(i.ajax({url:newspackBlocksModalCheckout.ajax_url,method:"POST",async:!1,data:{action:"get_cart_total"},success:t=>{e=t}}),e)return e}if(i('input[name="payment_method"]').change(g),i(document).on("payment_method_selected",g),i(document).on("updated_checkout",g),g(),i(document).on("updated_checkout",(function(){i("#payment .wc_payment_methods").length?i("#after_customer_details > h3").show():i("#after_customer_details > h3").hide()})),i(document).on("updated_checkout",(function(){const e=i("#after_customer_details > .order-review-wrapper");if(!e.length)return;const t=e.clone();i("#after_customer_details").hasClass("transaction-details-expanded")&&i('[id="order_review_heading"]',t).attr("aria-expanded","true"),i("#payment .order-review-wrapper").remove();const o=t.find("table");o.is(".empty")?t.addClass("hidden"):(o.unblock(),t.removeClass("hidden")),i(".payment_methods").after(t)})),i(document).on("click","#order_review_heading",(function(){i(this).attr("aria-expanded",(function(e,t){return"false"===t?"true":"false"})),i("#after_customer_details").toggleClass("transaction-details-expanded")})),i(document).on("updated_checkout",(function(){let e=newspackBlocksModalCheckout.labels.complete_button;if(e){if(i("#place_order").has(i("span.cart-price"))){const t=i("<div>"+e+"</div>");t.find(".cart-price").html(k,(function(){return this.childNodes})),e=t.html()}i("#place_order").html(e),i("#place_order_clone").html(e)}})),f.length){const e=f.find(".newspack-wcsg--gift-toggle input"),t=f.find(".newspack-wcsg--gift-email");e.on("change",(function(){e.is(":checked")?t.addClass("visible"):t.removeClass("visible")}))}function w(e){a.find(".input-text, select, input:checkbox").trigger("validate").trigger("blur");let t=!1;const o=[],c=e=>{const c=i("#"+e.data("id")+"_field");if(c?.length){t||(t=c);const o=c.find(".woocommerce-error");o.length&&o.remove(),c.addClass("woocommerce-invalid").removeClass("woocommerce-valid"),c.append(`<span class="${r}__inline-error">`+e.text()+"</span>"),e.remove()}else e.is("li")||(e=i("<li />").append(e)),o.push(e)};if(s(),0!==e.trimStart().indexOf("<")?c(i("<li />").append(e)):e.includes("<li")?i(e).find("li").each((function(){c(i(this))})):c(i(e)),o.length){t=!1;const e=i('<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-checkout"/>').append(i('<ul class="woocommerce-error" role="alert" />').append(o));a.prepend(e),e.get(0).scrollIntoView({behavior:"smooth"})}t?.length&&(window.scroll({top:t.offset().top-100,left:0,behavior:"smooth"}),t.find("input.input-text, select, input:checkbox").trigger("focus")),x(a),i(document.body).trigger("update_checkout"),i(document.body).trigger("checkout_error",[e])}function y(e){e.preventDefault(),e.stopImmediatePropagation(),b(),n("continue")}function v(e){const t=window.newspack_grecaptcha||{};if(s(),i("#checkout_details").remove(),e)a.attr("data-skip-recaptcha","1"),a.append('<input name="is_validation_only" type="hidden" value="1" />'),"v3"===t?.version&&t.destroy(a.get()),l.length&&l.hide(),p.length&&p.hide(),m.show(),h.hide(),m.find("input").first().focus(),c=function(e,t){const o=i._data(e,"events");return o?t?i._data(e,"events")[t]:o:[]}(a[0],"submit").slice(0),c.forEach((e=>{a.off("submit",e.handler)})),a.on("submit",y);else{a.removeAttr("data-skip-recaptcha");const e=a.find('[name="is_validation_only"]');if(e.length&&e.remove(),t?.render){a.data("newspack-recaptcha","newspack_modal_checkout");const e=()=>{s(),a.get(0).scrollIntoView({behavior:"smooth"})},o=e=>w(e);t.render(a.get(),e,o),i(document).on("updated_checkout",(()=>t.render(a.get(),e,o))),i(document.body).on("checkout_error",(()=>t.render(a.get(),e,o)))}l.length&&l.show(),p.length&&p.show(),m.hide(),h.show(),function(){i("#checkout_details").remove();const e={};a.serializeArray().forEach((t=>{e[t.name]=t.value}));const t=`${newspackBlocksModalCheckout.newspack_class_prefix}__font--xs`,o=[];o.push('<div class="billing-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.billing_details+"</h3>"),(e.billing_first_name||e.billing_last_name)&&o.push(`<p class="${t}">`+e.billing_first_name+" "+e.billing_last_name+"</p>"),e.billing_company&&o.push(`<p class="${t}">`+e.billing_company+"</p>");let c="";if((e.billing_address_1||e.billing_address_2)&&(c=`<p class="${t}">`,e.billing_address_1&&(c+=e.billing_address_1),e.billing_address_2&&(c+=" "+e.billing_address_2),c+="<br>",e.billing_city&&(c+=e.billing_city),e.billing_state&&(c+=", "+e.billing_state),e.billing_postcode&&(c+=" "+e.billing_postcode),c+="<br>",e.billing_country&&(c+=e.billing_country)),o.push(c),e.billing_email&&o.push(`<p class="${t}">`+e.billing_email+"</p>"),o.push("</div>"),e.hasOwnProperty("shipping_address_1")){o.push('<div class="shipping-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.shipping_details+"</h3>");let n="";e.ship_to_different_address?(n=`<p class="${t}">`,e.shipping_address_1&&(n+=e.shipping_address_1),e.shipping_address_2&&(n+=" "+e.shipping_address_2),n+="<br>",e.shipping_city&&(n+=e.shipping_city),e.shipping_state&&(n+=", "+e.shipping_state),e.shipping_postcode&&(n+=" "+e.shipping_postcode),n+="<br>",e.shipping_country&&(n+=e.shipping_country)):n=c,o.push(n),o.push("</div>")}e.hasOwnProperty("newspack_wcsg_is_gift")&&e.hasOwnProperty("wcsg_gift_recipients_email")&&e.newspack_wcsg_is_gift&&e.wcsg_gift_recipients_email&&(o.push('<div class="gift-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.gift_recipient+"</h3>"),o.push(`<p class="${t}">`+e.wcsg_gift_recipients_email+"</p>")),i(".order-details-summary").after('<div id="checkout_details">'+o.join("")+"</div>")}(),a.off("submit",y),c.forEach((e=>{a.on("submit",e.handler)})),u()}a.triggerHandler("editing_details",[e]),window.scroll({top:0,left:0,behavior:"smooth"})}function b(e=!1,t=(()=>{})){if(!C(a))return console.warn("Unable to block the form"),t(),!1;s();const o=a.find(".woocommerce-NoticeGroup.woocommerce-NoticeGroup-checkout");o.length&&o.remove();const c=["save_user_in_woopay"],d=a.serializeArray().filter((e=>!c.includes(e.name)));d.push({name:"woocommerce_checkout_update_totals",value:"1"}),i.ajax({type:"POST",url:wc_checkout_params.checkout_url,data:d,dataType:"html",success:o=>{let c;try{c=JSON.parse(o)}catch(e){c={messages:'<div class="woocommerce-error">'+wc_checkout_params.i18n_checkout_error+"</div>"}}e||!0!==c.reload?(x(a),c.messages?e||(c.messages?w(c.messages):w(`<div class="${r}__inline-error">`+wc_checkout_params.i18n_checkout_error+"</div>")):(v(!1),i._data(a[0],"events")?.click?.some((e=>"#checkout_back"===e.selector))||a.on("click","#checkout_back",(function(e){e.preventDefault(),v(!0),n("back")}))),t(c)):window.location.reload()},error:(o,c,n)=>{let i="";e||(i='<div class="woocommerce-error">'+(n||wc_checkout_params.i18n_checkout_error)+"</div>",w(i)),t({messages:i})}})}function C(e){return!e.is(".modal-processing")&&(e.find("button[type=submit]").each(((e,t)=>{i(t).attr("disabled",!0)})),e.addClass("modal-processing"),!0)}function x(e){return!!e.is(".modal-processing")&&(e.find("button[type=submit]").each(((e,t)=>{i(t).attr("disabled",!1)})),e.removeClass("modal-processing"),!0)}_.length?(v(!0),f.length?d():b(!0,d)):d(),l.length&&(l.on("submit",(function(e){if(e.preventDefault(),!C(l))return!1;const t={security:wc_checkout_params.apply_coupon_nonce,coupon_code:l.find('input[name="coupon_code"]').val()};i.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:t,dataType:"html",success:e=>{if(s(),l.find(".result").remove(),e){const o=e.includes("error");l.append(`<p class="result ${r}__helper-text ${o?r+"__inline-error":""}">`+i(e).text()+"</p>"),o?(l.find('input[name="coupon_code"]').focus(),l.find('h3, input[name="coupon_code"]').addClass("newspack-ui__field-error")):(l.find('input[name="coupon_code"]').focus(),l.find('h3, input[name="coupon_code"]').removeClass("newspack-ui__field-error")),i(document.body).trigger("applied_coupon_in_checkout",[t.coupon_code]),i(document.body).trigger("update_checkout",{update_shipping_method:!1})}},complete:()=>{x(l)}})})),i(document.body).on("removed_coupon_in_checkout",(()=>{s(),l.find(".result").remove(),l.find('input[name="coupon_code"]').val("").focus()}))),p.length&&p.on("submit",(function(e){if(e.preventDefault(),!C(p))return!1;const t=p.find('input[name="price"]');t.attr("disabled",!0);const o={_ajax_nonce:newspackBlocksModalCheckout.nyp_nonce,action:"process_name_your_price_request",price:p.find('input[name="price"]').val(),product_id:p.find('input[name="product_id"]').val(),newspack_checkout_name_your_price:p.find('input[name="newspack_checkout_name_your_price"]').val()};i.ajax({type:"POST",url:newspackBlocksModalCheckout.ajax_url,data:o,success:({success:e,data:t})=>{s(),p.find(".result").remove(),p.append(`<p class="result ${r}__helper-text ${e?"":r+"__inline-error"}">`+t.message+"</p>"),e?p.find('h3, input[name="price"]').removeClass("newspack-ui__field-error"):(p.find('input[name="price"]').focus(),p.find('h3, input[name="price"]').addClass("newspack-ui__field-error")),i(document.body).trigger("update_checkout",{update_shipping_method:!1})},complete:()=>{x(p),t.attr("disabled",!1),t.focus()}})})),a.on("click","#place_order",(function(){(()=>{if("function"!=typeof window.gtag)return;const{action_type:c,amount:n,currency:i,product_id:r,product_type:a,recurrence:s,referrer:d,variation_id:u=""}=o("modal-checkout-product-details"),l={action_type:c,amount:n,currency:i,product_id:r,product_type:a,recurrence:s,referrer:d};u&&(l.variation_id=u);const p=e("form_submission",l);t(p)})()}))}p()}function u(){const e=i("#newspack_subscription_terms_confirmation, #newspack_subscription_confirmation");if(e.length){const t=i("form.checkout"),o=t.find("button#place_order, button#place_order_clone");function c(){const t=e.is(":checked");o.each(((e,o)=>{i(o).attr("disabled",!t)}))}c(),e.on("change",c),t.on("submit",(function(t){if(!e.is(":checked"))return t.preventDefault(),t.stopPropagation(),!1}))}}i(document.body).on("updated_checkout payment_method_selected checkout_error",u),i(document).ready(u),i(document.body).on("checkout_error",(function(){const e=i(".woocommerce-NoticeGroup-checkout, .woocommerce-notices-wrapper");e.length&&e.each(((e,t)=>i(t).addClass(`${r}__notice ${r}__notice--error`)));const t=i("#checkout_error_back");t.length&&t.on("click",(e=>{e.preventDefault(),parent.newspackCloseModalCheckout()})),d(!1)})),document.addEventListener("keydown",(function(e){"Escape"===e.key&&parent.newspackCloseModalCheckout()})),newspackBlocksModalCheckout.is_error&&i(document.body).trigger("checkout_error")}))})();
+(()=>{"use strict";const e=(e,t={})=>({...t,action:e}),t=(e,t="np_modal_checkout_interaction")=>{"function"==typeof window.gtag&&e&&window.gtag("event",t,e)},o=e=>{const t=document.getElementById(e),o=!!t&&t.getAttribute("data-order-details");return!!o&&JSON.parse(o)||{}};function c(e){"undefined"!=typeof document&&"function"==typeof e&&("complete"!==document.readyState&&"interactive"!==document.readyState?document.addEventListener("DOMContentLoaded",e):e())}const n=(c="continue")=>{if("function"!=typeof window.gtag)return;const{action_type:n,amount:i,currency:a,product_id:s,product_type:r,recurrence:d,referrer:l,variation_id:u="",gate_post_id:p=""}=o("modal-checkout-product-details"),_={action_type:n,amount:i,currency:a,product_id:s,product_type:r,recurrence:d,referrer:l};u&&(_.variation_id=u),p&&(_.gate_post_id=p);const m=e(c,_);t(m)};var i;i=jQuery,c((()=>{if(!i)return void console.warn("jQuery is not available.");const a=newspackBlocksModalCheckout.newspack_class_prefix,s=new CustomEvent("checkout-ready");function r(){i(`.woocommerce-NoticeGroup-checkout, .${a}__inline-error, .woocommerce-error, .woocommerce-message, .wc-block-components-notice-banner, .woocommerce-notices-wrapper`).remove()}function d(n=!0){const i=document.querySelector("#newspack_modal_checkout_container");i.checkoutReady=!0,i.dispatchEvent(s),n&&c((function(){if("function"!=typeof window.gtag)return;const c=o("modal-checkout-product-details"),n=e("loaded",c);t(n)}))}if(newspackBlocksModalCheckout.is_checkout_complete){(()=>{if("function"!=typeof window.gtag)return;const c=o("modal-checkout-product-details"),n=e("form_submission_success",c);t(n)})();const u=document.querySelector("#newspack_modal_checkout_container");u&&(u.checkoutComplete=!0)}else{function p(){i("#wcpay-express-checkout-button-separator, #wc-stripe-payment-request-button-separator").after('<div class="newspack-ui__word-divider">'+newspackBlocksModalCheckout.divider_text+"</div>");let c=[];const s=i("form.checkout");if(!s.length)return void console.warn("Form is not available");const u=i("form.modal_checkout_coupon"),p=i("form.modal_checkout_nyp"),_=i("#checkout_continue"),m=i("#customer_details"),h=i("#after_customer_details"),f=i(".newspack-wcsg--wrapper");function g(){const e=i('input[name="payment_method"]:checked').val();i(".wc_payment_method").removeClass("selected"),i(".wc_payment_method.payment_method_"+e).addClass("selected")}function k(){let e;if(i.ajax({url:newspackBlocksModalCheckout.ajax_url,method:"POST",async:!1,data:{action:"get_cart_total"},success:t=>{e=t}}),e)return e}if(i('input[name="payment_method"]').change(g),i(document).on("payment_method_selected",g),i(document).on("updated_checkout",g),g(),i(document).on("updated_checkout",(function(){i("#payment .wc_payment_methods").length?i("#after_customer_details > h3").show():i("#after_customer_details > h3").hide()})),i(document).on("updated_checkout",(function(){const e=i("#after_customer_details > .order-review-wrapper");if(!e.length)return;const t=e.clone();i("#after_customer_details").hasClass("transaction-details-expanded")&&i('[id="order_review_heading"]',t).attr("aria-expanded","true"),i("#payment .order-review-wrapper").remove();const o=t.find("table");o.is(".empty")?t.addClass("hidden"):(o.unblock(),t.removeClass("hidden")),i(".payment_methods").after(t)})),i(document).on("click","#order_review_heading",(function(){i(this).attr("aria-expanded",(function(e,t){return"false"===t?"true":"false"})),i("#after_customer_details").toggleClass("transaction-details-expanded")})),i(document).on("updated_checkout",(function(){let e=newspackBlocksModalCheckout.labels.complete_button;if(e){if(i("#place_order").has(i("span.cart-price"))){const t=i("<div>"+e+"</div>");t.find(".cart-price").html(k,(function(){return this.childNodes})),e=t.html()}i("#place_order").html(e),i("#place_order_clone").html(e)}})),f.length){const e=f.find(".newspack-wcsg--gift-toggle input"),t=f.find(".newspack-wcsg--gift-email");e.on("change",(function(){e.is(":checked")?t.addClass("visible"):t.removeClass("visible")}))}function w(e){s.find(".input-text, select, input:checkbox").trigger("validate").trigger("blur");let t=!1;const o=[],c=e=>{const c=i("#"+e.data("id")+"_field");if(c?.length){t||(t=c);const o=c.find(".woocommerce-error");o.length&&o.remove(),c.addClass("woocommerce-invalid").removeClass("woocommerce-valid"),c.append(`<span class="${a}__inline-error">`+e.text()+"</span>"),e.remove()}else e.is("li")||(e=i("<li />").append(e)),o.push(e)};if(r(),0!==e.trimStart().indexOf("<")?c(i("<li />").append(e)):e.includes("<li")?i(e).find("li").each((function(){c(i(this))})):c(i(e)),o.length){t=!1;const e=i('<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-checkout"/>').append(i('<ul class="woocommerce-error" role="alert" />').append(o));s.prepend(e),e.get(0).scrollIntoView({behavior:"smooth"})}t?.length&&(window.scroll({top:t.offset().top-100,left:0,behavior:"smooth"}),t.find("input.input-text, select, input:checkbox").trigger("focus")),x(s),i(document.body).trigger("update_checkout"),i(document.body).trigger("checkout_error",[e])}function b(e){e.preventDefault(),e.stopImmediatePropagation(),y(),n("continue")}function v(e){const t=window.newspack_grecaptcha||{};if(r(),i("#checkout_details").remove(),e)s.attr("data-skip-recaptcha","1"),s.append('<input name="is_validation_only" type="hidden" value="1" />'),"v3"===t?.version&&t.destroy(s.get()),u.length&&u.hide(),p.length&&p.hide(),m.show(),h.hide(),m.find("input").first().focus(),c=function(e,t){const o=i._data(e,"events");return o?t?i._data(e,"events")[t]:o:[]}(s[0],"submit").slice(0),c.forEach((e=>{s.off("submit",e.handler)})),s.on("submit",b);else{s.removeAttr("data-skip-recaptcha");const e=s.find('[name="is_validation_only"]');if(e.length&&e.remove(),t?.render){s.data("newspack-recaptcha","newspack_modal_checkout");const e=()=>{r(),s.get(0).scrollIntoView({behavior:"smooth"})},o=e=>w(e);t.render(s.get(),e,o),i(document).on("updated_checkout",(()=>t.render(s.get(),e,o))),i(document.body).on("checkout_error",(()=>t.render(s.get(),e,o)))}u.length&&u.show(),p.length&&p.show(),m.hide(),h.show(),function(){i("#checkout_details").remove();const e={};s.serializeArray().forEach((t=>{e[t.name]=t.value}));const t=`${newspackBlocksModalCheckout.newspack_class_prefix}__font--xs`,o=[];o.push('<div class="billing-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.billing_details+"</h3>"),(e.billing_first_name||e.billing_last_name)&&o.push(`<p class="${t}">`+e.billing_first_name+" "+e.billing_last_name+"</p>"),e.billing_company&&o.push(`<p class="${t}">`+e.billing_company+"</p>");let c="";if((e.billing_address_1||e.billing_address_2)&&(c=`<p class="${t}">`,e.billing_address_1&&(c+=e.billing_address_1),e.billing_address_2&&(c+=" "+e.billing_address_2),c+="<br>",e.billing_city&&(c+=e.billing_city),e.billing_state&&(c+=", "+e.billing_state),e.billing_postcode&&(c+=" "+e.billing_postcode),c+="<br>",e.billing_country&&(c+=e.billing_country)),o.push(c),e.billing_email&&o.push(`<p class="${t}">`+e.billing_email+"</p>"),o.push("</div>"),e.hasOwnProperty("shipping_address_1")){o.push('<div class="shipping-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.shipping_details+"</h3>");let n="";e.ship_to_different_address?(n=`<p class="${t}">`,e.shipping_address_1&&(n+=e.shipping_address_1),e.shipping_address_2&&(n+=" "+e.shipping_address_2),n+="<br>",e.shipping_city&&(n+=e.shipping_city),e.shipping_state&&(n+=", "+e.shipping_state),e.shipping_postcode&&(n+=" "+e.shipping_postcode),n+="<br>",e.shipping_country&&(n+=e.shipping_country)):n=c,o.push(n),o.push("</div>")}e.hasOwnProperty("newspack_wcsg_is_gift")&&e.hasOwnProperty("wcsg_gift_recipients_email")&&e.newspack_wcsg_is_gift&&e.wcsg_gift_recipients_email&&(o.push('<div class="gift-details">'),o.push("<h3>"+newspackBlocksModalCheckout.labels.gift_recipient+"</h3>"),o.push(`<p class="${t}">`+e.wcsg_gift_recipients_email+"</p>")),i(".order-details-summary").after('<div id="checkout_details">'+o.join("")+"</div>")}(),s.off("submit",b),c.forEach((e=>{s.on("submit",e.handler)})),l()}s.triggerHandler("editing_details",[e]),window.scroll({top:0,left:0,behavior:"smooth"})}function y(e=!1,t=(()=>{})){if(!C(s))return console.warn("Unable to block the form"),t(),!1;r();const o=s.find(".woocommerce-NoticeGroup.woocommerce-NoticeGroup-checkout");o.length&&o.remove();const c=["save_user_in_woopay"],d=s.serializeArray().filter((e=>!c.includes(e.name)));d.push({name:"woocommerce_checkout_update_totals",value:"1"}),i.ajax({type:"POST",url:wc_checkout_params.checkout_url,data:d,dataType:"html",success:o=>{let c;try{c=JSON.parse(o)}catch(e){c={messages:'<div class="woocommerce-error">'+wc_checkout_params.i18n_checkout_error+"</div>"}}e||!0!==c.reload?(x(s),c.messages?e||(c.messages?w(c.messages):w(`<div class="${a}__inline-error">`+wc_checkout_params.i18n_checkout_error+"</div>")):(v(!1),i._data(s[0],"events")?.click?.some((e=>"#checkout_back"===e.selector))||s.on("click","#checkout_back",(function(e){e.preventDefault(),v(!0),n("back")}))),t(c)):window.location.reload()},error:(o,c,n)=>{let i="";e||(i='<div class="woocommerce-error">'+(n||wc_checkout_params.i18n_checkout_error)+"</div>",w(i)),t({messages:i})}})}function C(e){return!e.is(".modal-processing")&&(e.find("button[type=submit]").each(((e,t)=>{i(t).attr("disabled",!0)})),e.addClass("modal-processing"),!0)}function x(e){return!!e.is(".modal-processing")&&(e.find("button[type=submit]").each(((e,t)=>{i(t).attr("disabled",!1)})),e.removeClass("modal-processing"),!0)}_.length?(v(!0),f.length?d():y(!0,d)):d(),u.length&&(u.on("submit",(function(e){if(e.preventDefault(),!C(u))return!1;const t={security:wc_checkout_params.apply_coupon_nonce,coupon_code:u.find('input[name="coupon_code"]').val()};i.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:t,dataType:"html",success:e=>{if(r(),u.find(".result").remove(),e){const o=e.includes("error");u.append(`<p class="result ${a}__helper-text ${o?a+"__inline-error":""}">`+i(e).text()+"</p>"),o?(u.find('input[name="coupon_code"]').focus(),u.find('h3, input[name="coupon_code"]').addClass("newspack-ui__field-error")):(u.find('input[name="coupon_code"]').focus(),u.find('h3, input[name="coupon_code"]').removeClass("newspack-ui__field-error")),i(document.body).trigger("applied_coupon_in_checkout",[t.coupon_code]),i(document.body).trigger("update_checkout",{update_shipping_method:!1})}},complete:()=>{x(u)}})})),i(document.body).on("removed_coupon_in_checkout",(()=>{r(),u.find(".result").remove(),u.find('input[name="coupon_code"]').val("").focus()}))),p.length&&p.on("submit",(function(e){if(e.preventDefault(),!C(p))return!1;const t=p.find('input[name="price"]');t.attr("disabled",!0);const o={_ajax_nonce:newspackBlocksModalCheckout.nyp_nonce,action:"process_name_your_price_request",price:p.find('input[name="price"]').val(),product_id:p.find('input[name="product_id"]').val(),newspack_checkout_name_your_price:p.find('input[name="newspack_checkout_name_your_price"]').val()};i.ajax({type:"POST",url:newspackBlocksModalCheckout.ajax_url,data:o,success:({success:e,data:t})=>{r(),p.find(".result").remove(),p.append(`<p class="result ${a}__helper-text ${e?"":a+"__inline-error"}">`+t.message+"</p>"),e?p.find('h3, input[name="price"]').removeClass("newspack-ui__field-error"):(p.find('input[name="price"]').focus(),p.find('h3, input[name="price"]').addClass("newspack-ui__field-error")),i(document.body).trigger("update_checkout",{update_shipping_method:!1})},complete:()=>{x(p),t.attr("disabled",!1),t.focus()}})})),s.on("click","#place_order",(function(){(()=>{if("function"!=typeof window.gtag)return;const c=o("modal-checkout-product-details"),n=e("form_submission",c);t(n)})()}))}p()}function l(){const e=i("#newspack_subscription_terms_confirmation, #newspack_subscription_confirmation");if(e.length){const t=i("form.checkout"),o=t.find("button#place_order, button#place_order_clone");function c(){const t=e.is(":checked");o.each(((e,o)=>{i(o).attr("disabled",!t)}))}c(),e.on("change",c),t.on("submit",(function(t){if(!e.is(":checked"))return t.preventDefault(),t.stopPropagation(),!1}))}}i(document.body).on("updated_checkout payment_method_selected checkout_error",l),i(document).ready(l),i(document.body).on("checkout_error",(function(){const e=i(".woocommerce-NoticeGroup-checkout, .woocommerce-notices-wrapper");e.length&&e.each(((e,t)=>i(t).addClass(`${a}__notice ${a}__notice--error`)));const t=i("#checkout_error_back");t.length&&t.on("click",(e=>{e.preventDefault(),parent.newspackCloseModalCheckout()})),d(!1)})),document.addEventListener("keydown",(function(e){"Escape"===e.key&&parent.newspackCloseModalCheckout()})),newspackBlocksModalCheckout.is_error&&i(document.body).trigger("checkout_error")}))})();

package/includes/class-modal-checkout.php

@@ -7,6 +7,8 @@
 
 namespace Newspack_Blocks;
 
+use Newspack_Blocks\Tracking\Data_Events;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -348,11 +350,6 @@ final class Modal_Checkout {
 
 		$cart_item_data = self::amend_cart_item_data( [ 'referer' => $referer ] );
 
-		$newspack_popup_id = filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
-		if ( $newspack_popup_id ) {
-			$cart_item_data['newspack_popup_id'] = $newspack_popup_id;
-		}
-
 		/** Apply NYP custom price */
 		$price = filter_input( INPUT_GET, 'price', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
 		if ( \Newspack_Blocks::can_use_name_your_price() ? \WC_Name_Your_Price_Helpers::is_nyp( $product_id ) : false ) {
@@ -714,7 +711,7 @@ final class Modal_Checkout {
 									$price          = $variation->get_price();
 									$price_html     = $variation->get_price_html();
 									$frequency      = '';
-									$product_type = \Newspack_Blocks\Tracking\Data_Events::get_product_type( $product_id );
+									$product_type = Data_Events::get_product_type( $product_id );
 
 									// Use suggested price if NYP is active and set for variation.
 									if ( \Newspack_Blocks::can_use_name_your_price() && \WC_Name_Your_Price_Helpers::is_nyp( $variation_id ) ) {
@@ -1114,13 +1111,29 @@ final class Modal_Checkout {
 	 * Get after success button params.
 	 */
 	private static function get_after_success_params() {
-		return array_filter(
-			[
-				'after_success_behavior'     => isset( $_REQUEST['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				'after_success_url'          => isset( $_REQUEST['after_success_url'] ) ? sanitize_url( wp_unslash( $_REQUEST['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				'after_success_button_label' => isset( $_REQUEST['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			]
-		);
+		// Express checkout payment requests are separate requests, so they won't have the after_success attributes. We'll have to check the HTTP_REFERER instead.
+		if ( self::is_express_checkout() ) {
+			$referrer = isset( $_SERVER['HTTP_REFERER'] ) ? \esc_url_raw( \wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : false; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+			if ( $referrer ) {
+				$referrer_query = \wp_parse_url( $referrer, PHP_URL_QUERY );
+				\wp_parse_str( $referrer_query, $referrer_query_params );
+				return array_filter(
+					[
+						'after_success_behavior'     => isset( $referrer_query_params['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $referrer_query_params['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+						'after_success_url'          => isset( $referrer_query_params['after_success_url'] ) ? sanitize_url( wp_unslash( $referrer_query_params['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+						'after_success_button_label' => isset( $referrer_query_params['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $referrer_query_params['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					]
+				);
+			}
+		} else {
+			return array_filter(
+				[
+					'after_success_behavior'     => isset( $_REQUEST['after_success_behavior'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_behavior'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					'after_success_url'          => isset( $_REQUEST['after_success_url'] ) ? sanitize_url( wp_unslash( $_REQUEST['after_success_url'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					'after_success_button_label' => isset( $_REQUEST['after_success_button_label'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['after_success_button_label'] ) ) : '', // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				]
+			);
+		}
 	}
 
 	/**
@@ -1165,7 +1178,6 @@ final class Modal_Checkout {
 		if ( isset( $_REQUEST[ self::CHECKOUT_REGISTRATION_FLAG ] ) && $_REQUEST[ self::CHECKOUT_REGISTRATION_FLAG ] ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.MissingUnslash
 			$args[ self::CHECKOUT_REGISTRATION_FLAG ] = '1';
 		}
-
 		return add_query_arg(
 			$args,
 			$url
@@ -1526,7 +1538,16 @@ final class Modal_Checkout {
 	 */
 	public static function pass_url_param_on_redirect( $location ) {
 		if ( self::is_modal_checkout() ) {
-			$location = \add_query_arg( [ 'modal_checkout' => 1 ], $location );
+			$params = [ 'modal_checkout' => 1 ];
+			$newspack_popup_id = filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
+			$gate_post_id = filter_input( INPUT_GET, 'memberships_content_gate', FILTER_SANITIZE_NUMBER_INT );
+			if ( $newspack_popup_id ) {
+				$params['newspack_popup_id'] = $newspack_popup_id;
+			}
+			if ( $gate_post_id ) {
+				$params['memberships_content_gate'] = $gate_post_id;
+			}
+			$location = \add_query_arg( $params, $location );
 		}
 		return $location;
 	}
@@ -1592,21 +1613,33 @@ final class Modal_Checkout {
 			$is_modal_checkout = strpos( $_REQUEST['post_data'], 'modal_checkout=1' ) !== false; // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 		}
 
-		// Express checkout payment requests are separate requests, so they won't have the modal checkout flag. We'll have to check the HTTP_REFERER insteaad.
-		$payment_request_type = filter_input( INPUT_POST, 'payment_request_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
-		$is_express_checkout  = ! empty( $payment_request_type ) && in_array( $payment_request_type, [ 'apple_pay', 'google_pay', 'payment_request_api' ], true ); // Validate payment request types: https://github.com/woocommerce/woocommerce-gateway-stripe/blob/develop/includes/payment-methods/class-wc-stripe-payment-request.php#L529-L548.
+		if ( self::is_express_checkout() ) {
+			$is_modal_checkout = true;
+		}
+
+		return $is_modal_checkout;
+	}
+
+	/**
+	 * Is this transaction using an express checkout method?
+	 */
+	public static function is_express_checkout() {
+		// Get express_payment_type in a way that works for both Stripe and WooPayments.
+		$express_payment_info = isset( $_POST['express_payment_type'] ) ? sanitize_text_field( wp_unslash( $_POST['express_payment_type'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification
+
+		$is_express_checkout = ! empty( $express_payment_info ) && in_array( $express_payment_info, [ 'apple_pay', 'google_pay', 'payment_request_api' ], true );  // Validate payment request types: https://github.com/woocommerce/woocommerce-gateway-stripe/blob/develop/includes/payment-methods/class-wc-stripe-payment-request.php#L557-L586.
+
 		if ( $is_express_checkout ) {
 			$referrer = isset( $_SERVER['HTTP_REFERER'] ) ? \esc_url_raw( \wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : false; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 			if ( $referrer ) {
 				$referrer_query = \wp_parse_url( $referrer, PHP_URL_QUERY );
 				\wp_parse_str( $referrer_query, $referrer_query_params );
 				if ( isset( $referrer_query_params['modal_checkout'] ) && $referrer_query_params['modal_checkout'] ) {
-					$is_modal_checkout = true;
+					return true;
 				}
 			}
 		}
-
-		return $is_modal_checkout;
+		return false;
 	}
 
 	/**
@@ -1682,10 +1715,8 @@ final class Modal_Checkout {
 			foreach ( $cart->get_cart() as $cart_item_key => $cart_item ) :
 				$_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
 				if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) :
-					// Create an empty array to store data order information.
-					$data_order_details = [];
 					// Create an array of order information to pass to GA4 via JavaScript.
-					$data_order_details = \Newspack_Blocks\Tracking\Data_Events::build_js_data_events( $_product->get_id(), $cart_item, $_product->get_parent_id() );
+					$data_order_details = Data_Events::build_js_data_events( $_product->get_id(), $cart_item );
 					?>
 					<p id="modal-checkout-product-details" data-order-details='<?php echo wp_json_encode( $data_order_details ); ?>'>
 						<strong>
@@ -2015,7 +2046,12 @@ final class Modal_Checkout {
 				),
 				'after_success'              => __( 'Continue browsing', 'newspack-blocks' ),
 				'donation_gift_details'      => __( 'This donation is a gift', 'newspack-blocks' ),
-				'purchase_gift_details'      => __( 'This purchase is a gift', 'newspack-blocks' ),
+				'purchase_gift_details'      => get_option(
+					'woocommerce_subscriptions_gifting_gifting_checkbox_text',
+					method_exists( 'Newspack\WooCommerce_Subscriptions_Gifting', 'default_gifting_checkbox_text' ) ?
+						\Newspack\WooCommerce_Subscriptions_Gifting::default_gifting_checkbox_text() :
+						__( 'This purchase is a gift', 'newspack-blocks' )
+				),
 				'checkout_confirm'           => __( 'Complete transaction', 'newspack-blocks' ),
 				'checkout_confirm_variation' => __( 'Purchase', 'newspack-blocks' ),
 				'checkout_back'              => __( 'Back', 'newspack-blocks' ),

package/includes/class-newspack-blocks-api.php

@@ -73,53 +73,6 @@ class Newspack_Blocks_API {
 		return $featured_image_set;
 	}
 
-	/**
-	 * Get author info for the rest field.
-	 *
-	 * @param array $object_info The object info.
-	 * @return array Author data.
-	 */
-	public static function newspack_blocks_get_author_info( $object_info ) {
-		$author_data = [];
-
-		if ( function_exists( 'coauthors_posts_links' ) && ! empty( get_coauthors() ) ) :
-			$authors = get_coauthors();
-
-			foreach ( $authors as $author ) {
-				$author_avatar = coauthors_get_avatar( $author, 48 );
-				$author_link   = null;
-
-				if ( function_exists( 'coauthors_posts_links' ) ) {
-					$author_link = get_author_posts_url( $author->ID, $author->user_nicename );
-				}
-				$author_data[] = array(
-					/* Get the author name */
-					'display_name' => esc_html( $author->display_name ),
-					/* Get the author avatar */
-					'avatar'       => wp_kses_post( $author_avatar ),
-					/* Get the author ID */
-					'id'           => $author->ID,
-					/* Get the author Link */
-					'author_link'  => $author_link,
-				);
-			}
-		else :
-			$author_data[] = array(
-				/* Get the author name */
-				'display_name' => get_the_author_meta( 'display_name', $object_info['author'] ),
-				/* Get the author avatar */
-				'avatar'       => get_avatar( $object_info['author'], 48 ),
-				/* Get the author ID */
-				'id'           => $object_info['author'],
-				/* Get the author Link */
-				'author_link'  => get_author_posts_url( $object_info['author'] ),
-			);
-		endif;
-
-		/* Return the author data */
-		return $author_data;
-	}
-
 	/**
 	 * Get primary category for the rest field.
 	 *
@@ -306,9 +259,9 @@ class Newspack_Blocks_API {
 			];
 
 			$sponsors = Newspack_Blocks::get_all_sponsors( $post->ID );
+			$author_info = Newspack_Blocks::prepare_authors();
 			$add_ons  = [
 				'newspack_article_classes'          => Newspack_Blocks::get_term_classes( $data['id'] ),
-				'newspack_author_info'              => self::newspack_blocks_get_author_info( $data ),
 				'newspack_category_info'            => self::newspack_blocks_get_primary_category( $data ),
 				'newspack_featured_image_caption'   => Newspack_Blocks::get_image_caption( $data['featured_media'], $attributes['showCaption'], $attributes['showCredit'] ),
 				'newspack_featured_image_src'       => self::newspack_blocks_get_image_src( $data ),
@@ -316,6 +269,8 @@ class Newspack_Blocks_API {
 				'newspack_post_sponsors'            => self::newspack_blocks_sponsor_info( $data ),
 				'newspack_sponsors_show_author'     => Newspack_Blocks::newspack_display_sponsors_and_authors( $sponsors ),
 				'newspack_sponsors_show_categories' => Newspack_Blocks::newspack_display_sponsors_and_categories( $sponsors ),
+				'newspack_post_avatars'             => \newspack_blocks_format_avatars( $author_info ),
+				'newspack_post_byline'              => \newspack_blocks_format_byline( $author_info ),
 				'post_status'                       => $post->post_status,
 				'post_type'                         => $post->post_type,
 				'post_link'                         => Newspack_Blocks::get_post_link( $post->ID ),

package/includes/class-newspack-blocks-caching.php

@@ -139,6 +139,7 @@ class Newspack_Blocks_Caching {
 	 *
 	 * The tradeoff is that occasionally the current post may show up in an article block on a post.
 	 * Archives should all use a global cache group, because there is nothing that would need de-duplication.
+	 * Feeds have their own cache group because some blocks have (e.g. content loop) have different markup in feeds vs. site frontend.
 	 *
 	 * @return string Cache group.
 	 */
@@ -150,6 +151,8 @@ class Newspack_Blocks_Caching {
 				return sprintf( self::CACHE_GROUP . '-post-%d', get_the_ID() );
 			}
 			return self::CACHE_GROUP;
+		} elseif ( is_feed() ) {
+			return self::CACHE_GROUP . '-feed';
 		} else {
 			return self::CACHE_GROUP;
 		}

package/includes/class-newspack-blocks.php

@@ -29,6 +29,8 @@ class Newspack_Blocks {
 		add_post_type_support( 'page', 'newspack_blocks' );
 		add_action( 'jetpack_register_gutenberg_extensions', [ __CLASS__, 'disable_jetpack_donate' ], 99 );
 		add_filter( 'the_content', [ __CLASS__, 'hide_post_content_when_iframe_block_is_fullscreen' ] );
+		add_filter( 'body_class', [ __CLASS__, 'add_body_classes' ] );
+		add_filter( 'admin_body_class', [ __CLASS__, 'add_body_classes' ] );
 
 		/**
 		 * Disable NextGEN's `C_NextGen_Shortcode_Manager`.
@@ -80,6 +82,25 @@ class Newspack_Blocks {
 		return $content;
 	}
 
+	/**
+	 * Body class.
+	 *
+	 * @param string|array $classes Array or string of body class names.
+	 * @return string|array Modified array or string of body class names.
+	 */
+	public static function add_body_classes( $classes ) {
+		if ( wp_is_block_theme() ) {
+			// Handle string (admin) vs array (frontend) cases.
+			if ( is_string( $classes ) ) {
+				$classes .= ' is-block-theme ';
+			} else {
+				$classes[] = 'is-block-theme';
+			}
+		}
+
+		return $classes;
+	}
+
 	/**
 	 * Gather dependencies and paths needed for script enqueuing.
 	 *
@@ -772,27 +793,38 @@ class Newspack_Blocks {
 	/**
 	 * Prepare an array of authors, taking presence of CoAuthors Plus into account.
 	 *
-	 * @return array Array of WP_User objects.
+	 * @return object[] Array of user objects.
 	 */
 	public static function prepare_authors() {
-		if ( function_exists( 'coauthors_posts_links' ) && ! empty( get_coauthors() ) ) {
+		$authors = [];
+
+		if ( function_exists( 'get_coauthors' ) ) {
 			$authors = get_coauthors();
 			foreach ( $authors as $author ) {
 				$author->avatar = coauthors_get_avatar( $author, 48 );
 				$author->url    = get_author_posts_url( $author->ID, $author->user_nicename );
 			}
-			return $authors;
-		}
-		$id = get_the_author_meta( 'ID' );
-		return array(
-			(object) array(
-				'ID'            => $id,
-				'avatar'        => get_avatar( $id, 48 ),
-				'url'           => get_author_posts_url( $id ),
-				'user_nicename' => get_the_author(),
-				'display_name'  => get_the_author_meta( 'display_name' ),
-			),
-		);
+		}
+
+		if ( empty( $authors ) ) {
+			$id = get_the_author_meta( 'ID' );
+			$authors = array(
+				(object) array(
+					'ID'            => $id,
+					'avatar'        => get_avatar( $id, 48 ),
+					'url'           => get_author_posts_url( $id ),
+					'user_nicename' => get_the_author(),
+					'display_name'  => get_the_author_meta( 'display_name' ),
+				),
+			);
+		}
+
+		/**
+		 * Filters the authors array.
+		 *
+		 * @param object[] $authors Array of user objects.
+		 */
+		return apply_filters( 'newspack_blocks_post_authors', $authors );
 	}
 
 	/**
@@ -1450,7 +1482,7 @@ class Newspack_Blocks {
 	 */
 	public static function get_formatted_amount( $amount = null, $frequency = null, $hide_once_label = false ) {
 		if ( ! function_exists( 'wc_price' ) || ( method_exists( 'Newspack\Donations', 'is_platform_wc' ) && ! \Newspack\Donations::is_platform_wc() ) ) {
-			if ( 0 === $amount ) {
+			if ( empty( $amount ) ) {
 				return false;
 			}
 

package/includes/tracking/class-data-events.php

@@ -132,28 +132,55 @@ final class Data_Events {
 	/**
 	 * Returns an array of product information.
 	 *
-	 * @param string $product_id Product's ID.
-	 * @param array  $cart_item Cart item.
-	 * @param string $product_parent_id Product's ID when it has variations.
+	 * @param int      $product_id Product's ID.
+	 * @param array    $cart_item Cart item, if during checkout.
+	 * @param WC_Order $order Completed order, if checkout is completed.
+	 *
+	 * @return array
 	 */
-	public static function build_js_data_events( $product_id, $cart_item, $product_parent_id = '' ) {
+	public static function build_js_data_events( $product_id, $cart_item = null, $order = null ) {
+		$data_order_details = [];
+		if ( empty( $product_id ) || ( empty( $cart_item ) && empty( $order ) ) ) {
+			return $data_order_details;
+		}
+
 		// Reassign the IDs to make sure the product is the product and the variation is the variation.
+		$product           = \wc_get_product( $product_id );
+		$product_parent_id = $product->get_parent_id();
 		$variation_id = '';
 		if ( '' !== $product_parent_id && 0 !== $product_parent_id ) {
 			$variation_id = $product_id;
-			$product_id = $product_parent_id;
+			$product_id   = $product_parent_id;
+		}
+
+		$amount   = 0;
+		$referrer = '';
+		if ( ! empty( $order ) ) {
+			$amount = $order->get_total();
+			$referrer = $order->get_meta( '_newspack_referer' );
+		} elseif ( ! empty( $cart_item ) ) {
+			$amount = $cart_item['data']->get_price();
+			$referrer = $cart_item['referer'];
 		}
 
 		$data_order_details = [
-			'amount'       => $cart_item['data']->get_price(),
+			'amount'       => $amount,
 			'action_type'  => self::get_action_type( $product_id ),
 			'currency'     => function_exists( 'get_woocommerce_currency' ) ? \get_woocommerce_currency() : 'USD',
 			'product_id'   => strval( $product_id ),
 			'product_type' => self::get_product_type( $product_id ),
-			'referrer'     => str_replace( home_url(), '', $cart_item['referer'] ), // Keeps format consistent for Homepage with Donate and Checkout Button blocks.
+			'referrer'     => str_replace( home_url(), '', $referrer ), // Keeps format consistent for Homepage with Donate and Checkout Button blocks.
 			'recurrence'   => self::get_purchase_recurrence( $product_id ),
 			'variation_id' => strval( $variation_id ),
 		];
+		$gate_post_id = ! empty( $order ) ? $order->get_meta( '_memberships_content_gate' ) : filter_input( INPUT_GET, 'memberships_content_gate', FILTER_SANITIZE_NUMBER_INT );
+		if ( $gate_post_id ) {
+			$data_order_details['gate_post_id'] = $gate_post_id;
+		}
+		$newspack_popup_id = ! empty( $order ) ? $order->get_meta( '_newspack_popup_id' ) : filter_input( INPUT_GET, 'newspack_popup_id', FILTER_SANITIZE_NUMBER_INT );
+		if ( $newspack_popup_id ) {
+			$data_order_details['newspack_popup_id'] = $newspack_popup_id;
+		}
 		return $data_order_details;
 	}
 

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.11.0
+ * Version:         4.12.0
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.11.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.12.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,18 +1,18 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.11.0",
+	"version": "4.12.0",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.11.0",
 		"@testing-library/dom": "^10.4.0",
 		"@testing-library/user-event": "^14.6.1",
 		"@types/lodash": "^4.17.16",
-		"@wordpress/browserslist-config": "^6.21.0",
+		"@wordpress/browserslist-config": "^6.22.0",
 		"eslint": "^8.57.0",
 		"fetch-mock-jest": "^1.5.1",
 		"html-entities": "^2.6.0",
 		"identity-obj-proxy": "^3.0.0",
-		"lint-staged": "^15.5.0",
+		"lint-staged": "^15.5.1",
 		"newspack-components": "^3.1.0",
 		"newspack-scripts": "^5.5.2",
 		"postcss-scss": "^4.0.9"

package/src/block-styles/core/columns/editor.scss

@@ -1,7 +1,7 @@
 @use "../../../shared/sass/variables";
 @use "../../../shared/sass/mixins";
 
-body:not([class*="block-theme"]) .editor-styles-wrapper div.wp-block-columns {
+body:not(.is-block-theme) .editor-styles-wrapper div.wp-block-columns {
 	gap: 32px;
 
 	&.is-style-borders {