@verbb/formie-browser 1.0.13 → 1.0.14

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 ## Unreleased
 
+## 1.0.14 - 2026-10-08
+
+### Added
+- Add a `formie:field:clear` event for custom controls to clear their values when conditions hide a field or page.
+- Add one generated browser-theme state manifest and canonical state classes for browser-created controls.
+- Add `data-formie-validation-skip` so helper controls (such as the Upload Manager browse input) can opt out of client-side validation.
+
+### Changed
+- Use Tailwind's Rose palette for the default danger theme colors.
+- Use Tailwind's Emerald palette for the default success theme colors.
+- Add themeable borders to success and error form messages.
+- Consume canonical payment actions and domain status independently from completion redirects, retaining the Formie 3 response facade.
+- Expose mounted instances and current failures as a structured hydration report, separately from runtime lifecycle controls.
+- Consume canonical completion data attributes and response fields while retaining Formie 3 markup and response fallbacks.
+- Resolve surface-specific browser-module manifests by exact occurrence key, pass the exact rendering surface to match and setup hooks, and expose stable `beforeSubmit` and `afterSubmit` lifecycle hooks instead of internal pipeline stages.
+- Read the bounded `data-formie-theme-classes` contract, stop posting executable theme config during Summary refreshes, and keep client-rendered forms responsible for their own markup.
+- Split required `formie-base.css` behaviour from optional `formie-theme.css` visuals while retaining combined `formie.css`.
+- Share versioned tri-state conditions and plain-text validation rules across PHP and browser consumers; enforce recursive hidden-value clearing and server-authoritative navigation.
+- Preserve exact nested submission error paths, return typed page-transition results, and distinguish skipped side effects from invalid condition configuration.
+- Consume the shared completion outcome and preserve the server-owned configuration and query-prefill boundary.
+- Resolve trusted versioned browser modules, reconcile occurrence lifecycles and failures, and restrict full form mounts to server-rendered HTML.
+- Share reference parsing with the Variable Picker and diagnose unavailable browser references.
+- Initialize Opayo through its CSRF-protected payment-session endpoint and display unknown payment outcomes as awaiting reconciliation.
+- Use browser-bound creation plus separate view, delete and attach capabilities for Upload Manager assets, and submit staged files as structured upload references instead of authoritative asset IDs.
+- Carry expected submission versions and signed request tokens through submit and page-state requests.
+
+### Fixed
+- Fixed successful front-end submission edits showing an unsaved-changes warning when leaving the page.
+- Fixed saved uploads being cleared when opening a submission for editing or resuming.
+- Fixed conditional Date/Time fields failing to initialize when shown again.
+- Fixed conditionally hidden date and signature fields retaining their previous values.
+- Fixed browser module errors repeatedly updating the page and making forms unresponsive.
+- Fixed unchecked checkbox groups being treated as nonempty by browser conditions.
+- Fixed empty searchable multi-select fields being treated as filled by conditions.
+- Fixed date pickers retaining a submitted date after their visible input reset.
+- Fixed signatures carrying over into a new submission after a form reset.
+- Fixed searchable Dropdown fields showing a stale selection after a form reset.
+- Fixed checkbox, radio, rich-text, rating, and rank fields retaining stale values or display state after a form reset.
+- Fixed “Disable Submit Button Until Valid” being ignored on server-rendered forms and repeatedly updating disabled buttons.
+- Fixed successful AJAX redirects triggering an unsaved-changes warning.
+- Fixed refreshed upload tokens triggering an unsaved-changes warning after a successful form submission.
+- Fix TypeScript declaration imports when the npm packages are installed outside the Formie workspace.
+- Present required browser-module failures as accessible alerts with collapsed, copyable technical details, while keeping raw exception details restricted to Craft's authenticated submission editor.
+- Let the persistent field error region own announcements without reserving empty layout space or overriding its configured priority with nested assertive alerts. ([#2954](https://github.com/verbb/formie/issues/2954))
+- Keep Stripe checkout amounts aligned with server rounding and UGX currency conversion.
+- Open Paddle checkout using the transaction created by the server.
+- Refresh cached form tokens when Twig emits the static-cache attribute without a value.
+- Fix required File Upload fields using Upload Manager never passing client-side validation after a successful upload. ([#2924](https://github.com/verbb/formie/issues/2924))
+- Fix Advanced Upload Manager and form transport helpers hard-coding `CRAFT_CSRF_TOKEN`, so uploads and related XHR requests work when Craft’s `csrfTokenName` is customised.
+
 ## 1.0.13 - 2026-07-09
 
 ### Fixed

package/dist/chunks/{address-country-Rx6GQTND.js → address-country-Dn71jroa.js}

@@ -1,7 +1,7 @@
 import { t as e } from "./debug-BV0DvdHx.js";
 import { i as t, n } from "./constants-DVcJAvc5.js";
-import { r } from "./shared-Bx9s0i0P.js";
-import { n as i } from "./country-from-ip-BwxKaBuJ.js";
+import { i as r } from "./shared-OKhSay59.js";
+import { n as i } from "./country-from-ip-DDj_mFki.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) {
@@ -35,7 +35,7 @@ async function f(e, n) {
 		return;
 	}
 	if (r.value.trim()) return;
-	let a = await i(n.countryFromIpAction);
+	let a = await i(n.countryFromIpAction, e.closest("form"));
 	if (!a?.countryCode) return;
 	if (!l(a.countryCode, n.countryAllowed)) {
 		s.log("Detected country is not in the allowed list; skipping preselect.", { countryCode: a.countryCode });
@@ -49,7 +49,13 @@ async function f(e, n) {
 	await d(r, f), s.log("Preselected country from IP.", { selectValue: f });
 }
 var p = {
-	id: a,
+	moduleId: `formie:${a}`,
+	version: 2,
+	surfaces: [
+		"server-rendered",
+		"client-rendered",
+		"cp-edit"
+	],
 	kind: "field",
 	match: (e) => !!e.target.querySelector(o),
 	setup: async (e) => {

package/dist/chunks/{address-finder-k7_BXaRe.js → address-finder-O49uDRoR.js}

@@ -1,9 +1,9 @@
 import { n as e } from "./event-names-BCI2FLD8.js";
-import { t } from "./api-sPqGbOww.js";
+import { t } from "./api-ghNr2uxX.js";
 import { r as n } from "./scripts-CbQ7agX3.js";
 //#region src/js/modules/address/address-finder.ts
 var r = "FORMIE_ADDRESS_FINDER_SCRIPT", i = t({
-	id: "address-finder",
+	moduleId: "formie:address-finder",
 	load: async () => n("AddressFinder", {
 		id: r,
 		src: "https://api.addressfinder.io/assets/v3/widget.js",

package/dist/chunks/{address-state-BwE01m2_.js → address-state-ByYatUur.js}

@@ -1,55 +1,58 @@
-import { t as e } from "./debug-BV0DvdHx.js";
-import { n as t } from "./constants-DVcJAvc5.js";
-import { r as n, t as r } from "./shared-Bx9s0i0P.js";
-import { initFormieCombobox as i } from "./combobox-C0EuExSI.js";
+import { t as e } from "./request-profile-DhwkeCpS.js";
+import { t } from "./dist-ZLeW0zZ3.js";
+import { t as n } from "./debug-BV0DvdHx.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-CWNdx4Fk.js";
 //#region src/js/modules/fields/address-state.ts
-var a = "[data-formie-address-state-dynamic]", o = "[data-formie-address-state-input]", s = "[data-formie-address-state-autofill-anchor]", c = "formie-address-autofill-start", l = t.country, u = "address-state", d = "formie/address/subdivisions", f = ["formie-select", "formie-dropdown-input"], p = [
+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,
 	100,
 	300
-], m = e("fields", "address-state"), h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map();
-function _(e) {
+], v = n("fields", "address-state"), y = /* @__PURE__ */ new Map(), b = /* @__PURE__ */ new Map();
+function x(e) {
 	return e.closest("[data-formie-field-type=\"address\"]") || e.closest("[data-formie-address-field-layout]")?.closest("[data-formie-field]") || e.closest("[data-formie-field]");
 }
-function v(e) {
-	let t = e.querySelector(l);
+function S(e) {
+	let t = e.querySelector(p);
 	return t instanceof HTMLInputElement || t instanceof HTMLSelectElement ? t : null;
 }
-function y(e) {
-	let t = e.querySelector(a);
+function C(e) {
+	let t = e.querySelector(l);
 	return t instanceof HTMLInputElement || t instanceof HTMLSelectElement ? t : null;
 }
-function b(e) {
+function w(e) {
 	return e.querySelector("[data-formie-field-label]");
 }
-function x(e) {
+function T(e) {
 	e.dispatchEvent(new Event("input", { bubbles: !0 })), e.dispatchEvent(new Event("change", { bubbles: !0 }));
 }
-function S(e, t) {
+function E(e, t) {
 	if (!(e instanceof HTMLSelectElement)) return;
 	let n = e._formieTomSelect;
 	n && n.getValue() !== t && n.setValue(t, !0);
 }
-function C(e, t) {
+function D(e, t) {
 	if (e.value !== t) {
-		e.value = t, x(e);
+		e.value = t, T(e);
 		return;
 	}
-	S(e, t);
+	E(e, t);
 }
-function w(e, t) {
+function O(e, t) {
 	e.autofillAnchor && (e.autofillAnchor.value = t);
 }
-function T(e) {
+function k(e) {
 	let t = e.autofillAnchor?.value?.trim() || "", n = e.stateControl.value?.trim() || "", r = t || n;
 	r && (e.pendingStateValue = r);
 }
-function E(e) {
+function A(e) {
 	return e.pendingStateValue?.trim() || e.autofillAnchor?.value?.trim() || e.stateControl.value?.trim() || "";
 }
-function D(e) {
+function j(e) {
 	if (e.autofillAnchor) return e.autofillAnchor;
-	let t = e.addressRoot.querySelector(s);
+	let t = e.addressRoot.querySelector(d);
 	if (t instanceof HTMLInputElement) e.autofillAnchor = t;
 	else {
 		let t = document.createElement("input");
@@ -57,18 +60,18 @@ function D(e) {
 	}
 	return e.stateControl.setAttribute("autocomplete", "off"), e.stateControl.value && !e.autofillAnchor.value && (e.autofillAnchor.value = e.stateControl.value), e.autofillAnchor;
 }
-function O(e) {
-	T(e);
-	let t = E(e);
+function M(e) {
+	k(e);
+	let t = A(e);
 	if (!t) return;
-	let n = e.lastSubdivisions, r = n.length > 0 && N(t, n) || t;
-	C(e.stateControl, r), S(e.stateControl, r), w(e, r), e.pendingStateValue = r;
+	let n = e.lastSubdivisions, r = n.length > 0 && L(t, n) || t;
+	D(e.stateControl, r), E(e.stateControl, r), O(e, r), e.pendingStateValue = r;
 }
-function k(e, t, n, r) {
-	let i = new URL(e.startsWith("/") ? e : `/actions/${e}`, window.location.origin);
+function N(e, t, n, r) {
+	let i = new URL(/^https?:\/\//.test(e) || e.startsWith("/") ? e : `/actions/${e}`, window.location.origin);
 	return i.searchParams.set("country", t), i.searchParams.set("optionLabel", n), i.searchParams.set("optionValue", r), i.toString();
 }
-function A(e, t, n, r) {
+function P(e, t, n, r) {
 	return [
 		e,
 		t,
@@ -76,34 +79,34 @@ function A(e, t, n, r) {
 		r
 	].join("|");
 }
-function j(e) {
-	return h.has(e);
+function F(e) {
+	return y.has(e);
 }
-async function M(e, t, n, r) {
-	let i = A(e, t, n, r);
-	return h.has(i) ? h.get(i) || null : (g.has(i) || g.set(i, (async () => {
+async function I(e, n, r, i, a) {
+	let o = P(e, n, r, i);
+	return y.has(o) ? y.get(o) || null : (b.has(o) || b.set(o, (async () => {
 		try {
-			let a = await fetch(k(r, e, t, n), { headers: { Accept: "application/json" } });
-			if (!a.ok) return h.set(i, null), null;
-			let o = await a.json();
-			return h.set(i, o), o;
+			let s = await t(N(i, e, n, r), { headers: { Accept: "application/json" } }, a);
+			if (!s.ok) return y.set(o, null), null;
+			let c = await s.json();
+			return y.set(o, c), c;
 		} catch (t) {
-			return m.warn("Failed fetching subdivisions.", {
+			return v.warn("Failed fetching subdivisions.", {
 				country: e,
 				error: t
-			}), h.set(i, null), null;
+			}), y.set(o, null), null;
 		} finally {
-			g.delete(i);
+			b.delete(o);
 		}
-	})()), g.get(i) || null);
+	})()), b.get(o) || null);
 }
-function N(e, t) {
+function L(e, t) {
 	let n = e.trim().toLowerCase();
 	if (!n) return null;
 	for (let e of t) if (e.value.toLowerCase() === n || (e.name || "").toLowerCase() === n || (e.short || "").toLowerCase() === n || e.label.toLowerCase() === n) return e.value;
 	return null;
 }
-function P(e, t) {
+function R(e, t) {
 	[
 		"id",
 		"name",
@@ -129,33 +132,35 @@ function P(e, t) {
 		t.setAttribute(n, r);
 	});
 }
-function F(e, t) {
+function z(e, t) {
 	t.className = e.className;
 }
-function I(e, t) {
-	let n = [...f];
-	e.classList.contains("formie-input-error") && n.push("formie-input-error"), t.className = n.join(" ");
+function B(e, t) {
+	let n = [...g];
+	i(e, "fieldControlError").forEach((t) => {
+		e.classList.contains(t) && n.push(t);
+	}), t.className = n.join(" ");
 }
-function L(e, t) {
+function V(e, t) {
 	return e.parentNode?.replaceChild(t, e), t;
 }
-function R(e, t) {
+function H(e, t) {
 	let n = document.createElement("input");
-	return n.type = "text", P(e, n), F(e, n), n.setAttribute("data-formie-input-type", "text"), n.setAttribute("data-formie-address-state-input", "true"), n.setAttribute("data-formie-single-line-text-input", "true"), n.setAttribute("autocomplete", "off"), n.removeAttribute("data-formie-combobox-input"), n.value = t, n;
+	return n.type = "text", R(e, n), z(e, n), n.setAttribute("data-formie-input-type", "text"), n.setAttribute("data-formie-address-state-input", "true"), n.setAttribute("data-formie-single-line-text-input", "true"), n.setAttribute("autocomplete", "off"), n.removeAttribute("data-formie-combobox-input"), n.value = t, n;
 }
-function z(e, t, n, r = "") {
+function U(e, t, n, r = "") {
 	e.innerHTML = "";
 	let i = document.createElement("option");
 	i.value = "", i.textContent = n || "", e.appendChild(i), t.forEach((t) => {
 		let n = document.createElement("option");
 		n.value = t.value, n.textContent = t.label, e.appendChild(n);
-	}), e.value = N(r, t) || r;
+	}), e.value = L(r, t) || r;
 }
-function B(e, t, n, r) {
+function W(e, t, n, r) {
 	let i = document.createElement("select");
-	return P(e, i), I(e, i), i.setAttribute("data-formie-input-type", "select"), i.setAttribute("data-formie-address-state-input", "true"), i.setAttribute("data-formie-select", "true"), i.setAttribute("data-formie-dropdown-input", "true"), i.removeAttribute("data-formie-single-line-text-input"), i.setAttribute("autocomplete", "off"), z(i, n, r, t), i;
+	return R(e, i), B(e, i), i.setAttribute("data-formie-input-type", "select"), i.setAttribute("data-formie-address-state-input", "true"), i.setAttribute("data-formie-select", "true"), i.setAttribute("data-formie-dropdown-input", "true"), i.removeAttribute("data-formie-single-line-text-input"), i.setAttribute("autocomplete", "off"), U(i, n, r, t), i;
 }
-function V(e, t, n, r) {
+function G(e, t, n, r) {
 	let i = e.list;
 	if (!r || n.length === 0) {
 		e.removeAttribute("list"), i && i.remove();
@@ -167,110 +172,110 @@ function V(e, t, n, r) {
 		n.value = t.label, a?.appendChild(n);
 	}), e.setAttribute("list", t);
 }
-function H(e, t) {
-	let { stateField: n, stateControl: r, required: i } = e;
-	if (n.classList.toggle("formie-conditionally-hidden", !t), n.toggleAttribute("data-formie-conditionally-hidden", !t), !t) {
-		r.required = !1, r.disabled = !0;
+function K(e, t) {
+	let { stateField: n, stateControl: i, required: a } = e;
+	if (r(n, n, "conditionalHidden", !t), n.toggleAttribute("data-formie-conditionally-hidden", !t), !t) {
+		i.required = !1, i.disabled = !0;
 		return;
 	}
-	r.disabled = !1, r.required = i;
+	i.disabled = !1, i.required = a;
 }
-function U(e) {
+function q(e) {
 	if (e.fetchingAnnouncementEl) return e.fetchingAnnouncementEl;
 	let t = document.createElement("div");
 	return t.className = "formie-sr-only", t.setAttribute("data-formie-address-state-fetching-announce", "true"), t.setAttribute("aria-live", "polite"), t.setAttribute("aria-atomic", "true"), e.addressRoot.appendChild(t), e.fetchingAnnouncementEl = t, t;
 }
-function W() {
+function J() {
 	let e = document.createElement("div");
 	e.className = "formie-address-state-skeleton", e.setAttribute("data-formie-address-state-skeleton", "true"), e.setAttribute("aria-hidden", "true");
 	let t = document.createElement("div");
 	return t.className = "formie-address-state-skeleton-input", e.appendChild(t), e;
 }
-function G(e) {
-	e.addressRoot.setAttribute("data-formie-address-state-fetching", "true"), e.countryControl?.setAttribute("aria-busy", "true"), e.stateControl.setAttribute("aria-hidden", "true"), e.stateControl.setAttribute("tabindex", "-1"), e.stateField.classList.remove("formie-conditionally-hidden"), e.stateField.removeAttribute("data-formie-conditionally-hidden"), e.stateField.setAttribute("data-formie-address-state-skeleton-active", "true");
+function Y(e) {
+	e.addressRoot.setAttribute("data-formie-address-state-fetching", "true"), e.countryControl?.setAttribute("aria-busy", "true"), e.stateControl.setAttribute("aria-hidden", "true"), e.stateControl.setAttribute("tabindex", "-1"), r(e.stateField, e.stateField, "conditionalHidden", !1), e.stateField.removeAttribute("data-formie-conditionally-hidden"), e.stateField.setAttribute("data-formie-address-state-skeleton-active", "true");
 	let t = e.stateField.querySelector("[data-formie-field-control]");
-	t instanceof HTMLElement && (e.skeletonEl || (e.skeletonEl = W(), t.appendChild(e.skeletonEl)), e.skeletonEl.removeAttribute("hidden")), U(e).textContent = "Loading state or province options for the selected country.";
+	t instanceof HTMLElement && (e.skeletonEl || (e.skeletonEl = J(), t.appendChild(e.skeletonEl)), e.skeletonEl.removeAttribute("hidden")), q(e).textContent = "Loading state or province options for the selected country.";
 }
-function K(e) {
+function X(e) {
 	e.addressRoot.removeAttribute("data-formie-address-state-fetching"), e.countryControl?.removeAttribute("aria-busy"), e.stateControl.removeAttribute("aria-hidden"), e.stateControl.removeAttribute("tabindex"), e.stateField.removeAttribute("data-formie-address-state-skeleton-active"), e.skeletonEl?.setAttribute("hidden", "hidden"), e.fetchingAnnouncementEl && (e.fetchingAnnouncementEl.textContent = "");
 }
-function q(e, t) {
-	let n = b(e);
+function Z(e, t) {
+	let n = w(e);
 	if (!n) return;
 	let r = n.querySelector("[data-formie-field-required]");
 	n.textContent = t, r && n.appendChild(r);
 }
-function J(e, t) {
-	e.setAttribute("data-formie-combobox-input", "true"), r(e, "combobox", "before-init", {
+function Q(e, t) {
+	e.setAttribute("data-formie-combobox-input", "true"), s(e, "combobox", "before-init", {
 		select: e,
 		options: { placeholder: t }
 	});
-	let n = i(e, { placeholder: t });
-	return r(e, "combobox", "after-init", {
+	let n = c(e, { placeholder: t });
+	return s(e, "combobox", "after-init", {
 		combobox: e._formieTomSelect,
 		options: { placeholder: t }
 	}), n;
 }
-async function Y(e, t) {
-	let { hideWhenUnused: n = !0, useSearchable: r = !0, useDatalist: i = !0, optionLabel: a = "name", optionValue: o = "name", placeholder: s = null, subdivisionsAction: c = d } = t, l = e.countryControl?.value?.trim() || "";
-	T(e);
-	let u = E(e), f = ++e.fetchGeneration;
-	if (e.comboboxCleanup?.(), e.comboboxCleanup = null, !l) {
-		if (q(e.stateField, e.stateField.dataset.formieAddressStateDefaultLabel || "State / Province"), K(e), n) {
-			H(e, !1), C(e.stateControl, ""), w(e, ""), e.pendingStateValue = "", e.lastSubdivisions = [];
+async function $(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() || "";
+	k(t);
+	let d = A(t), f = ++t.fetchGeneration;
+	if (t.comboboxCleanup?.(), t.comboboxCleanup = null, !u) {
+		if (Z(t.stateField, t.stateField.dataset.formieAddressStateDefaultLabel || "State / Province"), X(t), r) {
+			K(t, !1), D(t.stateControl, ""), O(t, ""), t.pendingStateValue = "", t.lastSubdivisions = [];
 			return;
 		}
-		if (H(e, !0), e.stateControl instanceof HTMLSelectElement) {
-			let t = R(e.stateControl, u);
-			e.stateControl = L(e.stateControl, t);
-		} else e.stateControl.disabled = !0, e.stateControl.placeholder = s || e.stateControl.placeholder;
-		e.lastSubdivisions = [];
+		if (K(t, !0), t.stateControl instanceof HTMLSelectElement) {
+			let e = H(t.stateControl, d);
+			t.stateControl = V(t.stateControl, e);
+		} else t.stateControl.disabled = !0, t.stateControl.placeholder = c || t.stateControl.placeholder;
+		t.lastSubdivisions = [];
 		return;
 	}
-	j(A(l, a, o, c)) || G(e);
-	let p = await M(l, a, o, c);
-	if (f !== e.fetchGeneration) return;
-	let m = p?.subdivisions || [], h = p?.administrativeAreaUsed ?? !0, g = p?.administrativeAreaLabel || "State / Province";
-	if (e.lastSubdivisions = m, K(e), n && !h) {
-		H(e, !1), C(e.stateControl, ""), w(e, ""), e.pendingStateValue = "";
+	F(P(u, o, s, l)) || Y(t);
+	let p = await I(u, o, s, l, e(t.addressRoot.closest("form")));
+	if (f !== t.fetchGeneration) return;
+	let m = p?.subdivisions || [], g = p?.administrativeAreaUsed ?? !0, _ = p?.administrativeAreaLabel || "State / Province";
+	if (t.lastSubdivisions = m, X(t), r && !g) {
+		K(t, !1), D(t.stateControl, ""), O(t, ""), t.pendingStateValue = "";
 		return;
 	}
-	if (H(e, !0), q(e.stateField, g), m.length > 0) {
-		let t = e.stateControl instanceof HTMLSelectElement ? e.stateControl : B(e.stateControl, u, m, s);
-		e.stateControl === t ? (I(e.stateControl, t), z(t, m, s, t.value)) : e.stateControl = L(e.stateControl, t), r ? e.comboboxCleanup = J(t, s) : t.removeAttribute("data-formie-combobox-input"), C(t, N(u, m) || u), O(e);
+	if (K(t, !0), Z(t.stateField, _), m.length > 0) {
+		let e = t.stateControl instanceof HTMLSelectElement ? t.stateControl : W(t.stateControl, d, m, c);
+		t.stateControl === e ? (B(t.stateControl, e), U(e, m, c, e.value)) : t.stateControl = V(t.stateControl, e), i ? t.comboboxCleanup = Q(e, c) : e.removeAttribute("data-formie-combobox-input"), D(e, L(d, m) || d), M(t);
 		return;
 	}
-	let _ = e.stateControl instanceof HTMLInputElement ? e.stateControl : R(e.stateControl, u);
-	e.stateControl !== _ && (e.stateControl = L(e.stateControl, _)), _.disabled = !1, V(_, e.datalistId, m, i), C(_, u), O(e);
+	let v = t.stateControl instanceof HTMLInputElement ? t.stateControl : H(t.stateControl, d);
+	t.stateControl !== v && (t.stateControl = V(t.stateControl, v)), v.disabled = !1, G(v, t.datalistId, m, a), D(v, d), M(t);
 }
-function X(e, t) {
+function ee(e, t) {
 	let n = () => {
-		T(e), e.countryControl?.value?.trim() && (e.lastCountry = "", Y(e, t).then(() => {
-			O(e);
+		k(e), e.countryControl?.value?.trim() && (e.lastCountry = "", $(e, t).then(() => {
+			M(e);
 		}));
 	};
-	p.forEach((t) => {
+	_.forEach((t) => {
 		let r = window.setTimeout(n, t);
 		e.autofillSweepTimers.push(r);
 	});
 }
-function Z(e) {
+function te(e) {
 	e.countryChangeTimer !== null && (window.clearTimeout(e.countryChangeTimer), e.countryChangeTimer = null), e.autofillSweepTimers.forEach((e) => {
 		window.clearTimeout(e);
 	}), e.autofillSweepTimers = [];
 }
-function Q(e, t) {
-	let n = _(e);
-	if (!n) return m.warn("Address root not found; skipping field."), () => {};
-	let r = y(e);
-	if (!r) return m.warn("Dynamic state control not found; skipping field."), () => {};
-	let i = b(e);
+function ne(e, t) {
+	let n = x(e);
+	if (!n) return v.warn("Address root not found; skipping field."), () => {};
+	let r = C(e);
+	if (!r) return v.warn("Dynamic state control not found; skipping field."), () => {};
+	let i = w(e);
 	i && !e.dataset.formieAddressStateDefaultLabel && (e.dataset.formieAddressStateDefaultLabel = i.textContent?.trim() || "State / Province");
-	let s = {
+	let a = {
 		addressRoot: n,
 		stateField: e,
 		stateControl: r,
-		countryControl: v(n),
+		countryControl: S(n),
 		autofillAnchor: null,
 		pendingStateValue: r.value?.trim() || "",
 		datalistId: `formie-address-state-datalist-${r.getAttribute("data-formie-input-id") || Math.random().toString(36).slice(2)}`,
@@ -284,61 +289,67 @@ function Q(e, t) {
 		required: r.required,
 		lastSubdivisions: []
 	};
-	D(s);
-	let l = (e = !1) => {
-		let n = s.countryControl?.value?.trim() || "";
-		if (!e && n === s.lastCountry) return;
-		let r = s.lastCountry, i = E(s);
-		s.lastCountry = n, Y(s, t).then(() => {
-			O(s), !(!r || !n || r === n) && !N(i, s.lastSubdivisions) && !E(s) && (C(s.stateControl, ""), w(s, ""));
+	j(a);
+	let o = (e = !1) => {
+		let n = a.countryControl?.value?.trim() || "";
+		if (!e && n === a.lastCountry) return;
+		let r = a.lastCountry, i = A(a);
+		a.lastCountry = n, $(a, t).then(() => {
+			M(a), r && n && r !== n && !L(i, a.lastSubdivisions) && !A(a) && (D(a.stateControl, ""), O(a, ""));
 		});
-	}, u = () => {
-		s.countryChangeTimer !== null && window.clearTimeout(s.countryChangeTimer), s.countryChangeTimer = window.setTimeout(() => {
-			s.countryChangeTimer = null, T(s), l(!0);
+	}, s = () => {
+		a.countryChangeTimer !== null && window.clearTimeout(a.countryChangeTimer), a.countryChangeTimer = window.setTimeout(() => {
+			a.countryChangeTimer = null, k(a), o(!0);
 		}, 50);
-	}, d = (e) => {
+	}, c = (e) => {
 		let n = e.target;
 		if (!(n instanceof HTMLInputElement || n instanceof HTMLSelectElement)) return;
-		let r = n === s.autofillAnchor, i = n.matches(a) || n.matches(o);
-		if (!(!r && !i) && (i && !r && w(s, n.value), T(s), s.countryControl?.value?.trim())) {
-			if (s.lastSubdivisions.length > 0) {
-				O(s);
+		let r = n === a.autofillAnchor, i = n.matches(l) || n.matches(u);
+		if ((r || i) && (i && !r && O(a, n.value), k(a), a.countryControl?.value?.trim())) {
+			if (a.lastSubdivisions.length > 0) {
+				M(a);
 				return;
 			}
-			s.lastCountry = "", Y(s, t).then(() => {
-				O(s);
+			a.lastCountry = "", $(a, t).then(() => {
+				M(a);
 			});
 		}
-	}, f = (e) => {
-		if (e.animationName !== c) return;
+	}, d = (e) => {
+		if (e.animationName !== f) return;
 		let r = e.target;
-		(r instanceof HTMLInputElement || r instanceof HTMLSelectElement) && n.contains(r) && (T(s), s.countryControl?.value?.trim() && (s.lastCountry = "", Y(s, t).then(() => {
-			O(s);
+		(r instanceof HTMLInputElement || r instanceof HTMLSelectElement) && n.contains(r) && (k(a), a.countryControl?.value?.trim() && (a.lastCountry = "", $(a, t).then(() => {
+			M(a);
 		})));
 	}, p = (e) => {
 		let n = e.detail?.state?.trim();
 		if (!n) {
-			l();
+			o();
 			return;
 		}
-		s.pendingStateValue = n, w(s, n), Y(s, t).then(() => {
-			C(s.stateControl, n), S(s.stateControl, n), s.lastCountry = s.countryControl?.value?.trim() || "";
+		a.pendingStateValue = n, O(a, n), $(a, t).then(() => {
+			D(a.stateControl, n), E(a.stateControl, n), a.lastCountry = a.countryControl?.value?.trim() || "";
 		});
 	};
-	return s.countryControl?.addEventListener("change", u), s.countryControl?.addEventListener("input", u), n.addEventListener("input", d), n.addEventListener("change", d), n.addEventListener("animationstart", f), n.addEventListener("formie:address:google:populate", p), n.addEventListener("formie:address:address-finder:populate", p), n.addEventListener("formie:address:loqate:populate", p), n.addEventListener("formie:address:place-kit:populate", p), l(), X(s, t), () => {
-		Z(s), K(s), s.skeletonEl?.remove(), s.fetchingAnnouncementEl?.remove(), s.autofillAnchor?.remove(), s.comboboxCleanup?.(), s.countryControl?.removeEventListener("change", u), s.countryControl?.removeEventListener("input", u), n.removeEventListener("input", d), n.removeEventListener("change", d), n.removeEventListener("animationstart", f), n.removeEventListener("formie:address:google:populate", p), n.removeEventListener("formie:address:address-finder:populate", p), n.removeEventListener("formie:address:loqate:populate", p), n.removeEventListener("formie:address:place-kit:populate", p);
+	return a.countryControl?.addEventListener("change", s), a.countryControl?.addEventListener("input", s), n.addEventListener("input", c), n.addEventListener("change", c), n.addEventListener("animationstart", d), n.addEventListener("formie:address:google:populate", p), n.addEventListener("formie:address:address-finder:populate", p), n.addEventListener("formie:address:loqate:populate", p), n.addEventListener("formie:address:place-kit:populate", p), o(), ee(a, t), () => {
+		te(a), X(a), a.skeletonEl?.remove(), a.fetchingAnnouncementEl?.remove(), a.autofillAnchor?.remove(), a.comboboxCleanup?.(), a.countryControl?.removeEventListener("change", s), a.countryControl?.removeEventListener("input", s), n.removeEventListener("input", c), n.removeEventListener("change", c), n.removeEventListener("animationstart", d), n.removeEventListener("formie:address:google:populate", p), n.removeEventListener("formie:address:address-finder:populate", p), n.removeEventListener("formie:address:loqate:populate", p), n.removeEventListener("formie:address:place-kit:populate", p);
 	};
 }
-var $ = {
-	id: u,
+var re = {
+	moduleId: `formie:${m}`,
+	version: 2,
+	surfaces: [
+		"server-rendered",
+		"client-rendered",
+		"cp-edit"
+	],
 	kind: "field",
-	match: (e) => !!e.target.querySelector(a),
+	match: (e) => !!e.target.querySelector(l),
 	setup: async (e) => {
-		let t = e.options || {}, r = n(e), i = r.map((e) => Q(e, t));
-		return m.log("Module setup.", { fieldCount: r.length }), { destroy: () => {
-			i.forEach((e) => e()), m.log("Module destroy.", { fieldCount: r.length });
+		let t = e.options || {}, n = o(e), r = n.map((e) => ne(e, t));
+		return v.log("Module setup.", { fieldCount: n.length }), { destroy: () => {
+			r.forEach((e) => e()), v.log("Module destroy.", { fieldCount: n.length });
 		} };
 	}
 };
 //#endregion
-export { $ as addressStateModule };
+export { re as addressStateModule };