@verbb/formie-browser 1.0.15 → 1.0.17-next.6.ge714580bc362

package/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 ## Unreleased
 
+### Fixed
+- Fixed invisible hCaptcha challenges timing out before they could be completed, requiring a second submit click. ([#3067](https://github.com/verbb/formie/issues/3067))
+- Fixed token refreshes losing the form's site on multisite installations with path-based URLs. ([#3064](https://github.com/verbb/formie/issues/3064))
+- Fixed theme attributes not being applied to AJAX success and error messages. ([#3061](https://github.com/verbb/formie/issues/3061))
+- Fixed nested alert roles in form error messages that could cause duplicate screen reader announcements. ([#3062](https://github.com/verbb/formie/issues/3062))
+- Fixed Opayo re-tokenizing cards and requesting unnecessary merchant sessions after completing a 3D Secure challenge. ([#3048](https://github.com/verbb/formie/issues/3048))
+
+## 1.0.16 - 2026-10-28
+
+### Added
+- Added configurable display limits for searchable dropdowns, defaulting to 100 while searching all options. ([#3059](https://github.com/verbb/formie/issues/3059))
+- Add a keyboard-accessible clear button for single searchable Dropdown fields with placeholders. ([#3058](https://github.com/verbb/formie/issues/3058))
+- Add the `formie:unload-warning:collect-exclusions` event for integrations to exclude automatically updated transport fields from unsaved-changes checks.
+
+### Changed
+- Updated the package build toolchain to Vite 8.3.4.
+
+### Fixed
+- Fixed concurrent payment widget mounts when fields become visible, including duplicate Opayo Drop-in sessions, unhandled mount errors and incomplete teardown during initialization. ([#3048](https://github.com/verbb/formie/issues/3048))
+- Fixed required dropdowns enhanced with third-party libraries such as Choices.js failing validation when options are selected, and preserved custom required messages. ([#3046](https://github.com/verbb/formie/issues/3046))
+- Fixed page-reload submissions stalling when the submit delay is zero.
+- Fixed mounted form lifecycle events omitting the form instance, including submission, page navigation, token refresh and teardown hooks. ([#3032](https://github.com/verbb/formie/issues/3032))
+- Fixed “Scroll To Top” having no effect after successful AJAX submissions. ([#3023](https://github.com/verbb/formie/issues/3023))
+- Fixed summary fields remaining blank after AJAX page navigation.
+- Fixed summary fields repeatedly retrying failed requests.
+- Fixed text counters and phone countries not returning to their initial values when forms reset.
+- Fixed rich-text validation errors failing to focus and describe the editable control.
+- Fixed required table fields incorrectly requiring every cell to have a value.
+- Fixed dependent calculations using number prefixes or suffixes returning incorrect results.
+- Fixed fresh visits and completed submissions retaining an earlier spam-protection timer.
+- Fixed forms freezing when live validation and disabling the submit button until valid are both enabled.
+- Fixed native file input metadata requests omitting CSRF tokens and form context after navigating between pages.
+- Fixed reCAPTCHA loading the wrong SDK or readiness queue when standard and Enterprise APIs share a page, and v3 failing when an existing script has not loaded the configured site key.
+- Fixed reCAPTCHA v3 inline badges rendering outside the form. ([#3016](https://github.com/verbb/formie/issues/3016))
+- Fixed CAPTCHA token updates triggering unsaved-changes warnings on untouched forms, including custom or changing token field names. ([#3008](https://github.com/verbb/formie/issues/3008))
+- Fixed initial conditional field visibility triggering an unsaved-changes warning after native submissions.
+- Fixed edits made immediately after mounting a form being treated as saved.
+- Fixed CAPTCHA teardown leaving widgets or callbacks active after failed setup, pending mounts or provider cleanup errors.
+- Fixed CAPTCHA widgets with a numeric zero handle failing to challenge or reset.
+
 ## 1.0.15 - 2026-10-15
 
 ### Changed

package/dist/chunks/{address-country-BcEQKw0T.js → address-country-DLJF-OkC.js}

@@ -1,7 +1,7 @@
-import { t as e } from "./debug-BV0DvdHx.js";
+import { t as e } from "./debug-rhzqP1j2.js";
 import { i as t, n } from "./constants-DVcJAvc5.js";
-import { i as r } from "./shared-OKhSay59.js";
-import { n as i } from "./country-from-ip-DDj_mFki.js";
+import { i as r } from "./shared-CJ1LIEh3.js";
+import { n as i } from "./country-from-ip-BqQ-BqLH.js";
 //#region src/js/modules/fields/address-country.ts
 var a = "address-country", o = n.country, s = e("fields", "address-country");
 function c(e, t, n) {
@@ -42,11 +42,7 @@ async function f(e, n) {
 		return;
 	}
 	let o = n.countryOptionValue === "full" ? "full" : "short", f = c(a.countryCode, a.countryName, o);
-	if (!u(r, f)) {
-		s.warn("Detected country is not available in the country dropdown; skipping preselect.", { selectValue: f });
-		return;
-	}
-	await d(r, f), s.log("Preselected country from IP.", { selectValue: f });
+	u(r, f) ? (await d(r, f), s.log("Preselected country from IP.", { selectValue: f })) : s.warn("Detected country is not available in the country dropdown; skipping preselect.", { selectValue: f });
 }
 var p = {
 	moduleId: `formie:${a}`,

package/dist/chunks/{address-finder-BWGINCSA.js → address-finder-QK1m1eyv.js}

@@ -1,5 +1,5 @@
 import { n as e } from "./event-names-BCI2FLD8.js";
-import { t } from "./api-ghNr2uxX.js";
+import { t } from "./api-CmuOZ0i3.js";
 import { r as n } from "./scripts-DrccjrFv.js";
 //#region src/js/modules/address/address-finder.ts
 var r = "FORMIE_ADDRESS_FINDER_SCRIPT", i = t({

package/dist/chunks/{address-state-DI3ndhMU.js → address-state-CHKit8AW.js}

@@ -1,10 +1,10 @@
 import { t as e } from "./request-profile-DhwkeCpS.js";
-import { t } from "./dist-ZLeW0zZ3.js";
-import { t as n } from "./debug-BV0DvdHx.js";
+import { t } from "./dist-CJReDlDK.js";
+import { t as n } from "./debug-rhzqP1j2.js";
 import { a as r, n as i } from "./theme-classes-DAQuEqdP.js";
 import { n as a } from "./constants-DVcJAvc5.js";
-import { i as o, n as s } from "./shared-OKhSay59.js";
-import { initFormieCombobox as c } from "./combobox-Ba08_cHL.js";
+import { i as o, n as s } from "./shared-CJ1LIEh3.js";
+import { initFormieCombobox as c } from "./combobox-CJh2DoSO.js";
 //#region src/js/modules/fields/address-state.ts
 var l = "[data-formie-address-state-dynamic]", u = "[data-formie-address-state-input]", d = "[data-formie-address-state-autofill-anchor]", f = "formie-address-autofill-start", p = a.country, m = "address-state", h = "formie/address/subdivisions", g = ["formie-select", "formie-dropdown-input"], _ = [
 	0,
@@ -123,11 +123,7 @@ function L(e, t) {
 		"data-formie-address-state-option-value"
 	].forEach((n) => {
 		let r = e.getAttribute(n);
-		if (r === null) {
-			t.removeAttribute(n);
-			return;
-		}
-		t.setAttribute(n, r);
+		r === null ? t.removeAttribute(n) : t.setAttribute(n, r);
 	});
 }
 function R(e, t) {
@@ -172,11 +168,7 @@ function W(e, t, n, r) {
 }
 function G(e, t) {
 	let { stateField: n, stateControl: i, required: a } = e;
-	if (r(n, n, "conditionalHidden", !t), n.toggleAttribute("data-formie-address-state-hidden", !t), !t) {
-		i.required = !1, i.disabled = !e.isCpEdit;
-		return;
-	}
-	i.disabled = !1, i.required = a;
+	r(n, n, "conditionalHidden", !t), n.toggleAttribute("data-formie-address-state-hidden", !t), t ? (i.disabled = !1, i.required = a) : (i.required = !1, i.disabled = !e.isCpEdit);
 }
 function K(e) {
 	if (e.fetchingAnnouncementEl) return e.fetchingAnnouncementEl;
@@ -203,16 +195,25 @@ function X(e, t) {
 	let r = n.querySelector("[data-formie-field-required], .required");
 	n.textContent = t, r && n.appendChild(r);
 }
-function Z(e, t) {
+function Z(e, t, n) {
 	e.setAttribute("data-formie-combobox-input", "true"), s(e, "combobox", "before-init", {
 		select: e,
-		options: { placeholder: t }
+		options: {
+			placeholder: t,
+			maxOptions: n
+		}
+	});
+	let r = c(e, {
+		placeholder: t,
+		maxOptions: n
 	});
-	let n = c(e, { placeholder: t });
 	return s(e, "combobox", "after-init", {
 		combobox: e._formieTomSelect,
-		options: { placeholder: t }
-	}), n;
+		options: {
+			placeholder: t,
+			maxOptions: n
+		}
+	}), r;
 }
 async function Q(t, n) {
 	let { hideWhenUnused: r = !0, useSearchable: i = !0, useDatalist: a = !0, optionLabel: o = "name", optionValue: s = "name", placeholder: c = null, subdivisionsAction: l = h } = n, u = t.countryControl?.value?.trim() || "";
@@ -245,7 +246,7 @@ async function Q(t, n) {
 	}
 	if (G(t, !0), X(t.stateField, v), g.length > 0) {
 		let e = t.stateControl instanceof HTMLSelectElement ? t.stateControl : U(t.stateControl, d, g, c);
-		t.stateControl === e ? (z(t.stateControl, e), H(e, g, c, e.value)) : t.stateControl = B(t.stateControl, e), i ? t.comboboxCleanup = Z(e, c) : e.removeAttribute("data-formie-combobox-input"), D(e, I(d, g) || d), j(t);
+		t.stateControl === e ? (z(t.stateControl, e), H(e, g, c, e.value)) : t.stateControl = B(t.stateControl, e), i ? t.comboboxCleanup = Z(e, c, n.searchableOptionLimit) : e.removeAttribute("data-formie-combobox-input"), D(e, I(d, g) || d), j(t);
 		return;
 	}
 	let y = t.stateControl instanceof HTMLInputElement ? t.stateControl : V(t.stateControl, d);
@@ -311,15 +312,9 @@ function ne(e, t) {
 		let n = e.target;
 		if (!(n instanceof HTMLInputElement || n instanceof HTMLSelectElement)) return;
 		let r = n === a.autofillAnchor, i = n.matches(l) || n.matches(u);
-		if ((r || i) && (i && !r && (O(a, n.value), a.pendingStateValue = n.value), k(a), a.countryControl?.value?.trim())) {
-			if (a.lastSubdivisions.length > 0) {
-				j(a);
-				return;
-			}
-			a.lastCountry = "", Q(a, t).then(() => {
-				j(a);
-			});
-		}
+		(r || i) && (i && !r && (O(a, n.value), a.pendingStateValue = n.value), k(a), a.countryControl?.value?.trim() && (a.lastSubdivisions.length > 0 ? j(a) : (a.lastCountry = "", Q(a, t).then(() => {
+			j(a);
+		}))));
 	}, g = (e) => {
 		if (e.animationName !== f) return;
 		let r = e.target;
@@ -328,13 +323,9 @@ function ne(e, t) {
 		})));
 	}, _ = (e) => {
 		let n = e.detail?.state?.trim();
-		if (!n) {
-			p();
-			return;
-		}
-		a.pendingStateValue = n, O(a, n), Q(a, t).then(() => {
+		n ? (a.pendingStateValue = n, O(a, n), Q(a, t).then(() => {
 			j(a), a.lastCountry = a.countryControl?.value?.trim() || "";
-		});
+		})) : p();
 	}, y = (e) => {
 		d !== null && window.clearTimeout(d), d = window.setTimeout(() => {
 			d = null, !(e.defaultPrevented || c) && ($(a), a.stateControl.value = "", a.pendingStateValue = o, O(a, o), p(!0));

package/dist/chunks/{api-BK9b340y.js → api-BPtH5RBA.js}

@@ -1,5 +1,5 @@
 import { a as e } from "./event-names-BCI2FLD8.js";
-import { t } from "./debug-BV0DvdHx.js";
+import { t } from "./debug-rhzqP1j2.js";
 import { t as n } from "./theme-classes-DAQuEqdP.js";
 import { n as r, t as i } from "./async-2GdXNFCE.js";
 import { i as a } from "./i18n-BY1ds1BL.js";
@@ -98,17 +98,18 @@ function O(e, t) {
 	return !n || typeof n != "object" ? null : n;
 }
 function k(e, t, n, r) {
-	let a = /* @__PURE__ */ new Set(), o = () => {
-		let i = x(e, t), o = new Set(i.filter((e) => S(e)));
+	let a = /* @__PURE__ */ new Set(), o = !0, s = () => {
+		if (!o) return;
+		let i = x(e, t), s = new Set(i.filter((e) => S(e)));
 		i.forEach((e) => {
-			o.has(e) && !a.has(e) && (a.add(e), n(e));
+			s.has(e) && !a.has(e) && (a.add(e), n(e));
 		}), Array.from(a).forEach((e) => {
-			o.has(e) || (a.delete(e), r(e));
+			s.has(e) || (a.delete(e), r(e));
 		});
-	}, s = i(o, 20), c = new MutationObserver(() => {
-		s();
+	}, c = i(s, 20), l = new MutationObserver(() => {
+		c();
 	});
-	c.observe(e, {
+	l.observe(e, {
 		childList: !0,
 		subtree: !0,
 		attributes: !0,
@@ -120,25 +121,21 @@ function k(e, t, n, r) {
 			"data-formie-page-hidden"
 		]
 	});
-	let l = [b(window, "resize", () => {
-		s();
+	let u = [b(window, "resize", () => {
+		c();
 	}), ...v.map((t) => b(e, t, () => {
-		if (y.has(t)) {
-			o();
-			return;
-		}
-		s();
+		y.has(t) ? s() : c();
 	}))];
-	return o(), {
+	return s(), {
 		cleanup: () => {
-			c.disconnect(), l.forEach((e) => {
+			o && (o = !1, l.disconnect(), u.forEach((e) => {
 				e();
 			}), Array.from(a).forEach((e) => {
 				r(e);
-			}), a.clear();
+			}), a.clear());
 		},
-		reconcile: s,
-		reconcileImmediate: o,
+		reconcile: c,
+		reconcileImmediate: s,
 		getVisible: () => x(e, t).filter((e) => S(e))
 	};
 }
@@ -162,15 +159,15 @@ function j(e, t, { defaultPlaceholderSelector: n, defaultTokenFieldNames: r = []
 		provider: c
 	};
 }
-function M(e, t) {
-	let n = e.form || e.root, r = t.ui.placeholderSelector, i = t.handle;
+function M(e, t, n = {}) {
+	let r = e.form || e.root, i = t.ui.placeholderSelector, a = t.handle;
 	return {
 		form: e.form,
 		root: e.root,
 		placeholder: {
-			query: () => x(e.root, r),
-			getPrimary: () => C(e.root, r),
-			observe: (t, n) => k(e.root, r, t, n),
+			query: () => x(e.root, i),
+			getPrimary: () => C(e.root, i),
+			observe: (t, n) => k(e.root, i, t, n),
 			createContainer: (e) => w(e),
 			clear: (e) => {
 				e && (T(e), e.innerHTML = "");
@@ -178,35 +175,35 @@ function M(e, t) {
 		},
 		errors: {
 			getDefaultMessage: () => t.ui.errorMessage,
-			show: (n, i) => {
-				E(i || C(e.root, r), n || t.ui.errorMessage, e.form || e.root);
+			show: (r, a) => {
+				n.isActive?.() !== !1 && E(a || C(e.root, i), r || t.ui.errorMessage, e.form || e.root);
 			},
 			clear: (t) => {
-				T(t || C(e.root, r));
+				n.isActive?.() !== !1 && T(t || C(e.root, i));
 			}
 		},
 		tokens: {
 			names: t.transport.tokenFieldNames,
-			has: (e = t.transport.tokenFieldNames, r = n) => f(r, e),
-			read: (e = t.transport.tokenFieldNames[0], r = n) => e ? d(r, e) : "",
-			write: (r, { names: i = t.transport.tokenFieldNames, root: a = n, container: o = e.form } = {}) => {
-				i.forEach((e) => {
-					m(a, e, {
-						value: r,
-						container: o
+			has: (e = t.transport.tokenFieldNames, n = r) => f(n, e),
+			read: (e = t.transport.tokenFieldNames[0], n = r) => e ? d(n, e) : "",
+			write: (i, { names: a = t.transport.tokenFieldNames, root: o = r, container: s = e.form } = {}) => {
+				n.isActive?.() !== !1 && (n.onTokenFieldNames?.(a), a.forEach((e) => {
+					m(o, e, {
+						value: i,
+						container: s
 					});
-				});
+				}));
 			},
-			clear: (e = t.transport.tokenFieldNames, r = n) => {
-				p(r, e);
+			clear: (e = t.transport.tokenFieldNames, i = r) => {
+				n.isActive?.() !== !1 && p(i, e);
 			},
-			wait: (e = t.transport.waitForValueMs, r = t.transport.tokenFieldNames, i = n) => h(i, r, e)
+			wait: (e = t.transport.waitForValueMs, n = t.transport.tokenFieldNames, i = r) => h(i, n, e)
 		},
 		refresh: {
-			providerHandle: i,
+			providerHandle: a,
 			onTokensRefreshed: (t) => {
 				let n = ["formie:refresh-tokens:after", "formie:refresh-tokens:refreshed"].map((n) => b(e.root, n, (e) => {
-					let n = O(D(e), i);
+					let n = O(D(e), a);
 					n && t(n);
 				}));
 				return () => {
@@ -249,22 +246,45 @@ function P({ moduleId: e, defaultPlaceholderSelector: t, defaultTokenFieldNames:
 				if (!e) throw Error("The CAPTCHA needs a supported placeholder in the client-rendered form.");
 				s = document.createElement("div"), s.setAttribute(e, ""), (a.form ?? a.root).append(s);
 			}
-			let c = M(a, o), l = await i({
-				...a,
-				options: o,
-				services: c
-			});
-			if (!l) {
-				s?.remove();
-				return;
-			}
-			let u = l.destroy;
-			return {
-				...l,
-				destroy: async () => {
-					await u(), s?.remove();
-				}
+			let c = new Set(o.transport.tokenFieldNames), l = !0, u = (e) => {
+				e.filter(Boolean).forEach((e) => c.add(e));
 			};
+			u(o.transport.sessionKey ? [o.transport.sessionKey] : []);
+			let d = M(a, o, {
+				onTokenFieldNames: u,
+				isActive: () => l
+			}), f = d.events.onForm("formie:unload-warning:collect-exclusions", (e) => {
+				let t = e.detail;
+				t?.form === a.form && t.exclude(...c);
+			}), p = d.refresh.onTokensRefreshed((e) => {
+				typeof e.sessionKey == "string" && e.sessionKey.trim() !== "" && u([e.sessionKey.trim()]);
+			}), m = () => {
+				l = !1, f(), p(), s?.remove();
+			};
+			try {
+				let e = await i({
+					...a,
+					options: o,
+					services: d
+				});
+				if (!e) {
+					m();
+					return;
+				}
+				let t = e.destroy;
+				return {
+					...e,
+					destroy: async () => {
+						try {
+							await t();
+						} finally {
+							m();
+						}
+					}
+				};
+			} catch (e) {
+				throw m(), e;
+			}
 		}
 	};
 }
@@ -316,28 +336,38 @@ function I(t) {
 		defaultPlaceholderSelector: t.defaultPlaceholderSelector,
 		defaultTokenFieldNames: t.defaultTokenFieldNames,
 		setup: async (n) => {
-			let r = [], i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = n.services.placeholder.getPrimary(), s = !1, c, l = null, u = async () => (l ||= (N.log("Loading captcha provider API.", { moduleId: t.moduleId }), t.load(n)), l), d = async (e) => {
-				let r = i.get(e);
-				if (n.services.errors.clear(e), !r) {
-					e.innerHTML = "";
-					return;
-				}
-				let a = await u();
-				t.unmount && await t.unmount({
-					api: a,
-					widget: r,
-					placeholder: e,
-					services: n.services,
-					options: n.options,
-					provider: n.options.provider
-				}), i.delete(e), e.innerHTML = "", n.services.tokens.clear(), N.log("Unmounted captcha placeholder widget.", { moduleId: t.moduleId }), o === e && (o = n.services.placeholder.getPrimary());
-			}, f = async (e) => {
-				if (s || i.has(e)) return;
+			let r = [], i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = null, c = n.services.placeholder.getPrimary(), l = !1, u, d = null, f = async () => (d ||= (N.log("Loading captcha provider API.", { moduleId: t.moduleId }), t.load(n)), d), p = (e) => {
+				let r = o.get(e);
+				if (r) return r;
+				let s = (async () => {
+					await a.get(e)?.catch(() => {}), n.services.errors.clear(e);
+					let r = i.has(e), o = i.get(e);
+					i.delete(e);
+					try {
+						if (r && t.unmount) {
+							let r = await f();
+							await t.unmount({
+								api: r,
+								widget: o,
+								placeholder: e,
+								services: n.services,
+								options: n.options,
+								provider: n.options.provider
+							});
+						}
+					} finally {
+						e.innerHTML = "", n.services.tokens.clear(), c === e && (c = n.services.placeholder.getPrimary());
+					}
+				})().finally(() => o.delete(e));
+				return o.set(e, s), s;
+			}, m = async (e) => {
+				let r = o.get(e);
+				if (r && await r, l || i.has(e)) return;
 				if (a.has(e)) return a.get(e);
-				let r = (async () => {
-					let r = await u();
-					if (s || i.has(e)) return;
-					let a = n.services.placeholder.createContainer(e), c = await t.mount({
+				let s = (async () => {
+					let r = await f();
+					if (l || i.has(e)) return;
+					let a = n.services.placeholder.createContainer(e), o = await t.mount({
 						api: r,
 						placeholder: e,
 						container: a,
@@ -345,30 +375,29 @@ function I(t) {
 						options: n.options,
 						provider: n.options.provider
 					});
-					i.set(e, c), o = e, N.log("Mounted captcha placeholder widget.", { moduleId: t.moduleId });
+					i.set(e, o), c = e, N.log("Mounted captcha placeholder widget.", { moduleId: t.moduleId });
 				})().finally(() => {
 					a.delete(e);
 				});
-				a.set(e, r), await r;
-			}, p = n.services.placeholder.observe((e) => {
-				o = e, f(e).catch((e) => {
-					c = e;
+				a.set(e, s), await s;
+			}, h = n.services.placeholder.observe((e) => {
+				c = e, m(e).catch((e) => {
+					u = e;
 				});
 			}, (e) => {
-				d(e);
+				l || p(e).catch((e) => {
+					u = e;
+				});
 			});
-			r.push(p.cleanup);
-			let m = async (e) => {
-				let r = p.getVisible();
+			r.push(h.cleanup);
+			let g = async (e) => {
+				if (l) return;
+				let r = h.getVisible();
 				if (t.reset) {
-					let a = await u();
+					let a = await f();
 					for (let o of r) {
 						let r = i.get(o);
-						if (!r) {
-							await f(o);
-							continue;
-						}
-						await t.reset({
+						i.has(o) ? (await t.reset({
 							api: a,
 							widget: r,
 							placeholder: o,
@@ -376,55 +405,58 @@ function I(t) {
 							options: n.options,
 							provider: n.options.provider,
 							reason: e
-						}), n.services.tokens.clear(), n.services.errors.clear(o);
+						}), n.services.tokens.clear(), n.services.errors.clear(o)) : await m(o);
 					}
-					p.reconcile();
-					return;
+					h.reconcile();
+				} else {
+					for (let e of Array.from(i.keys())) await p(e);
+					for (let e of r) await m(e);
+					h.reconcile();
 				}
-				for (let e of Array.from(i.keys())) await d(e);
-				for (let e of r) await f(e);
-				p.reconcile();
 			};
 			r.push(n.services.events.onRoot("formie:submit:result", (e) => {
 				let t = e instanceof CustomEvent ? e.detail : null;
-				t?.stage !== "validate" && (t?.ok !== !1 || t?.stage !== "challenge") && t?.ok !== !0 && m("submit-result");
+				t?.stage !== "validate" && (t?.ok !== !1 || t?.stage !== "challenge") && t?.ok !== !0 && g("submit-result");
 			})), n.form && r.push(n.services.events.onForm(e("reset"), () => {
-				o = n.services.placeholder.getPrimary() || o, window.setTimeout(() => {
-					m("reset-state");
+				c = n.services.placeholder.getPrimary() || c, window.setTimeout(() => {
+					g("reset-state");
 				}, 0);
-			})), p.reconcileImmediate();
+			}));
+			let _ = () => s || (l = !0, s = (async () => {
+				r.forEach((e) => e()), await Promise.allSettled([...a.values()]);
+				let e = (await Promise.allSettled(/* @__PURE__ */ new Set([...o.values(), ...Array.from(i.keys(), p)]))).flatMap((e) => e.status === "rejected" ? [e.reason] : []);
+				if (e.length) throw AggregateError(e, "CAPTCHA widgets could not clean up.");
+			})(), s);
+			h.reconcileImmediate();
 			try {
-				if (await Promise.all([...a.values()]), c) throw c;
+				if (await Promise.all([...a.values()]), u) throw u;
 			} catch (e) {
-				throw s = !0, r.forEach((e) => e()), e;
+				throw await _().catch((e) => {
+					N.warn("Captcha cleanup after failed setup.", { error: e });
+				}), e;
 			}
 			return {
 				assertReady: () => {
-					if (c) throw c;
-				},
-				destroy: async () => {
-					s = !0, r.forEach((e) => {
-						e();
-					});
-					for (let e of Array.from(i.keys())) await d(e);
+					if (u) throw u;
 				},
+				destroy: _,
 				beforeSubmit: async (e) => {
 					if (e.action !== "submit") return;
-					p.reconcileImmediate();
-					let r = p.getVisible();
+					h.reconcileImmediate();
+					let r = h.getVisible();
 					if (r.length === 0) return;
-					let a = r.find((e) => e === o) || r[0];
-					await f(a), a = o || a, n.services.errors.clear(a);
-					let s = i.get(a);
-					if (!s) {
+					let a = r.find((e) => e === c) || r[0];
+					await m(a), a = c || a, n.services.errors.clear(a);
+					let o = i.get(a);
+					if (!i.has(a)) {
 						let r = n.services.errors.getDefaultMessage();
 						n.services.errors.show(r, a), N.warn("Captcha widget unavailable at challenge stage.", { moduleId: t.moduleId }), e.abort(r);
 						return;
 					}
-					let c = await u();
+					let s = await f();
 					await t.challenge({
-						api: c,
-						widget: s,
+						api: s,
+						widget: o,
 						placeholder: a,
 						services: n.services,
 						options: n.options,