@povio/ui 3.3.0 → 3.4.0-rc.1

package/dist/components/inputs/RadioGroup/RadioGroup.js

@@ -1,5 +1,6 @@
 import { UIOverrides } from "../../../config/uiOverrides.context.js";
 import { UIConfig } from "../../../config/uiConfig.context.js";
+import { FieldController } from "../shared/form.binding.js";
 import { CheckContent } from "../shared/CheckContent.js";
 import { FormFieldLabel } from "../FormField/FormFieldLabel.js";
 import { FormField } from "../FormField/FormField.js";
@@ -11,10 +12,9 @@ import { clsx } from "clsx";
 import { Radio, RadioGroup } from "react-aria-components";
 import { useLabel } from "react-aria";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/RadioGroup/RadioGroup.tsx
 var RadioGroupBase = (props) => {
-	const $ = c(91);
+	const $ = c(89);
 	const ui = UIConfig.useConfig();
 	const radioCva = UIOverrides.useCva("radio.cva", radioDefinition);
 	const radioTypographyMap = UIOverrides.useMapper("radio.typography", radioTypography);
@@ -23,12 +23,11 @@ var RadioGroupBase = (props) => {
 	const inputBaseCva = UIOverrides.useCva("input.baseCva", inputBaseDefinition);
 	const inputSizeCva = UIOverrides.useCva("input.sizeCva", inputSizeDefinition);
 	const radioContentClassNameMap = UIOverrides.useMapper("radio.contentClassName", radioContentClassName);
-	const { ref, label, tooltipText, helperText, isDirty, isRequired, rightContent, isDisabled, headerClassName, errorClassName, labelClassName, inputClassName, isHeaderHidden, error, className, options, value, defaultValue, onChange, onBlur, fireBlurOnChange: fireBlurOnChangeProp, as: asProp, size: sizeProp, variant: variantProp, hideLabel: hideLabelProp, ...rest } = props;
+	const { ref, label, tooltipText, helperText, isDirty, isRequired, rightContent, isDisabled, headerClassName, errorClassName, labelClassName, inputClassName, isHeaderHidden, error, className, options, value, defaultValue, onChange, onBlur, as: asProp, size: sizeProp, variant: variantProp, hideLabel: hideLabelProp, ...rest } = props;
 	const as = asProp ?? ui.input.as;
 	const size = sizeProp ?? ui.input.size;
 	const variant = variantProp ?? ui.radioGroup.variant;
 	const hideLabel = hideLabelProp ?? ui.radioGroup.hideLabel;
-	const fireBlurOnChange = fireBlurOnChangeProp ?? ui.radioGroup.fireBlurOnChange;
 	const radioClassName = radioCva({
 		variant,
 		...rest
@@ -109,16 +108,13 @@ var RadioGroupBase = (props) => {
 	const selectedValue = value ?? defaultValue;
 	const shouldRenderInputFrame = as !== "default";
 	let t5;
-	if ($[25] !== fireBlurOnChange || $[26] !== onBlur || $[27] !== onChange) {
+	if ($[25] !== onChange) {
 		t5 = (nextValue) => {
 			onChange?.(nextValue);
-			if (fireBlurOnChange) onBlur?.({});
 		};
-		$[25] = fireBlurOnChange;
-		$[26] = onBlur;
-		$[27] = onChange;
-		$[28] = t5;
-	} else t5 = $[28];
+		$[25] = onChange;
+		$[26] = t5;
+	} else t5 = $[26];
 	const handleChange = t5;
 	const T0 = RadioGroup;
 	const t6 = !!error;
@@ -128,26 +124,26 @@ var RadioGroupBase = (props) => {
 	const T1 = FormField;
 	const t10 = as === "inline" && "h-full";
 	let t11;
-	if ($[29] !== className || $[30] !== t10) {
+	if ($[27] !== className || $[28] !== t10) {
 		t11 = clsx("w-full", t10, className);
-		$[29] = className;
-		$[30] = t10;
-		$[31] = t11;
-	} else t11 = $[31];
+		$[27] = className;
+		$[28] = t10;
+		$[29] = t11;
+	} else t11 = $[29];
 	const t12 = as === "inline" ? -1 : void 0;
 	let t13;
-	if ($[32] !== as || $[33] !== inputBaseCva || $[34] !== inputClassName || $[35] !== shouldRenderInputFrame || $[36] !== ui) {
+	if ($[30] !== as || $[31] !== inputBaseCva || $[32] !== inputClassName || $[33] !== shouldRenderInputFrame || $[34] !== ui) {
 		t13 = clsx("group/radio-group-content relative", shouldRenderInputFrame && inputBaseCva({
 			variant: ui.input.variant,
 			as
 		}), inputClassName);
-		$[32] = as;
-		$[33] = inputBaseCva;
-		$[34] = inputClassName;
-		$[35] = shouldRenderInputFrame;
-		$[36] = ui;
-		$[37] = t13;
-	} else t13 = $[37];
+		$[30] = as;
+		$[31] = inputBaseCva;
+		$[32] = inputClassName;
+		$[33] = shouldRenderInputFrame;
+		$[34] = ui;
+		$[35] = t13;
+	} else t13 = $[35];
 	const t14 = "";
 	const t15 = isDisabled || void 0;
 	const t16 = isDisabled || void 0;
@@ -166,17 +162,17 @@ var RadioGroupBase = (props) => {
 	const t21 = isDirty || void 0;
 	const t22 = isRequired || void 0;
 	let t23;
-	if ($[38] !== as || $[39] !== headerProps || $[40] !== size) {
+	if ($[36] !== as || $[37] !== headerProps || $[38] !== size) {
 		t23 = as && ["filter", "floating"].includes(as) && /* @__PURE__ */ jsx(FormFieldLabel, {
 			as,
 			size,
 			...headerProps
 		});
-		$[38] = as;
-		$[39] = headerProps;
-		$[40] = size;
-		$[41] = t23;
-	} else t23 = $[41];
+		$[36] = as;
+		$[37] = headerProps;
+		$[38] = size;
+		$[39] = t23;
+	} else t23 = $[39];
 	const t24 = radioContentRowCva({
 		variant,
 		as,
@@ -184,9 +180,9 @@ var RadioGroupBase = (props) => {
 		...rest
 	});
 	let t25;
-	if ($[42] !== labelClassName || $[43] !== options || $[44] !== radioClassName || $[45] !== radioContentClassNameValue || $[46] !== radioTypographyProps) {
+	if ($[40] !== labelClassName || $[41] !== options || $[42] !== radioClassName || $[43] !== radioContentClassNameValue || $[44] !== radioTypographyProps) {
 		let t26;
-		if ($[48] !== labelClassName || $[49] !== radioClassName || $[50] !== radioContentClassNameValue || $[51] !== radioTypographyProps) {
+		if ($[46] !== labelClassName || $[47] !== radioClassName || $[48] !== radioContentClassNameValue || $[49] !== radioTypographyProps) {
 			t26 = (option) => /* @__PURE__ */ jsxs(Radio, {
 				value: option.value,
 				className: clsx("relative", radioIndicatorClass),
@@ -197,47 +193,47 @@ var RadioGroupBase = (props) => {
 					children: option.label
 				})]
 			}, option.value);
-			$[48] = labelClassName;
-			$[49] = radioClassName;
-			$[50] = radioContentClassNameValue;
-			$[51] = radioTypographyProps;
-			$[52] = t26;
-		} else t26 = $[52];
+			$[46] = labelClassName;
+			$[47] = radioClassName;
+			$[48] = radioContentClassNameValue;
+			$[49] = radioTypographyProps;
+			$[50] = t26;
+		} else t26 = $[50];
 		t25 = options.map(t26);
-		$[42] = labelClassName;
-		$[43] = options;
-		$[44] = radioClassName;
-		$[45] = radioContentClassNameValue;
-		$[46] = radioTypographyProps;
-		$[47] = t25;
-	} else t25 = $[47];
+		$[40] = labelClassName;
+		$[41] = options;
+		$[42] = radioClassName;
+		$[43] = radioContentClassNameValue;
+		$[44] = radioTypographyProps;
+		$[45] = t25;
+	} else t25 = $[45];
 	let t26;
-	if ($[53] !== t24 || $[54] !== t25) {
+	if ($[51] !== t24 || $[52] !== t25) {
 		t26 = /* @__PURE__ */ jsx("div", {
 			className: t24,
 			children: t25
 		});
-		$[53] = t24;
-		$[54] = t25;
-		$[55] = t26;
-	} else t26 = $[55];
+		$[51] = t24;
+		$[52] = t25;
+		$[53] = t26;
+	} else t26 = $[53];
 	let t27;
-	if ($[56] !== t20 || $[57] !== t21 || $[58] !== t22 || $[59] !== t23 || $[60] !== t26) {
+	if ($[54] !== t20 || $[55] !== t21 || $[56] !== t22 || $[57] !== t23 || $[58] !== t26) {
 		t27 = /* @__PURE__ */ jsxs("div", {
 			className: t20,
 			"data-is-dirty": t21,
 			"data-is-required": t22,
 			children: [t23, t26]
 		});
-		$[56] = t20;
-		$[57] = t21;
-		$[58] = t22;
-		$[59] = t23;
-		$[60] = t26;
-		$[61] = t27;
-	} else t27 = $[61];
+		$[54] = t20;
+		$[55] = t21;
+		$[56] = t22;
+		$[57] = t23;
+		$[58] = t26;
+		$[59] = t27;
+	} else t27 = $[59];
 	let t28;
-	if ($[62] !== t13 || $[63] !== t15 || $[64] !== t16 || $[65] !== t17 || $[66] !== t18 || $[67] !== t27) {
+	if ($[60] !== t13 || $[61] !== t15 || $[62] !== t16 || $[63] !== t17 || $[64] !== t18 || $[65] !== t27) {
 		t28 = /* @__PURE__ */ jsx("div", {
 			className: t13,
 			"data-rac": t14,
@@ -248,16 +244,16 @@ var RadioGroupBase = (props) => {
 			"data-radio-group-content": t19,
 			children: t27
 		});
-		$[62] = t13;
-		$[63] = t15;
-		$[64] = t16;
-		$[65] = t17;
-		$[66] = t18;
-		$[67] = t27;
-		$[68] = t28;
-	} else t28 = $[68];
+		$[60] = t13;
+		$[61] = t15;
+		$[62] = t16;
+		$[63] = t17;
+		$[64] = t18;
+		$[65] = t27;
+		$[66] = t28;
+	} else t28 = $[66];
 	let t29;
-	if ($[69] !== T1 || $[70] !== as || $[71] !== formFieldProps || $[72] !== labelProps || $[73] !== t11 || $[74] !== t12 || $[75] !== t28) {
+	if ($[67] !== T1 || $[68] !== as || $[69] !== formFieldProps || $[70] !== labelProps || $[71] !== t11 || $[72] !== t12 || $[73] !== t28) {
 		t29 = /* @__PURE__ */ jsx(T1, {
 			...formFieldProps,
 			as,
@@ -266,17 +262,17 @@ var RadioGroupBase = (props) => {
 			tabIndex: t12,
 			children: t28
 		});
-		$[69] = T1;
-		$[70] = as;
-		$[71] = formFieldProps;
-		$[72] = labelProps;
-		$[73] = t11;
-		$[74] = t12;
-		$[75] = t28;
-		$[76] = t29;
-	} else t29 = $[76];
+		$[67] = T1;
+		$[68] = as;
+		$[69] = formFieldProps;
+		$[70] = labelProps;
+		$[71] = t11;
+		$[72] = t12;
+		$[73] = t28;
+		$[74] = t29;
+	} else t29 = $[74];
 	let t30;
-	if ($[77] !== T0 || $[78] !== defaultValue || $[79] !== fieldProps || $[80] !== handleChange || $[81] !== isDisabled || $[82] !== onBlur || $[83] !== ref || $[84] !== rest || $[85] !== t29 || $[86] !== t6 || $[87] !== t7 || $[88] !== t8 || $[89] !== value) {
+	if ($[75] !== T0 || $[76] !== defaultValue || $[77] !== fieldProps || $[78] !== handleChange || $[79] !== isDisabled || $[80] !== onBlur || $[81] !== ref || $[82] !== rest || $[83] !== t29 || $[84] !== t6 || $[85] !== t7 || $[86] !== t8 || $[87] !== value) {
 		t30 = /* @__PURE__ */ jsx(T0, {
 			...rest,
 			...fieldProps,
@@ -292,54 +288,54 @@ var RadioGroupBase = (props) => {
 			className: t9,
 			children: t29
 		});
-		$[77] = T0;
-		$[78] = defaultValue;
-		$[79] = fieldProps;
-		$[80] = handleChange;
-		$[81] = isDisabled;
-		$[82] = onBlur;
-		$[83] = ref;
-		$[84] = rest;
-		$[85] = t29;
-		$[86] = t6;
-		$[87] = t7;
-		$[88] = t8;
-		$[89] = value;
-		$[90] = t30;
-	} else t30 = $[90];
+		$[75] = T0;
+		$[76] = defaultValue;
+		$[77] = fieldProps;
+		$[78] = handleChange;
+		$[79] = isDisabled;
+		$[80] = onBlur;
+		$[81] = ref;
+		$[82] = rest;
+		$[83] = t29;
+		$[84] = t6;
+		$[85] = t7;
+		$[86] = t8;
+		$[87] = value;
+		$[88] = t30;
+	} else t30 = $[88];
 	return t30;
 };
 var RadioGroup$1 = (props) => {
 	const $ = c(15);
-	if ("formControl" in props && props.formControl) {
-		let formControl;
+	if ("field" in props && props.field) {
+		let field;
 		let innerProps;
 		let ref;
 		if ($[0] !== props) {
-			({formControl, ref, ...innerProps} = props);
+			({field, ref, ...innerProps} = props);
 			$[0] = props;
-			$[1] = formControl;
+			$[1] = field;
 			$[2] = innerProps;
 			$[3] = ref;
 		} else {
-			formControl = $[1];
+			field = $[1];
 			innerProps = $[2];
 			ref = $[3];
 		}
 		let t0;
 		if ($[4] !== innerProps || $[5] !== props.error || $[6] !== props.isDisabled || $[7] !== ref) {
 			t0 = (t1) => {
-				const { field, fieldState: t2 } = t1;
+				const { field: field_0, fieldState: t2 } = t1;
 				const { error, isDirty } = t2;
 				return /* @__PURE__ */ jsx(RadioGroupBase, {
 					...innerProps,
-					ref: mergeRefs(ref, field.ref),
-					value: field.value,
-					onChange: field.onChange,
-					onBlur: field.onBlur,
-					name: field.name,
+					ref: mergeRefs(ref, field_0.ref),
+					value: field_0.value,
+					onChange: field_0.onChange,
+					onBlur: field_0.onBlur,
+					name: field_0.name,
 					isDirty,
-					isDisabled: field.disabled || props.isDisabled,
+					isDisabled: field_0.disabled || props.isDisabled,
 					error: props.error ?? error?.message
 				});
 			};
@@ -350,14 +346,14 @@ var RadioGroup$1 = (props) => {
 			$[8] = t0;
 		} else t0 = $[8];
 		let t1;
-		if ($[9] !== formControl.control || $[10] !== formControl.name || $[11] !== t0) {
-			t1 = /* @__PURE__ */ jsx(Controller, {
-				control: formControl.control,
-				name: formControl.name,
+		if ($[9] !== field.form || $[10] !== field.name || $[11] !== t0) {
+			t1 = /* @__PURE__ */ jsx(FieldController, {
+				control: field.form,
+				name: field.name,
 				render: t0
 			});
-			$[9] = formControl.control;
-			$[10] = formControl.name;
+			$[9] = field.form;
+			$[10] = field.name;
 			$[11] = t0;
 			$[12] = t1;
 		} else t1 = $[12];

package/dist/components/inputs/Selection/Autocomplete/Autocomplete.d.ts

@@ -1,6 +1,6 @@
 import { ReactElement } from 'react';
 import { Key } from 'react-aria-components';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { SelectBaseProps } from '../shared/SelectBase';
 import { DefaultInitialSelectItem, GroupedSelectControlProps, GroupedSelectProps } from '../shared/select.types';
 import { OmitDiscriminatedUnion } from '../../../../types/common';

package/dist/components/inputs/Selection/Autocomplete/Autocomplete.js

@@ -1,5 +1,6 @@
 import { UIOverrides } from "../../../../config/uiOverrides.context.js";
 import { UIConfig } from "../../../../config/uiConfig.context.js";
+import { FieldController } from "../../shared/form.binding.js";
 import { InputFrame } from "../../Skeleton/InputFrame.js";
 import { useStaticInputHandoff } from "../../shared/useStaticInputHandoff.js";
 import { selectInputTagsContentWrapperDefinition } from "../shared/selectInput.cva.js";
@@ -11,7 +12,6 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { clsx } from "clsx";
 import { useRef, useState } from "react";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/Selection/Autocomplete/Autocomplete.tsx
 function AutocompleteInner(t0) {
 	const $ = c(8);
@@ -135,20 +135,20 @@ function _temp(root) {
 	return root.querySelector("input, [data-type='select-trigger'], button, [tabindex]");
 }
 function Autocomplete({ renderStaticInput, ...props }) {
-	if ("formControl" in props && props.formControl) {
-		const { ignoreInputValueFiltering = true, formControl, ref, ...innerProps } = props;
-		const controlWithOptions = formControl.control;
-		return /* @__PURE__ */ jsx(Controller, {
-			control: formControl.control,
-			name: formControl.name,
-			render: ({ field, fieldState: { error, isDirty } }) => /* @__PURE__ */ jsx(AutocompleteInner, {
+	if ("field" in props && props.field) {
+		const { ignoreInputValueFiltering = true, field, ref, ...innerProps } = props;
+		const controlWithOptions = field.form;
+		return /* @__PURE__ */ jsx(FieldController, {
+			control: field.form,
+			name: field.name,
+			render: ({ field: field_0, fieldState: { error, isDirty } }) => /* @__PURE__ */ jsx(AutocompleteInner, {
 				...innerProps,
-				ref: mergeRefs(ref, field.ref),
-				value: field.value,
-				onChange: field.onChange,
-				onBlur: field.onBlur,
+				ref: mergeRefs(ref, field_0.ref),
+				value: field_0.value,
+				onChange: field_0.onChange,
+				onBlur: field_0.onBlur,
 				isDirty,
-				isDisabled: field.disabled || props.isDisabled,
+				isDisabled: field_0.disabled || props.isDisabled,
 				isFormControlDisabled: !!controlWithOptions._options?.disabled,
 				error: props.error ?? error?.message,
 				ignoreInputValueFiltering,

package/dist/components/inputs/Selection/Autocomplete/QueryAutocomplete.d.ts

@@ -1,4 +1,4 @@
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { QueryAutocompleteProps, QueryFn } from './queryAutocomplete.types';
 import { SelectItem } from '../shared/select.types';
 export declare const QueryAutocomplete: <TFieldValues extends FieldValues, TSelectItem extends SelectItem<any>, TQueryFn extends QueryFn>(props: QueryAutocompleteProps<TFieldValues, TSelectItem, TQueryFn>) => import("react/jsx-runtime").JSX.Element;

package/dist/components/inputs/Selection/Autocomplete/QueryAutocomplete.js

@@ -1,4 +1,5 @@
 import { UIConfig } from "../../../../config/uiConfig.context.js";
+import { FieldController } from "../../shared/form.binding.js";
 import { Autocomplete } from "./Autocomplete.js";
 import { getQueryItems, getSelectionIdsToResolve } from "../shared/querySelect.utils.js";
 import { useQueryAutocomplete } from "../../../../hooks/useQueryAutocomplete.js";
@@ -6,7 +7,6 @@ import { c } from "react/compiler-runtime";
 import { jsx } from "react/jsx-runtime";
 import { useState } from "react";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/Selection/Autocomplete/QueryAutocomplete.tsx
 var LoadedQueryAutocompleteContent = ({ query, queryParams, queryOptions, queryMap, resolveSelectedItemsWithIds, isQueryEnabledInitially = false, leadingContent, ...props }) => {
 	"use no memo";
@@ -111,35 +111,35 @@ var QueryAutocompleteContent = (props) => {
 };
 var QueryAutocomplete = (props) => {
 	const $ = c(16);
-	if ("formControl" in props && props.formControl) {
-		let formControl;
+	if ("field" in props && props.field) {
+		let field;
 		let innerProps;
 		let ref;
 		if ($[0] !== props) {
-			({formControl, ref, ...innerProps} = props);
+			({field, ref, ...innerProps} = props);
 			$[0] = props;
-			$[1] = formControl;
+			$[1] = field;
 			$[2] = innerProps;
 			$[3] = ref;
 		} else {
-			formControl = $[1];
+			field = $[1];
 			innerProps = $[2];
 			ref = $[3];
 		}
-		const controlWithOptions = formControl.control;
+		const controlWithOptions = field.form;
 		let t0;
 		if ($[4] !== controlWithOptions || $[5] !== innerProps || $[6] !== props.error || $[7] !== props.isDisabled || $[8] !== ref) {
 			t0 = (t1) => {
-				const { field, fieldState: t2 } = t1;
+				const { field: field_0, fieldState: t2 } = t1;
 				const { error, isDirty } = t2;
 				return /* @__PURE__ */ jsx(QueryAutocompleteContent, {
 					...innerProps,
-					ref: mergeRefs(ref, field.ref),
-					value: field.value,
-					onChange: field.onChange,
-					onBlur: field.onBlur,
+					ref: mergeRefs(ref, field_0.ref),
+					value: field_0.value,
+					onChange: field_0.onChange,
+					onBlur: field_0.onBlur,
 					isDirty,
-					isDisabled: field.disabled || props.isDisabled || !!controlWithOptions._options?.disabled,
+					isDisabled: field_0.disabled || props.isDisabled || !!controlWithOptions._options?.disabled,
 					error: props.error ?? error?.message
 				});
 			};
@@ -151,14 +151,14 @@ var QueryAutocomplete = (props) => {
 			$[9] = t0;
 		} else t0 = $[9];
 		let t1;
-		if ($[10] !== formControl.control || $[11] !== formControl.name || $[12] !== t0) {
-			t1 = /* @__PURE__ */ jsx(Controller, {
-				control: formControl.control,
-				name: formControl.name,
+		if ($[10] !== field.form || $[11] !== field.name || $[12] !== t0) {
+			t1 = /* @__PURE__ */ jsx(FieldController, {
+				control: field.form,
+				name: field.name,
 				render: t0
 			});
-			$[10] = formControl.control;
-			$[11] = formControl.name;
+			$[10] = field.form;
+			$[11] = field.name;
 			$[12] = t0;
 			$[13] = t1;
 		} else t1 = $[13];

package/dist/components/inputs/Selection/Autocomplete/queryAutocomplete.types.d.ts

@@ -1,6 +1,6 @@
 import { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from '@tanstack/react-query';
 import { Key } from 'react-aria-components';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { AutocompleteProps } from './Autocomplete';
 import { GroupedSelectControlProps, GroupedSelectProps, SelectItem } from '../shared/select.types';
 import { OmitDiscriminatedUnion } from '../../../../types/common';

package/dist/components/inputs/Selection/Select/QuerySelect.d.ts

@@ -1,5 +1,5 @@
 import { Key } from 'react-aria-components';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { DefaultInitialSelectItem, GroupedSelectControlProps, GroupedSelectProps, SelectItem } from '../shared/select.types';
 import { SelectProps } from './Select';
 import { QueryDataType, QueryFn } from '../shared/querySelect.utils';

package/dist/components/inputs/Selection/Select/QuerySelect.js

@@ -1,4 +1,5 @@
 import { UIConfig } from "../../../../config/uiConfig.context.js";
+import { FieldController } from "../../shared/form.binding.js";
 import { Select } from "./Select.js";
 import { getQueryItems, getSelectionIdsToResolve } from "../shared/querySelect.utils.js";
 import { useQueryAutocomplete } from "../../../../hooks/useQueryAutocomplete.js";
@@ -6,7 +7,6 @@ import { c } from "react/compiler-runtime";
 import { jsx } from "react/jsx-runtime";
 import { useState } from "react";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/Selection/Select/QuerySelect.tsx
 var LoadedQuerySelectContent = ({ query, queryParams, queryOptions, queryMap, resolveSelectedItemsWithIds, isQueryEnabledInitially = false, ...props }) => {
 	const ui = UIConfig.useConfig();
@@ -107,35 +107,35 @@ var QuerySelectContent = (props) => {
 };
 var QuerySelect = (props) => {
 	const $ = c(16);
-	if ("formControl" in props && props.formControl) {
-		let formControl;
+	if ("field" in props && props.field) {
+		let field;
 		let innerProps;
 		let ref;
 		if ($[0] !== props) {
-			({formControl, ref, ...innerProps} = props);
+			({field, ref, ...innerProps} = props);
 			$[0] = props;
-			$[1] = formControl;
+			$[1] = field;
 			$[2] = innerProps;
 			$[3] = ref;
 		} else {
-			formControl = $[1];
+			field = $[1];
 			innerProps = $[2];
 			ref = $[3];
 		}
-		const controlWithOptions = formControl.control;
+		const controlWithOptions = field.form;
 		let t0;
 		if ($[4] !== controlWithOptions || $[5] !== innerProps || $[6] !== props.error || $[7] !== props.isDisabled || $[8] !== ref) {
 			t0 = (t1) => {
-				const { field, fieldState: t2 } = t1;
+				const { field: field_0, fieldState: t2 } = t1;
 				const { error, isDirty } = t2;
 				return /* @__PURE__ */ jsx(QuerySelectContent, {
 					...innerProps,
-					ref: mergeRefs(ref, field.ref),
-					value: field.value,
-					onChange: field.onChange,
-					onBlur: field.onBlur,
+					ref: mergeRefs(ref, field_0.ref),
+					value: field_0.value,
+					onChange: field_0.onChange,
+					onBlur: field_0.onBlur,
 					isDirty,
-					isDisabled: field.disabled || props.isDisabled || !!controlWithOptions._options?.disabled,
+					isDisabled: field_0.disabled || props.isDisabled || !!controlWithOptions._options?.disabled,
 					error: props.error ?? error?.message
 				});
 			};
@@ -147,14 +147,14 @@ var QuerySelect = (props) => {
 			$[9] = t0;
 		} else t0 = $[9];
 		let t1;
-		if ($[10] !== formControl.control || $[11] !== formControl.name || $[12] !== t0) {
-			t1 = /* @__PURE__ */ jsx(Controller, {
-				control: formControl.control,
-				name: formControl.name,
+		if ($[10] !== field.form || $[11] !== field.name || $[12] !== t0) {
+			t1 = /* @__PURE__ */ jsx(FieldController, {
+				control: field.form,
+				name: field.name,
 				render: t0
 			});
-			$[10] = formControl.control;
-			$[11] = formControl.name;
+			$[10] = field.form;
+			$[11] = field.name;
 			$[12] = t0;
 			$[13] = t1;
 		} else t1 = $[13];

package/dist/components/inputs/Selection/Select/Select.d.ts

@@ -1,6 +1,6 @@
 import { ReactElement } from 'react';
 import { Key } from 'react-aria-components';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { SelectBaseProps } from '../shared/SelectBase';
 import { DefaultInitialSelectItem, GroupedSelectControlProps, GroupedSelectProps, SelectAsyncProps } from '../shared/select.types';
 import { OmitDiscriminatedUnion } from '../../../../types/common';