fluid-primitives 0.19.0 → 0.19.1-next.17.ea6daa2

package/dist/{Client-C51NSHxg.js → Client-DAEIDEy9.js}

@@ -164,7 +164,7 @@ function mount(componentName, callback) {
 }
 function mountControlled(componentName, rootId, callback) {
 	const hydrationData = getHydrationData(componentName, rootId);
-	if (!hydrationData) return;
+	if (!hydrationData) return void 0;
 	return callback({
 		...hydrationData,
 		createHydrator: () => new ComponentHydrator(componentName, rootId, hydrationData.props.ids)

package/dist/accordion.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as accordion from "@zag-js/accordion";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/accordion.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as accordion from "@zag-js/accordion";
 
 //#region Resources/Private/Primitives/Accordion/Accordion.ts

package/dist/checkbox-group.d.ts

@@ -1,5 +1,5 @@
-import { a as Machine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
-import { t as FieldMachine } from "./form.registry-Cb8Pvoe8.js";
+import { a as Machine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
+import { t as FieldMachine } from "./form.registry-QMa3fDPK.js";
 import { EventObject } from "@zag-js/core";
 import { PropTypes } from "@zag-js/types";
 

package/dist/checkbox-group.js

@@ -1,6 +1,6 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import { i as connect, n as registerCheckboxGroup, r as unregisterCheckboxGroup } from "./checkbox-group.registry-CGwuF7SF.js";
-import { a as getLabelId } from "./field.dom-CJQXpQbZ.js";
+import { s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import { createMachine } from "@zag-js/core";
 
 //#region Resources/Private/Primitives/CheckboxGroup/src/checkbox-group.machine.ts

package/dist/checkbox.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 import * as checkbox from "@zag-js/checkbox";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/checkbox.js

@@ -1,6 +1,6 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import { i as connect, t as getCheckboxGroupMachineFor } from "./checkbox-group.registry-CGwuF7SF.js";
-import { a as getLabelId, t as getControlId } from "./field.dom-CJQXpQbZ.js";
+import { r as getControlId, s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import * as checkbox from "@zag-js/checkbox";
 
 //#region Resources/Private/Primitives/Checkbox/Checkbox.ts

package/dist/client.d.ts

@@ -1,2 +1,2 @@
-import { a as Machine, c as mount, f as Component, h as FluidPrimitivesGlobals, i as mergeProps, l as mountControlled, m as ComponentInterface, n as spreadProps, o as ComponentHydrator, p as ComponentHydrationData, r as normalizeProps, s as getHydrationData, t as uid, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, c as mount, f as Component, h as FluidPrimitivesGlobals, i as mergeProps, l as mountControlled, m as ComponentInterface, n as spreadProps, o as ComponentHydrator, p as ComponentHydrationData, r as normalizeProps, s as getHydrationData, t as uid, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 export { Component, ComponentHydrationData, ComponentHydrator, ComponentInterface, FieldAwareComponent, FluidPrimitivesGlobals, Machine, getHydrationData, mergeProps, mount, mountControlled, normalizeProps, spreadProps, uid };

package/dist/client.js

@@ -1,3 +1,3 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, l as mount, n as spreadProps, o as ComponentHydrator, p as Component, r as normalizeProps, s as getHydrationData, t as uid, u as mountControlled } from "./Client-C51NSHxg.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, l as mount, n as spreadProps, o as ComponentHydrator, p as Component, r as normalizeProps, s as getHydrationData, t as uid, u as mountControlled } from "./Client-DAEIDEy9.js";
 
 export { Component, ComponentHydrator, FieldAwareComponent, Machine, getHydrationData, mergeProps, mount, mountControlled, normalizeProps, spreadProps, uid };

package/dist/clipboard.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as clipboard from "@zag-js/clipboard";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/clipboard.js

@@ -1,4 +1,4 @@
-import { a as Machine, i as mergeProps, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, i as mergeProps, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as clipboard from "@zag-js/clipboard";
 
 //#region Resources/Private/Primitives/Clipboard/Clipboard.ts

package/dist/collapsible.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as collapsible from "@zag-js/collapsible";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/collapsible.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as collapsible from "@zag-js/collapsible";
 
 //#region Resources/Private/Primitives/Collapsible/Collapsible.ts

package/dist/dialog.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as dialog from "@zag-js/dialog";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/dialog.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as dialog from "@zag-js/dialog";
 
 //#region Resources/Private/Primitives/Dialog/Dialog.ts

package/dist/field.d.ts

@@ -1,5 +1,5 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
-import { n as FormMachine } from "./form.registry-Cb8Pvoe8.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
+import { n as FormMachine } from "./form.registry-QMa3fDPK.js";
 import { EventObject } from "@zag-js/core";
 import { PropTypes } from "@zag-js/types";
 

package/dist/field.dom-CtHP2v1P.js

@@ -0,0 +1,25 @@
+//#region Resources/Private/Primitives/Field/src/field.dom.ts
+const getRootId = (scope) => scope.ids?.root ?? `field:${scope.id}:root`;
+const getLabelId = (scope) => scope.ids?.label ?? `field:${scope.id}:label`;
+const getControlId = (scope) => scope.ids?.control ?? `field:${scope.id}:control`;
+const getErrorId = (scope) => scope.ids?.error ?? `field:${scope.id}:error`;
+const getDescriptionId = (scope) => scope.ids?.description ?? `field:${scope.id}:description`;
+const getRootEl = (scope) => scope.getById(getRootId(scope));
+const getDescriptionEl = (scope) => scope.getById(getDescriptionId(scope));
+const getClosestFieldRoot = (target) => {
+	return target?.closest("[data-scope=\"field\"][data-part=\"root\"]") ?? null;
+};
+const getClosestFieldName = (target) => {
+	if (!target) return;
+	if ("name" in target && typeof target.name === "string" && target.name) return target.name;
+	return getClosestFieldRoot(target)?.getAttribute("data-name") || void 0;
+};
+const isFocusMovingWithinSameField = (target, relatedTarget) => {
+	if (!(relatedTarget instanceof Element)) return false;
+	const currentField = getClosestFieldRoot(target);
+	const nextField = getClosestFieldRoot(relatedTarget);
+	return !!currentField && currentField === nextField;
+};
+
+//#endregion
+export { getDescriptionId as a, getRootEl as c, getDescriptionEl as i, getRootId as l, getClosestFieldRoot as n, getErrorId as o, getControlId as r, getLabelId as s, getClosestFieldName as t, isFocusMovingWithinSameField as u };

package/dist/field.js

@@ -1,5 +1,5 @@
-import { a as Machine, f as registerFieldMachine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
-import { a as getLabelId, i as getErrorId, n as getDescriptionEl, o as getRootEl, r as getDescriptionId, s as getRootId, t as getControlId } from "./field.dom-CJQXpQbZ.js";
+import { a as Machine, f as registerFieldMachine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
+import { a as getDescriptionId, c as getRootEl, i as getDescriptionEl, l as getRootId, o as getErrorId, r as getControlId, s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import { n as getFormMachineFor, r as registerFieldMachineForForm } from "./form.registry-CmpTny_s.js";
 import { createMachine } from "@zag-js/core";
 import { createAnatomy } from "@zag-js/anatomy";

package/dist/form.d.ts

@@ -1,5 +1,5 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
-import { t as FieldMachine } from "./form.registry-Cb8Pvoe8.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
+import { t as FieldMachine } from "./form.registry-QMa3fDPK.js";
 import { EventObject } from "@zag-js/core";
 import * as z from "zod";
 import { JSX, PropTypes } from "@zag-js/types";
@@ -48,6 +48,10 @@ interface FormSchema {
     dirty: FormDirty;
     touched: FormTouched;
   };
+  refs: {
+    submitCount: number;
+    serverErrors: FormErrors;
+  };
   state: 'invalid' | 'ready' | 'submitting' | 'success' | 'error';
   event: EventObject;
   action: string;

package/dist/form.js

@@ -1,4 +1,5 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
+import { n as getClosestFieldRoot, t as getClosestFieldName, u as isFocusMovingWithinSameField } from "./field.dom-CtHP2v1P.js";
 import { i as registerFormMachine, t as getFieldMachinesFor } from "./form.registry-CmpTny_s.js";
 import { debounce } from "@zag-js/utils";
 import { createMachine } from "@zag-js/core";
@@ -86,8 +87,9 @@ function connect(service, normalize) {
 				"data-invalid": isInvalid ? "" : void 0,
 				"data-dirty": isDirty ? "" : void 0,
 				"data-touched": isTouched ? "" : void 0,
-				onSubmit: async (event) => {
+				onSubmit: (event) => {
 					event.preventDefault();
+					if (isSubmitting) return;
 					const form = event.currentTarget;
 					context.set("values", new FormData(form));
 					send({
@@ -111,7 +113,18 @@ function connect(service, normalize) {
 					const target = event.target;
 					if (!(target instanceof HTMLInputElement) && !(target instanceof HTMLTextAreaElement) && !(target instanceof HTMLSelectElement) && !(target instanceof HTMLButtonElement && target.getAttribute("data-scope") === "select")) return;
 					send({
-						type: "BLUR",
+						type: "FIELD_BLUR",
+						detail: {
+							target,
+							relatedTarget: event.relatedTarget
+						}
+					});
+				},
+				onFocus: (event) => {
+					const target = event.target;
+					if (!getClosestFieldRoot(target)) return;
+					send({
+						type: "FIELD_FOCUS",
 						detail: { target }
 					});
 				}
@@ -147,7 +160,7 @@ function validateWithSchema(schema, formData) {
 		if (!flat[key]) continue;
 		errors[key] = {
 			messages: flat[key],
-			value: getFormDataValue(formData, key)
+			value: getFieldValue(formData, key)
 		};
 	}
 	return errors;
@@ -159,11 +172,57 @@ function errorsFromServer(responseErrors, objectName, formData) {
 		if (objectName) newKey = newKey.replace(objectName + ".", "");
 		out[newKey] = {
 			messages: responseErrors[key],
-			value: getFormDataValue(formData, newKey)
+			value: getFieldValue(formData, newKey)
 		};
 	}
 	return out;
 }
+function normalizeFieldName(fieldName) {
+	return fieldName.replace(/\[\]$/, "");
+}
+function withCurrentValues(errors, formData) {
+	return Object.fromEntries(Object.entries(errors).map(([fieldName, error]) => [normalizeFieldName(fieldName), {
+		...error,
+		value: error.value ?? getFieldValue(formData, fieldName)
+	}]));
+}
+function getErrorsForCurrentValues(serverErrors, formData) {
+	const errors = {};
+	for (const fieldName in serverErrors) {
+		const error = getErrorForValue(serverErrors, fieldName, getFieldValue(formData, fieldName));
+		if (error) errors[fieldName] = error;
+	}
+	return errors;
+}
+function getErrorForValue(errors, fieldName, currentValue) {
+	const error = errors[normalizeFieldName(fieldName)];
+	if (!error || error.value === void 0) return;
+	return serializeFieldValue(currentValue) === serializeFieldValue(error.value) ? error : void 0;
+}
+function getFieldValue(formData, fieldName) {
+	const normalizedFieldName = normalizeFieldName(fieldName);
+	const arrayEntries = formData.getAll(`${normalizedFieldName}[]`);
+	const values = formData.getAll(normalizedFieldName);
+	const entries = values.length > 0 ? values : arrayEntries;
+	if (fieldName.endsWith("[]") || arrayEntries.length > 0 || entries.length > 1) return entries;
+	return entries[0] ?? null;
+}
+function getFieldElement(form, fieldName) {
+	return form.querySelector(`[name="${CSS.escape(fieldName)}"], [name="${CSS.escape(fieldName)}[]"]`);
+}
+function serializeFieldValue(value) {
+	return JSON.stringify(toSerializableFieldValue(value));
+}
+function toSerializableFieldValue(value) {
+	if (Array.isArray(value)) return value.map(toSerializableFieldValue);
+	if (value instanceof File) return {
+		name: value.name,
+		size: value.size,
+		type: value.type,
+		lastModified: value.lastModified
+	};
+	return value;
+}
 function getInputValue(target) {
 	const el = target;
 	if (!el || !("type" in el)) return void 0;
@@ -191,11 +250,9 @@ function getInputValue(target) {
 	if (el instanceof HTMLSelectElement && el.multiple) return Array.from(el.selectedOptions).map((o) => o.value);
 	return el.value;
 }
-function getFormDataValue(formData, fieldName) {
-	return formData.getAll(fieldName).length > 1 || fieldName.endsWith("[]") ? formData.getAll(fieldName) : formData.get(fieldName);
-}
 function formDataToObject(formData) {
-	return Object.fromEntries(Array.from(formData.keys()).map((key) => [key.endsWith("[]") ? key.slice(0, -2) : key, getFormDataValue(formData, key) ?? ""]));
+	const fieldNames = new Set(Array.from(formData.keys(), normalizeFieldName));
+	return Object.fromEntries(Array.from(fieldNames, (fieldName) => [fieldName, getFieldValue(formData, fieldName) ?? ""]));
 }
 function prefixFieldName(fieldName, prefix, objectName) {
 	if (fieldName === "") return "";
@@ -224,6 +281,12 @@ const machine = createMachine({
 			touched: bindable(() => ({ defaultValue: {} }))
 		};
 	},
+	refs() {
+		return {
+			submitCount: 0,
+			serverErrors: {}
+		};
+	},
 	states: {
 		ready: {},
 		invalid: {},
@@ -240,7 +303,8 @@ const machine = createMachine({
 		VALIDATE_FIELD: { actions: ["validateField"] },
 		INVALID: { target: "invalid" },
 		INPUT: { actions: ["handleInput"] },
-		BLUR: { actions: ["handleBlur"] },
+		FIELD_FOCUS: { actions: ["handleFocus"] },
+		FIELD_BLUR: { actions: ["handleBlur"] },
 		RESET: {
 			target: "ready",
 			actions: ["resetForm"]
@@ -253,17 +317,25 @@ const machine = createMachine({
 	},
 	entry: ["setupFormListeners"],
 	implementations: { actions: {
-		validateAll({ context, send, prop, state, action, event, scope }) {
+		validateAll({ context, send, prop, state, action, event, scope, refs }) {
 			const submitting = state.matches("submitting");
 			const schema = prop("schema");
-			if (schema) {
-				const errs = validateWithSchema(schema, context.get("values"));
-				context.set("errors", errs);
-				if (Object.keys(errs).length > 0) {
-					send({ type: "INVALID" });
-					if (submitting) action(["focusFirstInvalid"]);
-					return;
-				}
+			const formData = context.get("values");
+			if (submitting) {
+				const submitCount = refs.get("submitCount");
+				refs.set("submitCount", submitCount + 1);
+			}
+			const cachedServerErrors = getErrorsForCurrentValues(refs.get("serverErrors"), formData);
+			let errs = cachedServerErrors;
+			if (schema) errs = {
+				...cachedServerErrors,
+				...validateWithSchema(schema, formData)
+			};
+			context.set("errors", errs);
+			if (Object.keys(errs).length > 0) {
+				send({ type: "INVALID" });
+				if (submitting) action(["focusFirstInvalid"]);
+				return;
 			}
 			if (!submitting) {
 				state.set("ready");
@@ -302,7 +374,12 @@ const machine = createMachine({
 					else send({ type: "ERROR" });
 				} catch (error) {
 					if (error instanceof ValidationError) {
-						context.set("errors", error.errors);
+						const errors = withCurrentValues(error.errors, context.get("values"));
+						refs.set("serverErrors", {
+							...refs.get("serverErrors"),
+							...errors
+						});
+						context.set("errors", errors);
 						send({ type: "INVALID" });
 						action(["focusFirstInvalid"]);
 						return;
@@ -311,24 +388,29 @@ const machine = createMachine({
 				}
 			})();
 		},
-		validateField({ context, prop, event }) {
-			const schema = prop("schema");
-			if (!schema) return;
-			let fieldName = event.detail?.fieldName;
+		validateField({ context, prop, event, refs }) {
+			const fieldName = event.detail?.fieldName;
 			if (!fieldName) return;
+			const normalizedFieldName = normalizeFieldName(fieldName);
 			const formData = context.get("values");
 			const currentErrors = context.get("errors");
-			const existingError = currentErrors[fieldName];
-			const currentValue = getFormDataValue(formData, fieldName);
-			if (existingError) {
-				const errorValue = existingError.value;
-				if (JSON.stringify(currentValue) === JSON.stringify(errorValue)) return;
+			const currentValue = getFieldValue(formData, fieldName);
+			const updatedErrors = { ...currentErrors };
+			const serverError = getErrorForValue(refs.get("serverErrors"), normalizedFieldName, currentValue);
+			if (serverError) {
+				updatedErrors[normalizedFieldName] = serverError;
+				context.set("errors", updatedErrors);
+				return;
+			}
+			delete updatedErrors[normalizedFieldName];
+			const schema = prop("schema");
+			if (!schema) {
+				context.set("errors", updatedErrors);
+				return;
 			}
 			const allErrors = validateWithSchema(schema, formData);
-			const updatedErrors = { ...currentErrors };
-			const fieldNameWithoutSuffix = fieldName.replace(/\[\]$/, "");
-			if (allErrors[fieldNameWithoutSuffix]) updatedErrors[fieldNameWithoutSuffix] = allErrors[fieldNameWithoutSuffix];
-			else delete updatedErrors[fieldNameWithoutSuffix];
+			if (allErrors[normalizedFieldName]) updatedErrors[normalizedFieldName] = allErrors[normalizedFieldName];
+			else delete updatedErrors[normalizedFieldName];
 			context.set("errors", updatedErrors);
 		},
 		handleInput({ context, event, send }) {
@@ -346,38 +428,46 @@ const machine = createMachine({
 			context.set("dirty", dirty);
 			const currentErrors = context.get("errors");
 			const touched = context.get("touched");
-			const hasFieldError = !!currentErrors[name];
-			const fieldTouched = !!touched[name];
+			const normalizedName = normalizeFieldName(name);
+			const hasFieldError = !!currentErrors[normalizedName];
+			const fieldTouched = !!touched[normalizedName];
 			if (hasFieldError || fieldTouched) send({
 				type: "VALIDATE_FIELD",
 				detail: { fieldName: name }
 			});
 		},
-		handleBlur({ context, send, prop, event }) {
-			const target = event?.detail?.target;
-			let name = target?.name;
-			if (!name) name = target?.closest("[data-scope=\"field\"]")?.getAttribute("name") || void 0;
+		handleFocus({ context, event }) {
+			const e = event;
+			const name = getClosestFieldName(e?.detail?.target ?? e?.target ?? e?.currentTarget);
 			if (!name) return;
 			const touched = { ...context.get("touched") };
-			touched[name] = true;
+			touched[normalizeFieldName(name)] = true;
 			context.set("touched", touched);
+		},
+		handleBlur({ context, send, prop, event }) {
+			const e = event;
+			const target = e?.detail?.target;
+			const name = getClosestFieldName(target);
+			if (!name) return;
 			const form = target.form;
 			if (form) {
 				const values = new FormData(form);
 				context.set("values", values);
 			}
-			if (prop("schema")) send({
+			if (isFocusMovingWithinSameField(target, e?.detail?.relatedTarget)) return;
+			if (prop("schema") || context.get("errors")[normalizeFieldName(name)]) send({
 				type: "VALIDATE_FIELD",
 				detail: { fieldName: name }
 			});
 		},
-		resetForm({ context, scope, event }) {
+		resetForm({ context, scope, event, refs }) {
 			const form = getFormEl(scope);
 			if (form && !event?.detail?.omitManualReset) form.reset();
 			const initial = form ? new FormData(form) : context.get("initialValues");
 			context.set("values", initial);
 			context.set("initialValues", initial);
 			context.set("errors", {});
+			refs.set("serverErrors", {});
 			context.set("touched", {});
 			context.set("dirty", {});
 		},
@@ -387,7 +477,7 @@ const machine = createMachine({
 			if (!firstKey) return;
 			const form = getFormEl(scope);
 			if (!form) return;
-			const invalidEl = form.querySelector(`[name="${CSS.escape(firstKey)}"]`);
+			const invalidEl = getFieldElement(form, firstKey);
 			invalidEl?.focus();
 			if (invalidEl instanceof HTMLInputElement || invalidEl instanceof HTMLTextAreaElement) invalidEl.select();
 		},
@@ -401,8 +491,9 @@ const machine = createMachine({
 				});
 			}, true);
 		},
-		clearErrors({ context }) {
+		clearErrors({ context, refs }) {
 			context.set("errors", {});
+			refs.set("serverErrors", {});
 			context.set("touched", {});
 		}
 	} }

package/dist/{form.registry-Cb8Pvoe8.d.ts → form.registry-QMa3fDPK.d.ts}

@@ -1,4 +1,4 @@
-import { a as Machine } from "./index-B8JCdyld.js";
+import { a as Machine } from "./index-DjXeW-h1.js";
 
 //#region Resources/Private/Primitives/Form/src/form.registry.d.ts
 type FormMachine = Machine<any>;

package/dist/{index-B8JCdyld.d.ts → index-DjXeW-h1.d.ts}

@@ -91,9 +91,9 @@ declare function getHydrationData(component: string, id: string): ComponentHydra
 declare function mount(componentName: string, callback: (data: ComponentHydrationData & {
   createHydrator: () => ComponentHydrator;
 }) => Component<unknown, unknown> | void): void;
-declare function mountControlled(componentName: string, rootId: string, callback: (data: ComponentHydrationData & {
+declare function mountControlled<T>(componentName: string, rootId: string, callback: (data: ComponentHydrationData & {
   createHydrator: () => ComponentHydrator;
-}) => Component<unknown, unknown> | void): void | Component<unknown, unknown>;
+}) => T): T | undefined;
 declare class ComponentHydrator {
   componentName: string;
   doc: Document;

package/dist/navigation-menu.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as navigationMenu from "@zag-js/navigation-menu";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/navigation-menu.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as navigationMenu from "@zag-js/navigation-menu";
 
 //#region Resources/Private/Primitives/NavigationMenu/NavigationMenu.ts

package/dist/number-input.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 import * as numberInput from "@zag-js/number-input";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/number-input.js

@@ -1,5 +1,5 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
-import { a as getLabelId, t as getControlId } from "./field.dom-CJQXpQbZ.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
+import { r as getControlId, s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import * as numberInput from "@zag-js/number-input";
 
 //#region Resources/Private/Primitives/NumberInput/NumberInput.ts

package/dist/popover.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as popover from "@zag-js/popover";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/popover.js

@@ -1,4 +1,4 @@
-import { a as Machine, i as mergeProps, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, i as mergeProps, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as popover from "@zag-js/popover";
 
 //#region Resources/Private/Primitives/Popover/Popover.ts

package/dist/radio-group.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 import * as radioGroup from "@zag-js/radio-group";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/radio-group.js

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as radioGroup from "@zag-js/radio-group";
 
 //#region Resources/Private/Primitives/RadioGroup/RadioGroup.ts

package/dist/scroll-area.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as scrollArea from "@zag-js/scroll-area";
 import { PropTypes } from "@zag-js/types";
 

package/dist/scroll-area.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as scrollArea from "@zag-js/scroll-area";
 
 //#region Resources/Private/Primitives/ScrollArea/ScrollArea.ts

package/dist/select.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 import * as _$_zag_js_collection0 from "@zag-js/collection";
 import * as select from "@zag-js/select";
 import * as _$_zag_js_types0 from "@zag-js/types";

package/dist/select.js

@@ -1,5 +1,5 @@
-import { a as Machine, c as getListCollectionFromHydrationData, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
-import { a as getLabelId, t as getControlId } from "./field.dom-CJQXpQbZ.js";
+import { a as Machine, c as getListCollectionFromHydrationData, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
+import { r as getControlId, s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import * as select from "@zag-js/select";
 
 //#region Resources/Private/Primitives/Select/Select.ts

package/dist/switch.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-B8JCdyld.js";
+import { a as Machine, d as FieldMachine, u as FieldAwareComponent } from "./index-DjXeW-h1.js";
 import * as zagSwitch from "@zag-js/switch";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/switch.js

@@ -1,5 +1,5 @@
-import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-C51NSHxg.js";
-import { a as getLabelId, t as getControlId } from "./field.dom-CJQXpQbZ.js";
+import { a as Machine, d as FieldAwareComponent, i as mergeProps, r as normalizeProps } from "./Client-DAEIDEy9.js";
+import { r as getControlId, s as getLabelId } from "./field.dom-CtHP2v1P.js";
 import * as zagSwitch from "@zag-js/switch";
 
 //#region Resources/Private/Primitives/Switch/Switch.ts

package/dist/tabs.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as tabs from "@zag-js/tabs";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/tabs.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as tabs from "@zag-js/tabs";
 
 //#region Resources/Private/Primitives/Tabs/Tabs.ts

package/dist/tooltip.d.ts

@@ -1,4 +1,4 @@
-import { a as Machine, f as Component } from "./index-B8JCdyld.js";
+import { a as Machine, f as Component } from "./index-DjXeW-h1.js";
 import * as tooltip from "@zag-js/tooltip";
 import * as _$_zag_js_types0 from "@zag-js/types";
 

package/dist/tooltip.js

@@ -1,4 +1,4 @@
-import { a as Machine, p as Component, r as normalizeProps } from "./Client-C51NSHxg.js";
+import { a as Machine, p as Component, r as normalizeProps } from "./Client-DAEIDEy9.js";
 import * as tooltip from "@zag-js/tooltip";
 
 //#region Resources/Private/Primitives/Tooltip/Tooltip.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fluid-primitives",
-    "version": "0.19.0",
+    "version": "0.19.1-next.17.ea6daa2",
     "description": "Client-side library for Fluid Primitives.",
     "type": "module",
     "license": "MIT",

package/dist/field.dom-CJQXpQbZ.js

@@ -1,11 +0,0 @@
-//#region Resources/Private/Primitives/Field/src/field.dom.ts
-const getRootId = (scope) => scope.ids?.root ?? `field:${scope.id}:root`;
-const getLabelId = (scope) => scope.ids?.label ?? `field:${scope.id}:label`;
-const getControlId = (scope) => scope.ids?.control ?? `field:${scope.id}:control`;
-const getErrorId = (scope) => scope.ids?.error ?? `field:${scope.id}:error`;
-const getDescriptionId = (scope) => scope.ids?.description ?? `field:${scope.id}:description`;
-const getRootEl = (scope) => scope.getById(getRootId(scope));
-const getDescriptionEl = (scope) => scope.getById(getDescriptionId(scope));
-
-//#endregion
-export { getLabelId as a, getErrorId as i, getDescriptionEl as n, getRootEl as o, getDescriptionId as r, getRootId as s, getControlId as t };