@verbb/formie-browser 1.0.14 → 1.0.16

package/CHANGELOG.md

@@ -2,6 +2,72 @@
 
 ## Unreleased
 
+### Fixed
+- 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
+- Rename field module settings to `allowedCountryCodes`, `maxFiles`, `minFileSize` and `maxFileSize` to match the PHP field API.
+- Remove the unused legacy frontend-theme attribute from mounted forms.
+
+### Fixed
+- Fixed adding or removing repeater rows with the mouse automatically focusing fields in the submission editor, and keyboard focus targeting field wrappers instead of controls.
+- Fixed hiding an unused state field triggering an unsaved-changes warning when opening a submission.
+- Fixed PlaceKit autocomplete clearing the selected state when using a dynamic State / Province dropdown.
+- Fixed dynamic state dropdowns using control-panel markup, including country changes and preservation of historical saved values.
+- Fixed browser event compatibility not inheriting the setting from forms loaded into a wrapper through REST or GraphQL.
+- Fixed resetting forms leaving added repeater rows or failing to restore removed rows and dynamic address state values.
+- Fixed dynamic address state fields failing to reappear after selecting a country that uses states.
+- Fixed dynamic address state fields remaining visible before a country was selected.
+- Fixed required searchable dropdowns rejecting selected values during browser validation.
+- Fixed address state fields becoming unresponsive when changing countries after selecting a state.
+- Fixed date pickers displaying prefilled dates and date ranges one day early in time zones west of UTC.
+- Fixed live validation error descriptions referencing another form when multiple forms used the same field handles.
+- Fixed keyboard focus skipping newly added repeater rows and being lost when removing the focused row.
+- Fixed correcting a spam-rejected submission causing a stale-session error and clearing entered values.
+- Fixed payment checkout redirects showing an unsaved-changes warning and leaving forms disabled when cancelled.
+- Fixed completed forms with conditional fields showing an unsaved-changes warning when leaving the page.
+- Fixed required simple upload fields rejecting retained files when returning to an earlier page.
+- Fixed simple file uploads losing attachment capabilities after a failed submission.
+- Fixed Upload Manager silently rejecting files that exceed file type, size, or count restrictions.
+- Fixed failed uploads continuing to display an active processing status.
+- Fixed saving progress hiding unfinished forms when Hide Form was enabled for completion.
+- Fixed matching page conditions revealing inactive pages in multi-page forms.
+
 ## 1.0.14 - 2026-10-08
 
 ### Added

package/dist/chunks/{address-country-Dn71jroa.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) {
@@ -37,16 +37,12 @@ async function f(e, n) {
 	if (r.value.trim()) return;
 	let a = await i(n.countryFromIpAction, e.closest("form"));
 	if (!a?.countryCode) return;
-	if (!l(a.countryCode, n.countryAllowed)) {
+	if (!l(a.countryCode, n.allowedCountryCodes)) {
 		s.log("Detected country is not in the allowed list; skipping preselect.", { countryCode: a.countryCode });
 		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-O49uDRoR.js → address-finder-QK1m1eyv.js}

@@ -1,6 +1,6 @@
 import { n as e } from "./event-names-BCI2FLD8.js";
-import { t } from "./api-ghNr2uxX.js";
-import { r as n } from "./scripts-CbQ7agX3.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({
 	moduleId: "formie:address-finder",

package/dist/chunks/{address-state-ByYatUur.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-CWNdx4Fk.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,
@@ -23,7 +23,7 @@ function C(e) {
 	return t instanceof HTMLInputElement || t instanceof HTMLSelectElement ? t : null;
 }
 function w(e) {
-	return e.querySelector("[data-formie-field-label]");
+	return e.querySelector("[data-formie-field-label]") || (e.querySelector("[data-formie-address-state-cp]") ? e.querySelector(":scope > .heading > label") : null);
 }
 function T(e) {
 	e.dispatchEvent(new Event("input", { bubbles: !0 })), e.dispatchEvent(new Event("change", { bubbles: !0 }));
@@ -34,11 +34,8 @@ function E(e, t) {
 	n && n.getValue() !== t && n.setValue(t, !0);
 }
 function D(e, t) {
-	if (e.value !== t) {
-		e.value = t, T(e);
-		return;
-	}
-	E(e, t);
+	let n = e.value;
+	e.value = t, E(e, e.value), e.value !== n && T(e);
 }
 function O(e, t) {
 	e.autofillAnchor && (e.autofillAnchor.value = t);
@@ -50,28 +47,28 @@ function k(e) {
 function A(e) {
 	return e.pendingStateValue?.trim() || e.autofillAnchor?.value?.trim() || e.stateControl.value?.trim() || "";
 }
-function j(e) {
+function ee(e) {
 	if (e.autofillAnchor) return e.autofillAnchor;
 	let t = e.addressRoot.querySelector(d);
 	if (t instanceof HTMLInputElement) e.autofillAnchor = t;
 	else {
 		let t = document.createElement("input");
-		t.type = "text", t.setAttribute("data-formie-address-state-autofill-anchor", "true"), t.setAttribute("autocomplete", "address-level1"), t.setAttribute("tabindex", "-1"), t.setAttribute("aria-hidden", "true"), t.className = "formie-sr-only", e.addressRoot.appendChild(t), e.autofillAnchor = t;
+		t.type = "text", t.setAttribute("data-formie-address-state-autofill-anchor", "true"), t.setAttribute("autocomplete", "address-level1"), t.setAttribute("tabindex", "-1"), t.setAttribute("aria-hidden", "true"), t.className = "formie-sr-only", t.hidden = e.isCpEdit, e.addressRoot.appendChild(t), e.autofillAnchor = t;
 	}
 	return e.stateControl.setAttribute("autocomplete", "off"), e.stateControl.value && !e.autofillAnchor.value && (e.autofillAnchor.value = e.stateControl.value), e.autofillAnchor;
 }
-function M(e) {
+function j(e) {
 	k(e);
 	let t = A(e);
 	if (!t) return;
-	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;
+	let n = e.lastSubdivisions, r = e.stateControl instanceof HTMLSelectElement ? I(t, n) || "" : t;
+	O(e, r), e.pendingStateValue = r, D(e.stateControl, r);
 }
-function N(e, t, n, r) {
+function M(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 P(e, t, n, r) {
+function N(e, t, n, r) {
 	return [
 		e,
 		t,
@@ -79,14 +76,14 @@ function P(e, t, n, r) {
 		r
 	].join("|");
 }
-function F(e) {
+function P(e) {
 	return y.has(e);
 }
-async function I(e, n, r, i, a) {
-	let o = P(e, n, r, i);
+async function F(e, n, r, i, a) {
+	let o = N(e, n, r, i);
 	return y.has(o) ? y.get(o) || null : (b.has(o) || b.set(o, (async () => {
 		try {
-			let s = await t(N(i, e, n, r), { headers: { Accept: "application/json" } }, a);
+			let s = await t(M(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;
@@ -100,13 +97,13 @@ async function I(e, n, r, i, a) {
 		}
 	})()), b.get(o) || null);
 }
-function L(e, t) {
+function I(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 R(e, t) {
+function L(e, t) {
 	[
 		"id",
 		"name",
@@ -118,6 +115,7 @@ function R(e, t) {
 		"data-formie-input-type",
 		"data-formie-input-error-state",
 		"data-formie-address-state-dynamic",
+		"data-formie-address-state-cp",
 		"data-formie-address-state-hide-when-unused",
 		"data-formie-address-state-use-searchable",
 		"data-formie-address-state-use-datalist",
@@ -125,42 +123,38 @@ function R(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 z(e, t) {
-	t.className = e.className;
+function R(e, t) {
+	t.className = e.hasAttribute("data-formie-address-state-cp") ? "text fullwidth" : e.className;
 }
-function B(e, t) {
+function z(e, t) {
 	let n = [...g];
 	i(e, "fieldControlError").forEach((t) => {
 		e.classList.contains(t) && n.push(t);
 	}), t.className = n.join(" ");
 }
-function V(e, t) {
+function B(e, t) {
 	return e.parentNode?.replaceChild(t, e), t;
 }
-function H(e, t) {
+function V(e, t) {
 	let n = document.createElement("input");
-	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;
+	return n.type = "text", L(e, n), R(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 U(e, t, n, r = "") {
+function H(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 = L(r, t) || r;
+	}), e.value = I(r, t) || r;
 }
-function W(e, t, n, r) {
+function U(e, t, n, r) {
 	let i = document.createElement("select");
-	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;
+	return L(e, i), z(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"), H(i, n, r, t), i;
 }
-function G(e, t, n, r) {
+function W(e, t, n, r) {
 	let i = e.list;
 	if (!r || n.length === 0) {
 		e.removeAttribute("list"), i && i.remove();
@@ -172,86 +166,96 @@ function G(e, t, n, r) {
 		n.value = t.label, a?.appendChild(n);
 	}), e.setAttribute("list", t);
 }
-function K(e, t) {
+function G(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;
-	}
-	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 q(e) {
+function K(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;
+	return t.className = e.isCpEdit ? "visually-hidden" : "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 J() {
+function q() {
 	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 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");
+function J(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-address-state-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 = J(), t.appendChild(e.skeletonEl)), e.skeletonEl.removeAttribute("hidden")), q(e).textContent = "Loading state or province options for the selected country.";
+	t instanceof HTMLElement && (e.skeletonEl || (e.skeletonEl = q(), t.appendChild(e.skeletonEl)), e.skeletonEl.removeAttribute("hidden")), K(e).textContent = "Loading state or province options for the selected country.";
 }
-function X(e) {
+function Y(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 Z(e, t) {
+function X(e, t) {
 	let n = w(e);
 	if (!n) return;
-	let r = n.querySelector("[data-formie-field-required]");
+	let r = n.querySelector("[data-formie-field-required], .required");
 	n.textContent = t, r && n.appendChild(r);
 }
-function Q(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 $(t, n) {
+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() || "";
 	k(t);
-	let d = A(t), f = ++t.fetchGeneration;
+	let d = A(t), f = t.isCpEdit && !!d && u === t.initialCountry && d === t.initialValue, p = ++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 = [];
+		if (X(t.stateField, t.stateField.dataset.formieAddressStateDefaultLabel || "State / Province"), Y(t), r && !f) {
+			G(t, !1), D(t.stateControl, ""), O(t, ""), t.pendingStateValue = "", t.lastSubdivisions = [];
 			return;
 		}
-		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;
+		if (G(t, !0), t.stateControl instanceof HTMLSelectElement) {
+			let e = V(t.stateControl, d);
+			t.stateControl = B(t.stateControl, e);
+		} else t.stateControl.disabled = !t.isCpEdit && !f, t.stateControl.placeholder = c || t.stateControl.placeholder;
 		t.lastSubdivisions = [];
 		return;
 	}
-	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 = "";
+	P(N(u, o, s, l)) || J(t);
+	let m = await F(u, o, s, l, e(t.addressRoot.closest("form")));
+	if (p !== t.fetchGeneration) return;
+	let g = [...m?.subdivisions || []];
+	f && g.length && !I(d, g) && g.push({
+		label: d,
+		value: d
+	});
+	let _ = m?.administrativeAreaUsed ?? !0, v = m?.administrativeAreaLabel || "State / Province";
+	if (t.lastSubdivisions = g, Y(t), r && !_ && !f) {
+		G(t, !1), D(t.stateControl, ""), O(t, ""), t.pendingStateValue = "";
 		return;
 	}
-	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);
+	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, n.searchableOptionLimit) : e.removeAttribute("data-formie-combobox-input"), D(e, I(d, g) || d), j(t);
 		return;
 	}
-	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);
+	let y = t.stateControl instanceof HTMLInputElement ? t.stateControl : V(t.stateControl, d);
+	t.stateControl !== y && (t.stateControl = B(t.stateControl, y)), y.disabled = !1, W(y, t.datalistId, g, a), D(y, d), j(t);
 }
-function ee(e, t) {
+function te(e, t) {
 	let n = () => {
-		k(e), e.countryControl?.value?.trim() && (e.lastCountry = "", $(e, t).then(() => {
-			M(e);
+		k(e), e.countryControl?.value?.trim() && (e.lastCountry = "", Q(e, t).then(() => {
+			j(e);
 		}));
 	};
 	_.forEach((t) => {
@@ -259,7 +263,7 @@ function ee(e, t) {
 		e.autofillSweepTimers.push(r);
 	});
 }
-function te(e) {
+function $(e) {
 	e.countryChangeTimer !== null && (window.clearTimeout(e.countryChangeTimer), e.countryChangeTimer = null), e.autofillSweepTimers.forEach((e) => {
 		window.clearTimeout(e);
 	}), e.autofillSweepTimers = [];
@@ -273,6 +277,9 @@ function ne(e, t) {
 	i && !e.dataset.formieAddressStateDefaultLabel && (e.dataset.formieAddressStateDefaultLabel = i.textContent?.trim() || "State / Province");
 	let a = {
 		addressRoot: n,
+		isCpEdit: r.hasAttribute("data-formie-address-state-cp"),
+		initialCountry: S(n)?.value?.trim() || "",
+		initialValue: r.value?.trim() || "",
 		stateField: e,
 		stateControl: r,
 		countryControl: S(n),
@@ -288,50 +295,44 @@ function ne(e, t) {
 		fetchGeneration: 0,
 		required: r.required,
 		lastSubdivisions: []
-	};
-	j(a);
-	let o = (e = !1) => {
+	}, o = r.value, s = e.closest("form"), c = !1, d = null;
+	ee(a);
+	let p = (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, ""));
+		a.lastCountry = n, Q(a, t).then(() => {
+			j(a), r && n && r !== n && !I(i, a.lastSubdivisions) && !A(a) && (D(a.stateControl, ""), O(a, ""));
 		});
-	}, s = () => {
+	}, m = () => {
 		a.countryChangeTimer !== null && window.clearTimeout(a.countryChangeTimer), a.countryChangeTimer = window.setTimeout(() => {
-			a.countryChangeTimer = null, k(a), o(!0);
+			a.countryChangeTimer = null, k(a), p(!0);
 		}, 50);
-	}, c = (e) => {
+	}, h = (e) => {
 		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), k(a), a.countryControl?.value?.trim())) {
-			if (a.lastSubdivisions.length > 0) {
-				M(a);
-				return;
-			}
-			a.lastCountry = "", $(a, t).then(() => {
-				M(a);
-			});
-		}
-	}, d = (e) => {
+		(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;
-		(r instanceof HTMLInputElement || r instanceof HTMLSelectElement) && n.contains(r) && (k(a), a.countryControl?.value?.trim() && (a.lastCountry = "", $(a, t).then(() => {
-			M(a);
+		(r instanceof HTMLInputElement || r instanceof HTMLSelectElement) && n.contains(r) && (k(a), a.countryControl?.value?.trim() && (a.lastCountry = "", Q(a, t).then(() => {
+			j(a);
 		})));
-	}, p = (e) => {
+	}, _ = (e) => {
 		let n = e.detail?.state?.trim();
-		if (!n) {
-			o();
-			return;
-		}
-		a.pendingStateValue = n, O(a, n), $(a, t).then(() => {
-			D(a.stateControl, n), E(a.stateControl, n), a.lastCountry = a.countryControl?.value?.trim() || "";
-		});
+		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));
+		}, 0);
 	};
-	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);
+	return s?.addEventListener("reset", y), a.countryControl?.addEventListener("change", m), a.countryControl?.addEventListener("input", m), n.addEventListener("input", h), n.addEventListener("change", h), n.addEventListener("animationstart", g), n.addEventListener("formie:address:google:populate", _), n.addEventListener("formie:address:address-finder:populate", _), n.addEventListener("formie:address:loqate:populate", _), n.addEventListener("formie:address:place-kit:populate", _), p(!0), te(a, t), () => {
+		c = !0, d !== null && window.clearTimeout(d), a.fetchGeneration++, s?.removeEventListener("reset", y), $(a), Y(a), a.skeletonEl?.remove(), a.fetchingAnnouncementEl?.remove(), a.autofillAnchor?.remove(), a.comboboxCleanup?.(), a.countryControl?.removeEventListener("change", m), a.countryControl?.removeEventListener("input", m), n.removeEventListener("input", h), n.removeEventListener("change", h), n.removeEventListener("animationstart", g), n.removeEventListener("formie:address:google:populate", _), n.removeEventListener("formie:address:address-finder:populate", _), n.removeEventListener("formie:address:loqate:populate", _), n.removeEventListener("formie:address:place-kit:populate", _);
 	};
 }
 var re = {