@verbb/formie-browser 1.0.13 → 1.0.15

package/dist/chunks/{api-DqpfkZWL.js → api-Dxl_CKw-.js}

@@ -1,10 +1,10 @@
 import { a as e, d as t, u as n } from "./event-names-BCI2FLD8.js";
 import { t as r } from "./debug-BV0DvdHx.js";
-import { i, r as a, t as o } from "./theme-classes-Tv7q7ToE.js";
-import { i as s } from "./i18n-BY1ds1BL.js";
-import { n as c, t as l } from "./async-nPFRNQ06.js";
+import { a as i, i as a, t as o } from "./theme-classes-DAQuEqdP.js";
+import { n as s, t as c } from "./async-2GdXNFCE.js";
+import { i as l } from "./i18n-BY1ds1BL.js";
 import { r as u, t as d } from "./field-references.keys-58ZSTrCW.js";
-import { n as f, r as p } from "./field-references.resolver-CHwn0G0L.js";
+import { n as f, r as p } from "./field-references.resolver-Ca8MguFv.js";
 //#region src/js/core/dom-events.ts
 function m(e, n, r) {
 	e.dispatchEvent(new CustomEvent(t(n), {
@@ -136,7 +136,8 @@ function S(e) {
 //#region src/js/validation/submit-readiness.ts
 var C = "data-formie-submit-validation-disabled", w = "data-formie-preserve-disabled", se = "data-formie-submit-ready";
 function T(e) {
-	return e.dataset.formieDisableSubmitUntilValid === "true";
+	let t = e.dataset.formieDisableSubmitUntilValid?.trim().toLowerCase();
+	return t === "" || t === "true" || t === "1";
 }
 function ce(e) {
 	return Array.from(e.querySelectorAll("button[data-formie-action=\"submit\"]")).filter((e) => e instanceof HTMLButtonElement);
@@ -154,7 +155,7 @@ function E(e, t) {
 				e.hasAttribute(w) ? (e.disabled = !0, e.removeAttribute(w)) : e.disabled = !1, e.removeAttribute(C);
 				return;
 			}
-			e.hasAttribute(C) || (e.disabled && e.setAttribute(w, "true"), e.setAttribute(C, "true")), e.disabled = !0;
+			e.hasAttribute(C) || (e.disabled && e.setAttribute(w, "true"), e.setAttribute(C, "true")), e.disabled ||= !0;
 		}
 	});
 }
@@ -244,14 +245,13 @@ function ge(e) {
 	return e <= 0 ? "start" : e >= 100 ? "end" : "middle";
 }
 function _e(e) {
-	return (e.dataset.formieSubmitAction || "").trim();
+	return (e.dataset.formieCompletionBehavior || e.dataset.formieSubmitAction || "").trim();
 }
 function P(e, t) {
-	let n = t.meta?.effectiveSubmitAction;
-	return typeof n == "string" && n.trim() !== "" ? n.trim() : _e(e);
+	return t.completion ? String(t.completion.behavior) : _e(e);
 }
 function F(e) {
-	let t = e.dataset.formieSubmitActionFormHide;
+	let t = e.dataset.formieHideFormAfterSubmit ?? e.dataset.formieSubmitActionFormHide;
 	if (t === void 0) return !1;
 	let n = t.trim().toLowerCase();
 	return n === "true" || n === "1" || n === "";
@@ -265,7 +265,7 @@ function I(e, t) {
 	].forEach((n) => {
 		e.querySelectorAll(n).forEach((e) => {
 			let n = e;
-			t ? n.hidden = !0 : n.hidden = !1;
+			n.hidden = !!t;
 		});
 	});
 }
@@ -309,38 +309,42 @@ function xe(e, t) {
 	}), t && (t.setAttribute("data-formie-loading", "true"), be(e, t)));
 }
 function B(e) {
-	if (e.removeAttribute("data-formie-loading"), z(e).forEach((t) => {
+	e.removeAttribute("data-formie-loading"), z(e).forEach((t) => {
 		if ("disabled" in t) {
 			let e = t;
 			e.disabled = e.getAttribute("data-formie-was-disabled") === "true";
 		}
 		R(t), t.removeAttribute("data-formie-was-disabled"), t.removeAttribute("data-formie-loading"), i(t, e, "loading", !1), t.removeAttribute("data-formie-loading-indicator"), t.removeAttribute("data-formie-loading-text");
-	}), e.dataset.formieDisableSubmitUntilValid === "true") {
-		let t = e;
-		t.formieValidation && E(e, t.formieValidation);
-	}
+	});
+	let t = e;
+	t.formieValidation && E(e, t.formieValidation);
 }
 function V(e, t) {
 	let n = N(e), r = me(e), s = n.findIndex((e) => e.getAttribute("data-formie-page-id") === t);
-	if (n.forEach((n) => {
+	n.forEach((n) => {
 		n.getAttribute("data-formie-page-id") === t ? (n.removeAttribute("data-formie-page-hidden"), a(n, e, "pageHidden")) : (n.setAttribute("data-formie-page-hidden", "true"), o(n, e, "pageHidden"));
 	}), r.forEach((n, r) => {
 		let c = n.getAttribute("data-formie-page-id") === t, l = s > -1 && r < s;
 		i(n, e, "tabCurrent", c), i(n, e, "tabComplete", l);
 		let u = n.querySelector("[data-formie-tab-link]");
 		u && (i(u, e, "tabLinkCurrent", c), c ? a(u, e, "tabLinkInactive") : o(u, e, "tabLinkInactive")), c ? n.setAttribute("aria-current", "page") : n.removeAttribute("aria-current"), l ? n.setAttribute("data-formie-tab-complete", "true") : n.removeAttribute("data-formie-tab-complete");
-	}), s > -1 && n.length > 0 && ye(e, he(e, s, n.length)), A(e, "pageId", t), b(e), e.dataset.formieDisableSubmitUntilValid === "true") {
-		let t = e;
-		t.formieValidation && E(e, t.formieValidation);
-	}
+	}), s > -1 && n.length > 0 && ye(e, he(e, s, n.length)), A(e, "pageId", t), b(e);
+	let c = e;
+	c.formieValidation && E(e, c.formieValidation);
 }
 function Se(e, t) {
-	let n = t.meta?.submissionUid;
-	typeof n == "string" && n.trim() !== "" && A(e, "submissionUid", n);
-	let r = (t.meta?.session)?.continuation?.continuationToken;
-	typeof r == "string" && r.trim() !== "" ? A(e, "continuationToken", r) : M(e, "continuationToken");
-}
-function Ce(e) {
+	if (t.meta?.resetSubmissionIdentity === !0) {
+		M(e, "submissionId"), M(e, "submissionUid"), M(e, "progressId"), A(e, "expectedVersion", "0"), H(e);
+		return;
+	}
+	let n = t.meta?.session?.version ?? t.meta?.version;
+	typeof n == "number" && A(e, "expectedVersion", String(n));
+	let r = t.meta?.submissionUid;
+	typeof r == "string" && r.trim() !== "" && A(e, "submissionUid", r);
+	let i = (t.meta?.session)?.continuation?.progressId;
+	typeof i == "string" && i.trim() !== "" ? A(e, "progressId", i) : M(e, "progressId");
+}
+function H(e) {
 	let t = e.getAttribute("action");
 	t && e.setAttribute("action", fe(t, "resumeToken"));
 	try {
@@ -349,7 +353,7 @@ function Ce(e) {
 		e.searchParams.delete("resumeToken"), window.history.replaceState({}, document.title, `${e.pathname}${e.search}${e.hash}`);
 	} catch {}
 }
-function we(e, t) {
+function Ce(e, t) {
 	let n = t.meta?.resumeUrl;
 	if (typeof n != "string" || n.trim() === "") return;
 	let r = n.trim();
@@ -361,18 +365,18 @@ function we(e, t) {
 		} catch {}
 	}
 }
-function H(t, n = {}) {
+function U(t, n = {}) {
 	let r = t.formieValidation, i = N(t)[0]?.getAttribute("data-formie-page-id");
-	if (L(t), t.reset(), n.preserveHiddenState || I(t, !1), M(t, "submissionId"), M(t, "submissionUid"), M(t, "continuationToken"), M(t, "pageId"), Ce(t), r?.resetLiveState(), i) {
+	if (L(t), t.reset(), n.preserveHiddenState || I(t, !1), M(t, "submissionId"), A(t, "expectedVersion", "0"), M(t, "submissionUid"), M(t, "progressId"), M(t, "pageId"), H(t), r?.resetLiveState(), i) {
 		V(t, i), t.dispatchEvent(new CustomEvent(e("reset"), { bubbles: !0 }));
 		return;
 	}
 	b(t), t.dispatchEvent(new CustomEvent(e("reset"), { bubbles: !0 }));
 }
-function Te(e) {
+function we(e) {
 	return e.code === de || e.meta?.resetState === !0;
 }
-function Ee(e, t) {
+function Te(e, t) {
 	let r = t.submitData, i = /* @__PURE__ */ new Set(), a = !1;
 	if (Array.isArray(r) && r.length > 0) {
 		let t = r.filter((e) => typeof e == "object" && !!e && "event" in e && typeof e.event == "string");
@@ -384,29 +388,30 @@ function Ee(e, t) {
 			}));
 		}
 	}
-	let o = t.meta || {}, s = (o.paymentAction && typeof o.paymentAction == "object" ? o.paymentAction : null) || (o.paymentDecision && typeof o.paymentDecision == "object" ? o.paymentDecision.action : null), c = s ? String(s.event || "") : "", l = s ? s.payload : void 0, u = n(c);
-	return u && !i.has(u) && (u.startsWith("formie:payment:") && (a = !0), e.dispatchEvent(new CustomEvent(u, {
+	let o = t.payment?.action, s = o ? String(o.event || "") : "", c = o ? o.payload : void 0, l = n(s);
+	return l && !i.has(l) && (l.startsWith("formie:payment:") && (a = !0), e.dispatchEvent(new CustomEvent(l, {
 		bubbles: !0,
-		detail: { data: l }
-	})), k.log("Dispatching fallback payment action event.", { eventName: u })), { hasPaymentFollowUpEvent: a };
+		detail: { data: c }
+	})), k.log("Dispatching fallback payment action event.", { eventName: l })), { hasPaymentFollowUpEvent: a };
 }
-function De(e, t, n) {
+function Ee(e, t, n) {
 	if (k.log("Applying submit result state.", {
 		ok: t.ok,
 		action: n,
 		code: t.code,
 		hasRedirect: !!t.redirect?.url,
 		hasSubmitData: Array.isArray(t.submitData) && t.submitData.length > 0
-	}), Te(t)) {
-		H(e), k.log("Resetting state due to stale/reset marker.");
+	}), we(t)) {
+		U(e), k.log("Resetting state due to stale/reset marker.");
 		return;
 	}
-	let r = Ee(e, t);
+	t.payment?.action?.type === "redirect" && t.payment.action.url && j(e, "payment-redirect");
+	let r = Te(e, t);
 	if (!t.ok && t.redirect?.url && !r.hasPaymentFollowUpEvent) {
 		k.log("Applying redirect fallback for failed result.", {
 			url: t.redirect.url,
 			target: t.redirect.target
-		}), L(e), t.redirect.target === "new-tab" ? window.open(t.redirect.url, "_blank") : (j(e, "redirect"), window.location.href = t.redirect.url);
+		}), L(e), t.redirect.target === "new-tab" ? window.open(t.redirect.url, "_blank", "noopener,noreferrer") : (j(e, "redirect"), window.location.href = t.redirect.url);
 		return;
 	}
 	if (Se(e, t), !t.ok) {
@@ -418,32 +423,32 @@ function De(e, t, n) {
 		return;
 	}
 	if (n === "save") {
-		L(e), we(e, t), k.log("Applied save/resume token state.");
+		L(e), Ce(e, t), k.log("Applied save/resume token state.");
 		return;
 	}
-	if (n === "submit" && !t.redirect?.url) {
+	if (t.completion && n === "submit" && !t.redirect?.url) {
 		let n = P(e, t), r = n === "message" && F(e);
 		if (n === "reload") {
 			L(e), j(e, "reload"), window.location.reload();
 			return;
 		}
 		if (n === "reset") {
-			H(e);
+			U(e);
 			return;
 		}
-		L(e), H(e, { preserveHiddenState: r });
+		L(e), U(e, { preserveHiddenState: r });
 		return;
 	}
 	if (n === "submit" && t.redirect?.url && t.redirect.target === "new-tab") {
 		let n = P(e, t) === "message" && F(e);
-		L(e), H(e, { preserveHiddenState: n });
+		L(e), U(e, { preserveHiddenState: n });
 		return;
 	}
 	L(e);
 }
 //#endregion
 //#region src/js/modules/payments/constants.ts
-var Oe = 2500, ke = {
+var De = 2500, Oe = {
 	bpoint: ["bpointToken"],
 	stripe: ["stripePaymentIntentId"],
 	paypal: ["paypalOrderId", "paypalAuthId"],
@@ -458,25 +463,25 @@ var Oe = 2500, ke = {
 };
 //#endregion
 //#region src/js/utils/fields.ts
-function Ae(e) {
+function ke(e) {
 	return e.replace("{field:", "").replace("{", "").replace("}", "").replace("]", "").split("[").join("][");
 }
-function je(e) {
-	return `fields[${Ae(e)}]`;
+function Ae(e) {
+	return `fields[${ke(e)}]`;
 }
-function Me(e, t) {
-	let n = je(t), r = Array.from(e.querySelectorAll(`[name="${n}"]`)), i = Array.from(e.querySelectorAll(`[name="${n}[]"]`));
+function je(e, t) {
+	let n = Ae(t), r = Array.from(e.querySelectorAll(`[name="${n}"]`)), i = Array.from(e.querySelectorAll(`[name="${n}[]"]`));
 	return (i.length ? i : r).filter((e) => e instanceof HTMLElement);
 }
-function U(e, t) {
-	let n = Me(e, t);
+function W(e, t) {
+	let n = je(e, t);
 	for (let e of n) {
 		let t = e.closest("[data-formie-field-handle]")?.querySelector("[data-formie-field-label]")?.childNodes[0]?.textContent?.trim();
 		if (t) return t;
 	}
 	return "";
 }
-function W(e) {
+function G(e) {
 	let t = e.replace(/[^\d.,-]/g, ""), n = t.includes(","), r = t.includes(".");
 	if (n && r) t = t.lastIndexOf(",") > t.lastIndexOf(".") ? t.replace(/\./g, "").replace(",", ".") : t.replace(/,/g, "");
 	else if (n && !r) {
@@ -487,13 +492,17 @@ function W(e) {
 }
 //#endregion
 //#region src/js/modules/payments/utils.ts
-function G(e, t) {
+function K(e) {
+	let t = e;
+	return !t.closest("[data-formie-conditionally-hidden]") && !t.closest("[data-formie-row-hidden]") && !t.closest("[data-formie-page-hidden]") && !t.closest("[hidden]");
+}
+function q(e, t) {
 	let n = t.replace(/"/g, "\\\"");
 	return e.querySelector(`input[name$="[${n}]"]`) || e.querySelector(`input[name$="${n}"]`);
 }
-function K(e, t) {
+function J(e, t) {
 	let n = t.find((t) => {
-		let n = G(e, t);
+		let n = q(e, t);
 		return !n || String(n.value || "").trim() === "";
 	});
 	return {
@@ -501,47 +510,47 @@ function K(e, t) {
 		missingSuffix: n
 	};
 }
-async function q(e, t, n) {
-	let r = K(e, t);
+async function Y(e, t, n) {
+	let r = J(e, t);
 	if (r.ok) return r;
 	let i = Date.now() + Math.max(n, 0);
 	for (; Date.now() < i;) {
-		await c(120);
-		let n = K(e, t);
+		await s(120);
+		let n = J(e, t);
 		if (n.ok) return n;
 	}
-	return K(e, t);
+	return J(e, t);
 }
 //#endregion
 //#region src/js/modules/payments/host.ts
-var Ne = new Set([
+var Me = /* @__PURE__ */ new Set([
 	"handle",
 	"requiredInputSuffixes",
 	"waitForValueMs",
 	"errorMessage"
-]), J = "[data-payment-success]", Y = "[data-payment-error]";
-function X(e, t) {
+]), X = "[data-payment-success]", Z = "[data-payment-error]";
+function Ne(e, t) {
 	return (typeof t.handle == "string" && t.handle.trim() !== "" ? t.handle.trim() : "") || e;
 }
 function Pe(e, t, n) {
-	let r = t || {}, i = Object.entries(r).reduce((e, [t, n]) => (Ne.has(t) || (e[t] = n), e), {}), a = Array.isArray(r.requiredInputSuffixes) ? r.requiredInputSuffixes.map(String).filter(Boolean) : n.defaultRequiredInputSuffixes || [], o = Number(r.waitForValueMs ?? n.defaultWaitForValueMs ?? 2500), s = typeof r.errorMessage == "string" && r.errorMessage.trim() !== "" ? r.errorMessage.trim() : "Payment authorization is incomplete.";
+	let r = t || {}, i = Object.entries(r).reduce((e, [t, n]) => (Me.has(t) || (e[t] = n), e), {}), a = Array.isArray(r.requiredInputSuffixes) ? r.requiredInputSuffixes.map(String).filter(Boolean) : n.defaultRequiredInputSuffixes || [], o = Number(r.waitForValueMs ?? n.defaultWaitForValueMs ?? 2500), s = typeof r.errorMessage == "string" && r.errorMessage.trim() !== "" ? r.errorMessage.trim() : "Payment authorization is incomplete.";
 	return {
-		handle: X(e, r),
+		handle: Ne(e, r),
 		transport: {
 			requiredInputSuffixes: a,
-			waitForValueMs: Number.isFinite(o) ? o : Oe,
+			waitForValueMs: Number.isFinite(o) ? o : De,
 			errorMessage: s
 		},
 		provider: i
 	};
 }
-function Z(e, t, n) {
+function Q(e, t, n) {
 	return e.addEventListener(t, n), () => {
 		e.removeEventListener(t, n);
 	};
 }
 function Fe(e, t) {
-	let n = e.target, r = e.form, i = e.root, a = r || i, c = t.transport.requiredInputSuffixes, m = () => p(r || i), h = (e) => {
+	let n = e.target, r = e.form, i = e.root, a = r || i, s = t.transport.requiredInputSuffixes, m = () => p(r || i), h = (e) => {
 		let t = f(e, m()).value;
 		return Array.isArray(t) ? t[0] || "" : String(t || "");
 	};
@@ -552,62 +561,62 @@ function Fe(e, t) {
 		updateInputs: (e, t) => {
 			let r = Array.isArray(e) ? e : [e];
 			for (let e of r) {
-				let r = G(a, e) ?? n.querySelector(`input[name*="${e}"]`);
+				let r = q(a, e) ?? n.querySelector(`input[name*="${e}"]`);
 				r && (r.value = t);
 			}
 		},
 		addError: (e) => {
-			let t = n.querySelector("[data-formie-field-type] > div, [data-field-type] > div") || n, a = t.querySelector(Y);
+			let t = n.querySelector("[data-formie-field-type] > div, [data-field-type] > div") || n, a = t.querySelector(Z);
 			a && a.remove();
 			let s = document.createElement("div");
 			s.setAttribute("data-payment-error", ""), s.textContent = e, o(s, r || i, "fieldError"), t.appendChild(s);
 		},
 		removeError: () => {
-			n.querySelector(Y)?.remove();
+			n.querySelector(Z)?.remove();
 		},
 		addSuccess: (e) => {
-			let t = n.querySelector("[data-formie-field-type] > div, [data-field-type] > div") || n, a = t.querySelector(J);
+			let t = n.querySelector("[data-formie-field-type] > div, [data-field-type] > div") || n, a = t.querySelector(X);
 			a && a.remove();
 			let s = document.createElement("div");
 			s.setAttribute("data-payment-success", ""), s.textContent = e, o(s, r || i, "successMessage"), t.appendChild(s);
 		},
 		removeSuccess: () => {
-			n.querySelector(J)?.remove();
+			n.querySelector(X)?.remove();
 		},
-		hasToken: () => K(a, c).ok,
-		waitForToken: (e = t.transport.waitForValueMs) => q(a, c, e).then((e) => e.ok),
+		hasToken: () => J(a, s).ok,
+		waitForToken: (e = t.transport.waitForValueMs) => Y(a, s, e).then((e) => e.ok),
 		getFieldValue: (e, t = "string") => {
 			let n = h(e);
-			return t === "float" || t === "int" || t === "number" ? W(n) : n;
+			return t === "float" || t === "int" || t === "number" ? G(n) : n;
 		},
 		resolveAmount: (e) => {
-			let t = r || i, n = String(e.type || "").toLowerCase() === "dynamic" && typeof e.variable == "string" && e.variable.trim() !== "", a = e.value ?? (n ? e.variable : e.fixed), o = String(a ?? "").trim(), c = typeof a == "number" ? a : W(o);
-			if (Number.isFinite(c) && c > 0) return {
+			let t = r || i, n = String(e.type || "").toLowerCase() === "dynamic" && typeof e.variable == "string" && e.variable.trim() !== "", a = e.value ?? (n ? e.variable : e.fixed), o = String(a ?? "").trim(), s = typeof a == "number" ? a : G(o);
+			if (Number.isFinite(s) && s > 0) return {
 				ok: !0,
-				value: c
+				value: s
 			};
 			if (o !== "") {
-				let e = h(o), n = W(e);
+				let e = h(o), n = G(e);
 				if (Number.isFinite(n) && n > 0) return {
 					ok: !0,
 					value: n
 				};
-				let r = U(t, o);
+				let r = W(t, o);
 				if (!e) return {
 					ok: !1,
-					error: r ? s("Provide a value for \"{label}\" to proceed.", { label: r }) : s("Provide a payment amount to proceed.")
+					error: r ? l("Provide a value for \"{label}\" to proceed.", { label: r }) : l("Provide a payment amount to proceed.")
 				};
 			}
 			return {
 				ok: !1,
-				error: s("Payment amount must be greater than 0.")
+				error: l("Payment amount must be greater than 0.")
 			};
 		},
 		resolveCurrency: (e) => {
-			let t = r || i, n = String(e.type || "").toLowerCase() === "dynamic" && typeof e.variable == "string" && e.variable.trim() !== "", a = e.value ?? (n ? e.variable : e.fixed ?? e.defaultCurrency ?? ""), o = String(a ?? "").trim(), c = o.toUpperCase();
-			if (/^[A-Z]{3}$/.test(c) && !n) return {
+			let t = r || i, n = String(e.type || "").toLowerCase() === "dynamic" && typeof e.variable == "string" && e.variable.trim() !== "", a = e.value ?? (n ? e.variable : e.fixed ?? e.defaultCurrency ?? ""), o = String(a ?? "").trim(), s = o.toUpperCase();
+			if (/^[A-Z]{3}$/.test(s) && !n) return {
 				ok: !0,
-				value: c
+				value: s
 			};
 			if (o !== "") {
 				let e = String(h(o) || "").trim(), n = e.toUpperCase();
@@ -615,37 +624,37 @@ function Fe(e, t) {
 					ok: !0,
 					value: n
 				};
-				let r = U(t, o);
+				let r = W(t, o);
 				if (!e) return {
 					ok: !1,
-					error: r ? s("Provide a value for \"{label}\" to proceed.", { label: r }) : s("Provide a payment currency to proceed.")
+					error: r ? l("Provide a value for \"{label}\" to proceed.", { label: r }) : l("Provide a payment currency to proceed.")
 				};
 			}
 			return {
 				ok: !1,
-				error: s("Payment currency must be a valid 3-letter code.")
+				error: l("Payment currency must be a valid 3-letter code.")
 			};
 		},
 		watchFieldValueChanges: (e, t, n = 600) => {
 			let a = r || i, o = e.map((e) => String(e || "").trim()).filter(Boolean);
 			if (o.length === 0) return () => {};
-			let s = m(), c = /* @__PURE__ */ new Set();
+			let s = m(), l = /* @__PURE__ */ new Set();
 			o.forEach((e) => {
 				let t = u(e), n = s.get(t);
 				if (n?.names?.length) {
 					n.names.forEach((e) => {
-						c.add(e);
+						l.add(e);
 					});
 					return;
 				}
 				let r = d(t);
-				r && (c.add(r), c.add(`${r}[]`));
+				r && (l.add(r), l.add(`${r}[]`));
 			});
-			let f = l(() => {
+			let f = c(() => {
 				t();
 			}, n), p = (e) => {
 				let t = e.target?.name || "";
-				!t || !c.has(t) || f();
+				t && l.has(t) && f();
 			};
 			return a.addEventListener("input", p), a.addEventListener("change", p), () => {
 				a.removeEventListener("input", p), a.removeEventListener("change", p);
@@ -675,160 +684,160 @@ function Fe(e, t) {
 			return { billing_details: t };
 		},
 		events: {
-			onForm: (e, t) => r ? Z(r, e, t) : () => {},
-			onRoot: (e, t) => Z(i, e, t)
+			onForm: (e, t) => r ? Q(r, e, t) : () => {},
+			onRoot: (e, t) => Q(i, e, t)
 		}
 	};
 }
 //#endregion
 //#region src/js/modules/payments/factories.ts
-var Q = r("payments");
-function $(e) {
-	let t = e;
-	return !t.closest("[data-formie-page-hidden]") && !t.closest("[hidden]");
-}
+var $ = r("payments");
 function Ie(e) {
-	let t = e.defaultRequiredInputSuffixes ?? ke[e.id] ?? [];
+	let t = e.defaultRequiredInputSuffixes ?? Oe[e.moduleId.split(":")[1]] ?? [];
 	return {
-		id: e.id,
+		moduleId: e.moduleId,
+		version: 2,
+		surfaces: ["server-rendered", "client-rendered"],
 		kind: "payment",
 		match: (e) => !!(e.target.querySelector("[data-formie-field-type=\"payment\"]") || e.target.closest("[data-formie-field-type=\"payment\"]") || e.target.getAttribute?.("data-formie-field-type") === "payment"),
 		setup: async (n) => {
 			let r = n.target, i = r.__formiePaymentModuleRegistry || {};
 			r.__formiePaymentModuleRegistry = i;
-			let a = i[e.id];
-			if (a?.destroy) {
-				Q.warn("Found stale payment module instance; destroying previous.", { moduleId: e.id });
+			let a = n.entryKey ?? e.moduleId, o = i[a];
+			if (o?.destroy) {
+				$.warn("Found stale payment module instance; destroying previous.", { moduleId: e.moduleId });
 				try {
-					await a.destroy();
+					await o.destroy();
 				} catch {}
 			}
-			let o = Pe(e.id, n.options || {}, { defaultRequiredInputSuffixes: t }), s = Fe(n, o), c = {
+			let s = Pe(e.moduleId.split(":")[1], n.options || {}, { defaultRequiredInputSuffixes: t }), c = Fe(n, s), l = {
 				...n,
-				options: o,
-				services: s
-			}, l = [], u = null, d = null, f = null, p = null, m = async () => (u ||= (Q.log("Loading payment provider API.", { moduleId: e.id }), e.load(c)), u), h = async () => {
-				if (!e.mount || d || !$(n.target)) return;
-				let t = await m();
+				options: s,
+				services: c
+			}, u = [], d = null, f = null, p = null, m = null, h = async () => (d ||= ($.log("Loading payment provider API.", { moduleId: e.moduleId }), e.load(l)), d), g = async () => {
+				if (!e.mount || f || !K(n.target)) return;
+				let t = await h();
 				try {
-					d = await e.mount({
+					f = await e.mount({
 						api: t,
 						field: n.target,
-						services: s,
-						options: o,
-						provider: o.provider
-					}), Q.log("Payment widget mounted.", {
-						moduleId: e.id,
-						handle: o.handle
-					});
-				} catch {
-					Q.warn("Payment widget mount failed.", {
-						moduleId: e.id,
-						handle: o.handle
+						services: c,
+						options: s,
+						provider: s.provider
+					}), $.log("Payment widget mounted.", {
+						moduleId: e.moduleId,
+						handle: s.handle
 					});
+				} catch (t) {
+					throw $.warn("Payment widget mount failed.", {
+						moduleId: e.moduleId,
+						handle: s.handle
+					}), t;
 				}
 			};
-			if (l.push(n.on("formie:submit:before", () => {
-				s.removeError(), s.removeSuccess();
+			if (u.push(n.on("formie:submit:before", () => {
+				c.removeError(), c.removeSuccess();
 			})), e.setup) {
 				let t = n.root || n.form || n.target;
-				f = await e.setup({
-					...c,
+				p = await e.setup({
+					...l,
 					root: t
-				}), f.destroy && l.push(f.destroy);
+				}), p.destroy && u.push(p.destroy);
 			}
-			e.mount && $(n.target) && await h(), ["formie:page:navigate:after", "formie:submit:result"].forEach((e) => {
+			e.mount && K(n.target) && await g(), ["formie:page:navigate:after", "formie:submit:result"].forEach((e) => {
 				let t = () => {
-					h();
+					g();
 				};
-				n.root.addEventListener(e, t), l.push(() => {
+				n.root.addEventListener(e, t), u.push(() => {
 					n.root.removeEventListener(e, t);
 				});
-			});
-			let g = async () => {
-				if (Q.log("Destroying payment module.", {
-					moduleId: e.id,
-					handle: o.handle
-				}), l.forEach((e) => e()), d && e.unmount) {
-					let t = await m();
+			}), u.push(n.on("formie:conditions:evaluated", () => {
+				g();
+			}));
+			let _ = async () => {
+				if ($.log("Destroying payment module.", {
+					moduleId: e.moduleId,
+					handle: s.handle
+				}), u.forEach((e) => e()), f && e.unmount) {
+					let t = await h();
 					await e.unmount({
 						api: t,
-						widget: d,
+						widget: f,
 						field: n.target,
-						services: s,
-						options: o,
-						provider: o.provider
-					}), Q.log("Payment widget unmounted.", {
-						moduleId: e.id,
-						handle: o.handle
+						services: c,
+						options: s,
+						provider: s.provider
+					}), $.log("Payment widget unmounted.", {
+						moduleId: e.moduleId,
+						handle: s.handle
 					});
 				}
-				i[e.id]?.destroy === g && delete i[e.id], Q.log("Payment module destroy complete.", {
-					moduleId: e.id,
-					handle: o.handle
+				i[a]?.destroy === _ && delete i[a], $.log("Payment module destroy complete.", {
+					moduleId: e.moduleId,
+					handle: s.handle
 				});
 			};
-			return i[e.id] = { destroy: g }, {
-				destroy: g,
-				onBeforeStage: async (t) => {
-					if (f?.onBeforeStage) {
-						await f.onBeforeStage(t);
+			return i[a] = { destroy: _ }, {
+				destroy: _,
+				beforeSubmit: async (t) => {
+					if (p?.beforeSubmit) {
+						await p.beforeSubmit(t);
 						return;
 					}
-					if (t.stage !== "authorize" || t.action !== "submit" || n.target.closest("[data-formie-page]")?.hasAttribute("data-formie-page-hidden")) return;
-					await h();
-					let r = await m();
-					if (e.onBeforeAuthorize) {
-						p ||= (async () => e.onBeforeAuthorize({
+					if (t.action !== "submit" || !K(n.target)) return;
+					await g();
+					let r = await h();
+					if (e.onBeforePayment) {
+						m ||= (async () => e.onBeforePayment({
 							api: r,
-							widget: d,
+							widget: f,
 							field: n.target,
-							services: s,
-							options: o,
-							provider: o.provider,
+							services: c,
+							options: s,
+							provider: s.provider,
 							stageCtx: t
 						}))().finally(() => {
-							p = null;
+							m = null;
 						});
-						let i = await p;
-						if (Q.log("onBeforeAuthorize resolved.", {
-							moduleId: e.id,
-							handle: o.handle,
+						let i = await m;
+						if ($.log("onBeforePayment resolved.", {
+							moduleId: e.moduleId,
+							handle: s.handle,
 							ok: i
 						}), !i) {
-							t.abort(o.transport.errorMessage);
+							t.abort(s.transport.errorMessage);
 							return;
 						}
 						return;
 					}
-					if (o.transport.requiredInputSuffixes.length === 0) return;
-					let i = await q(n.form || n.root, o.transport.requiredInputSuffixes, o.transport.waitForValueMs);
-					i.ok || (Q.warn("Required payment input(s) missing.", {
-						moduleId: e.id,
-						handle: o.handle,
+					if (s.transport.requiredInputSuffixes.length === 0) return;
+					let i = await Y(n.form || n.root, s.transport.requiredInputSuffixes, s.transport.waitForValueMs);
+					i.ok || ($.warn("Required payment input(s) missing.", {
+						moduleId: e.moduleId,
+						handle: s.handle,
 						missingSuffix: i.missingSuffix
-					}), t.abort(o.transport.errorMessage));
+					}), t.abort(s.transport.errorMessage));
 				},
-				onAfterStage: async (t, r) => {
-					if (!(t.stage !== "dispatch" || !e.onAfterSubmit) && !(!(await e.onAfterSubmit({
+				afterSubmit: async (t, r) => {
+					if (e.onAfterSubmit && (await e.onAfterSubmit({
 						field: n.target,
-						services: s,
-						options: o,
-						provider: o.provider,
+						services: c,
+						options: s,
+						provider: s.provider,
 						result: r
-					}))?.remount || !e.mount)) {
-						if (d && e.unmount) {
-							let t = await m();
+					}))?.remount && e.mount) {
+						if (f && e.unmount) {
+							let t = await h();
 							await e.unmount({
 								api: t,
-								widget: d,
+								widget: f,
 								field: n.target,
-								services: s,
-								options: o,
-								provider: o.provider
+								services: c,
+								options: s,
+								provider: s.provider
 							});
 						}
-						d = null, await h();
+						f = null, await g();
 					}
 				}
 			};
@@ -839,4 +848,4 @@ function Ie(e) {
 //#region src/js/modules/payments/api.ts
 var Le = Ie;
 //#endregion
-export { I as a, x as c, y as d, ae as f, B as i, S as l, V as n, xe as o, m as p, De as r, ue as s, Le as t, b as u };
+export { I as a, x as c, y as d, ae as f, B as i, S as l, V as n, xe as o, m as p, Ee as r, ue as s, Le as t, b as u };