@povio/ui 3.3.0 → 3.4.0-rc.10

package/dist/components/inputs/Checkbox/CheckboxGroup.js

@@ -1,32 +1,31 @@
 import { UIOverrides } from "../../../config/uiOverrides.context.js";
 import { UIConfig } from "../../../config/uiConfig.context.js";
+import { FieldController } from "../shared/form.binding.js";
 import { checkboxContentRowDefinition, checkboxContentWrapperDefinition, checkboxGroupLabelDefinition } from "./checkbox.cva.js";
 import { CheckboxBase } from "./Checkbox.js";
 import { FormFieldLabel } from "../FormField/FormFieldLabel.js";
 import { FormField } from "../FormField/FormField.js";
 import { inputBaseDefinition, inputSizeDefinition } from "../shared/input.cva.js";
-import { c } from "react/compiler-runtime";
-import { jsx, jsxs } from "react/jsx-runtime";
 import { clsx } from "clsx";
 import { CheckboxGroup } from "react-aria-components";
+import { c } from "react/compiler-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useLabel } from "react-aria";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 //#region src/components/inputs/Checkbox/CheckboxGroup.tsx
 var CheckboxGroupBase = (props) => {
-	const $ = c(101);
+	const $ = c(99);
 	const ui = UIConfig.useConfig();
 	const checkboxContentWrapperCva = UIOverrides.useCva("checkbox.contentWrapperCva", checkboxContentWrapperDefinition);
 	const checkboxContentRowCva = UIOverrides.useCva("checkbox.contentRowCva", checkboxContentRowDefinition);
 	const checkboxGroupLabelCva = UIOverrides.useCva("checkbox.groupLabelCva", checkboxGroupLabelDefinition);
 	const inputBaseCva = UIOverrides.useCva("input.baseCva", inputBaseDefinition);
 	const inputSizeCva = UIOverrides.useCva("input.sizeCva", inputSizeDefinition);
-	const { ref, label, tooltipText, helperText, isDirty, isRequired, rightContent, isDisabled, headerClassName, errorClassName, labelClassName, inputClassName, isHeaderHidden, error, className, options, allValue, 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, allValue, 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.checkbox.variant;
 	const hideLabel = hideLabelProp ?? ui.input.hideLabel;
-	const fireBlurOnChange = fireBlurOnChangeProp ?? ui.checkbox.fireBlurOnChange;
 	let optionValues;
 	let resolvedValue;
 	let t0;
@@ -122,19 +121,16 @@ var CheckboxGroupBase = (props) => {
 	} else t5 = $[31];
 	const headerProps = t5;
 	let t6;
-	if ($[32] !== allValue || $[33] !== fireBlurOnChange || $[34] !== onBlur || $[35] !== onChange || $[36] !== optionValues) {
+	if ($[32] !== allValue || $[33] !== onChange || $[34] !== optionValues) {
 		t6 = (nextValue) => {
 			const hasAllOptions = allValue !== void 0 && optionValues.length > 0 && optionValues.every((optionValue) => nextValue.includes(optionValue));
 			onChange?.(hasAllOptions ? allValue : nextValue);
-			if (fireBlurOnChange) onBlur?.({});
 		};
 		$[32] = allValue;
-		$[33] = fireBlurOnChange;
-		$[34] = onBlur;
-		$[35] = onChange;
-		$[36] = optionValues;
-		$[37] = t6;
-	} else t6 = $[37];
+		$[33] = onChange;
+		$[34] = optionValues;
+		$[35] = t6;
+	} else t6 = $[35];
 	const handleChange = t6;
 	const T0 = CheckboxGroup;
 	const t7 = !!error;
@@ -144,26 +140,26 @@ var CheckboxGroupBase = (props) => {
 	const T1 = FormField;
 	const t11 = as === "inline" && "h-full";
 	let t12;
-	if ($[38] !== className || $[39] !== t11) {
+	if ($[36] !== className || $[37] !== t11) {
 		t12 = clsx("w-full", t11, className);
-		$[38] = className;
-		$[39] = t11;
-		$[40] = t12;
-	} else t12 = $[40];
+		$[36] = className;
+		$[37] = t11;
+		$[38] = t12;
+	} else t12 = $[38];
 	const t13 = as === "inline" ? -1 : void 0;
 	let t14;
-	if ($[41] !== as || $[42] !== inputBaseCva || $[43] !== inputClassName || $[44] !== shouldRenderInputFrame || $[45] !== ui) {
+	if ($[39] !== as || $[40] !== inputBaseCva || $[41] !== inputClassName || $[42] !== shouldRenderInputFrame || $[43] !== ui) {
 		t14 = clsx("group/checkbox-group-content relative", shouldRenderInputFrame && inputBaseCva({
 			variant: ui.input.variant,
 			as
 		}), inputClassName);
-		$[41] = as;
-		$[42] = inputBaseCva;
-		$[43] = inputClassName;
-		$[44] = shouldRenderInputFrame;
-		$[45] = ui;
-		$[46] = t14;
-	} else t14 = $[46];
+		$[39] = as;
+		$[40] = inputBaseCva;
+		$[41] = inputClassName;
+		$[42] = shouldRenderInputFrame;
+		$[43] = ui;
+		$[44] = t14;
+	} else t14 = $[44];
 	const t15 = "";
 	const t16 = isDisabled || void 0;
 	const t17 = isDisabled || void 0;
@@ -183,20 +179,20 @@ var CheckboxGroupBase = (props) => {
 	const t22 = isDirty || void 0;
 	const t23 = isRequired || void 0;
 	let t24;
-	if ($[47] !== as || $[48] !== checkboxGroupLabelCva || $[49] !== headerClassName || $[50] !== headerProps || $[51] !== size) {
+	if ($[45] !== as || $[46] !== checkboxGroupLabelCva || $[47] !== headerClassName || $[48] !== headerProps || $[49] !== size) {
 		t24 = as && ["filter", "floating"].includes(as) && /* @__PURE__ */ jsx(FormFieldLabel, {
 			...headerProps,
 			as: as === "floating" ? "filter" : as,
 			size,
 			className: clsx(headerClassName, checkboxGroupLabelCva({ as }))
 		});
-		$[47] = as;
-		$[48] = checkboxGroupLabelCva;
-		$[49] = headerClassName;
-		$[50] = headerProps;
-		$[51] = size;
-		$[52] = t24;
-	} else t24 = $[52];
+		$[45] = as;
+		$[46] = checkboxGroupLabelCva;
+		$[47] = headerClassName;
+		$[48] = headerProps;
+		$[49] = size;
+		$[50] = t24;
+	} else t24 = $[50];
 	const t25 = checkboxContentRowCva({
 		variant,
 		as,
@@ -204,9 +200,9 @@ var CheckboxGroupBase = (props) => {
 		...rest
 	});
 	let t26;
-	if ($[53] !== hideLabel || $[54] !== labelClassName || $[55] !== options || $[56] !== variant) {
+	if ($[51] !== hideLabel || $[52] !== labelClassName || $[53] !== options || $[54] !== variant) {
 		let t27;
-		if ($[58] !== hideLabel || $[59] !== labelClassName || $[60] !== variant) {
+		if ($[56] !== hideLabel || $[57] !== labelClassName || $[58] !== variant) {
 			t27 = (option_0) => /* @__PURE__ */ jsx(CheckboxBase, {
 				value: option_0.value,
 				variant,
@@ -215,45 +211,45 @@ var CheckboxGroupBase = (props) => {
 				labelClassName,
 				children: option_0.label
 			}, option_0.value);
-			$[58] = hideLabel;
-			$[59] = labelClassName;
-			$[60] = variant;
-			$[61] = t27;
-		} else t27 = $[61];
+			$[56] = hideLabel;
+			$[57] = labelClassName;
+			$[58] = variant;
+			$[59] = t27;
+		} else t27 = $[59];
 		t26 = options.map(t27);
-		$[53] = hideLabel;
-		$[54] = labelClassName;
-		$[55] = options;
-		$[56] = variant;
-		$[57] = t26;
-	} else t26 = $[57];
+		$[51] = hideLabel;
+		$[52] = labelClassName;
+		$[53] = options;
+		$[54] = variant;
+		$[55] = t26;
+	} else t26 = $[55];
 	let t27;
-	if ($[62] !== t25 || $[63] !== t26) {
+	if ($[60] !== t25 || $[61] !== t26) {
 		t27 = /* @__PURE__ */ jsx("div", {
 			className: t25,
 			children: t26
 		});
-		$[62] = t25;
-		$[63] = t26;
-		$[64] = t27;
-	} else t27 = $[64];
+		$[60] = t25;
+		$[61] = t26;
+		$[62] = t27;
+	} else t27 = $[62];
 	let t28;
-	if ($[65] !== t21 || $[66] !== t22 || $[67] !== t23 || $[68] !== t24 || $[69] !== t27) {
+	if ($[63] !== t21 || $[64] !== t22 || $[65] !== t23 || $[66] !== t24 || $[67] !== t27) {
 		t28 = /* @__PURE__ */ jsxs("div", {
 			className: t21,
 			"data-is-dirty": t22,
 			"data-is-required": t23,
 			children: [t24, t27]
 		});
-		$[65] = t21;
-		$[66] = t22;
-		$[67] = t23;
-		$[68] = t24;
-		$[69] = t27;
-		$[70] = t28;
-	} else t28 = $[70];
+		$[63] = t21;
+		$[64] = t22;
+		$[65] = t23;
+		$[66] = t24;
+		$[67] = t27;
+		$[68] = t28;
+	} else t28 = $[68];
 	let t29;
-	if ($[71] !== t14 || $[72] !== t16 || $[73] !== t17 || $[74] !== t18 || $[75] !== t19 || $[76] !== t28) {
+	if ($[69] !== t14 || $[70] !== t16 || $[71] !== t17 || $[72] !== t18 || $[73] !== t19 || $[74] !== t28) {
 		t29 = /* @__PURE__ */ jsx("div", {
 			className: t14,
 			"data-rac": t15,
@@ -264,16 +260,16 @@ var CheckboxGroupBase = (props) => {
 			"data-checkbox-group-content": t20,
 			children: t28
 		});
-		$[71] = t14;
-		$[72] = t16;
-		$[73] = t17;
-		$[74] = t18;
-		$[75] = t19;
-		$[76] = t28;
-		$[77] = t29;
-	} else t29 = $[77];
+		$[69] = t14;
+		$[70] = t16;
+		$[71] = t17;
+		$[72] = t18;
+		$[73] = t19;
+		$[74] = t28;
+		$[75] = t29;
+	} else t29 = $[75];
 	let t30;
-	if ($[78] !== T1 || $[79] !== as || $[80] !== formFieldProps || $[81] !== labelProps || $[82] !== t12 || $[83] !== t13 || $[84] !== t29) {
+	if ($[76] !== T1 || $[77] !== as || $[78] !== formFieldProps || $[79] !== labelProps || $[80] !== t12 || $[81] !== t13 || $[82] !== t29) {
 		t30 = /* @__PURE__ */ jsx(T1, {
 			...formFieldProps,
 			as,
@@ -282,17 +278,17 @@ var CheckboxGroupBase = (props) => {
 			tabIndex: t13,
 			children: t29
 		});
-		$[78] = T1;
-		$[79] = as;
-		$[80] = formFieldProps;
-		$[81] = labelProps;
-		$[82] = t12;
-		$[83] = t13;
-		$[84] = t29;
-		$[85] = t30;
-	} else t30 = $[85];
+		$[76] = T1;
+		$[77] = as;
+		$[78] = formFieldProps;
+		$[79] = labelProps;
+		$[80] = t12;
+		$[81] = t13;
+		$[82] = t29;
+		$[83] = t30;
+	} else t30 = $[83];
 	let t31;
-	if ($[86] !== T0 || $[87] !== fieldProps || $[88] !== handleChange || $[89] !== isDisabled || $[90] !== isRequired || $[91] !== onBlur || $[92] !== ref || $[93] !== resolvedDefaultValue || $[94] !== resolvedValue || $[95] !== rest || $[96] !== t30 || $[97] !== t7 || $[98] !== t8 || $[99] !== t9) {
+	if ($[84] !== T0 || $[85] !== fieldProps || $[86] !== handleChange || $[87] !== isDisabled || $[88] !== isRequired || $[89] !== onBlur || $[90] !== ref || $[91] !== resolvedDefaultValue || $[92] !== resolvedValue || $[93] !== rest || $[94] !== t30 || $[95] !== t7 || $[96] !== t8 || $[97] !== t9) {
 		t31 = /* @__PURE__ */ jsx(T0, {
 			...rest,
 			...fieldProps,
@@ -309,55 +305,55 @@ var CheckboxGroupBase = (props) => {
 			className: t10,
 			children: t30
 		});
-		$[86] = T0;
-		$[87] = fieldProps;
-		$[88] = handleChange;
-		$[89] = isDisabled;
-		$[90] = isRequired;
-		$[91] = onBlur;
-		$[92] = ref;
-		$[93] = resolvedDefaultValue;
-		$[94] = resolvedValue;
-		$[95] = rest;
-		$[96] = t30;
-		$[97] = t7;
-		$[98] = t8;
-		$[99] = t9;
-		$[100] = t31;
-	} else t31 = $[100];
+		$[84] = T0;
+		$[85] = fieldProps;
+		$[86] = handleChange;
+		$[87] = isDisabled;
+		$[88] = isRequired;
+		$[89] = onBlur;
+		$[90] = ref;
+		$[91] = resolvedDefaultValue;
+		$[92] = resolvedValue;
+		$[93] = rest;
+		$[94] = t30;
+		$[95] = t7;
+		$[96] = t8;
+		$[97] = t9;
+		$[98] = t31;
+	} else t31 = $[98];
 	return t31;
 };
 var CheckboxGroup$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(CheckboxGroupBase, {
 					...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
 				});
 			};
@@ -368,14 +364,14 @@ var CheckboxGroup$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/DateTime/DatePicker/DatePicker.d.ts

@@ -1,6 +1,6 @@
 import { CalendarDate, DateValue } from '@internationalized/date';
 import { FocusEvent, Ref } from 'react';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { DatePickerStateOptions } from 'react-stately';
 import { DatePickerInputHandle } from '../shared/DatePickerInput';
 import { DatePickerTodayIcon, DatePickerTodayIconButtonComponent, DatePickerTodayIconButtonSize, DatePickerTodayIconPlacement } from '../shared/datePicker.types';
@@ -12,6 +12,7 @@ interface DatePickerBaseProps extends FormFieldProps, InputVariantProps, Omit<Da
     ref?: Ref<DatePickerInputHandle & HTMLDivElement>;
     disableDropdown?: boolean;
     isClearable?: boolean;
+    isClearableIfDisabled?: boolean;
     className?: string;
     todayIcon?: DatePickerTodayIcon;
     todayIconButtonSize?: DatePickerTodayIconButtonSize;
@@ -26,7 +27,6 @@ interface DatePickerBaseProps extends FormFieldProps, InputVariantProps, Omit<Da
     shouldUpdateDateOnMonthYearChange?: boolean;
     granularity?: DatePickerGranularity;
     format?: string;
-    fireBlurOnChange?: boolean;
 }
 export interface DatePickerProps extends Omit<DatePickerBaseProps, "value" | "onChange" | "minValue" | "maxValue"> {
     value?: string | null;

package/dist/components/inputs/DateTime/DatePicker/DatePicker.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 { FormField } from "../../FormField/FormField.js";
 import { Calendar } from "../shared/Calendar.js";
 import { DateTimeUtils } from "../../../../utils/date-time.utils.js";
@@ -12,20 +13,18 @@ import { getStaticCalendarDateSegments, getStaticDateTimeFocusTarget } from "../
 import { TooltipWrapper } from "../../shared/TooltipWrapper.js";
 import { InputFrame } from "../../Skeleton/InputFrame.js";
 import { useStaticInputHandoff } from "../../shared/useStaticInputHandoff.js";
-import { useDebounceCallback } from "../../../../hooks/useDebounceCallback.js";
-import { jsx, jsxs } from "react/jsx-runtime";
 import { clsx } from "clsx";
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useDatePicker, useLocale } from "react-aria";
 import { mergeRefs } from "@react-aria/utils";
-import { Controller } from "react-hook-form";
 import { createCalendar, getLocalTimeZone, toCalendarDate, today } from "@internationalized/date";
 import { DateTime } from "luxon";
 import { useCalendarState, useDatePickerState } from "react-stately";
 //#region src/components/inputs/DateTime/DatePicker/DatePicker.tsx
 var DatePickerBase = (props) => {
 	const ui = UIConfig.useConfig();
-	const { ref, label, tooltipText, helperText, isRequired, rightContent, isDirty, isDisabled, headerClassName, errorClassName, isHeaderHidden, error, onChange, onBlur, value, disableDropdown, className, placeholder, inputClassName, as: asProp, hideLabel: hideLabelProp, variant: variantProp, size: sizeProp, isClearable: isClearableProp, todayIcon: todayIconProp, todayIconButtonSize: todayIconButtonSizeProp, todayIconButtonComponent: todayIconButtonComponentProp, todayIconPlacement: todayIconPlacementProp, shouldForceLeadingZeros: shouldForceLeadingZerosProp, disableManualEntry: disableManualEntryProp, shouldUpdateDateOnMonthYearChange: shouldUpdateDateOnMonthYearChangeProp, granularity: granularityProp, autoFixYear: autoFixYearProp, fireBlurOnChange: fireBlurOnChangeProp, format, ...rest } = props;
+	const { ref, label, tooltipText, helperText, isRequired, rightContent, isDirty, isDisabled, headerClassName, errorClassName, isHeaderHidden, error, onChange, onBlur, value, disableDropdown, className, placeholder, inputClassName, as: asProp, hideLabel: hideLabelProp, variant: variantProp, size: sizeProp, isClearable: isClearableProp, isClearableIfDisabled, todayIcon: todayIconProp, todayIconButtonSize: todayIconButtonSizeProp, todayIconButtonComponent: todayIconButtonComponentProp, todayIconPlacement: todayIconPlacementProp, shouldForceLeadingZeros: shouldForceLeadingZerosProp, disableManualEntry: disableManualEntryProp, shouldUpdateDateOnMonthYearChange: shouldUpdateDateOnMonthYearChangeProp, granularity: granularityProp, autoFixYear: autoFixYearProp, format, ...rest } = props;
 	const as = asProp ?? ui.input.as;
 	const hideLabel = hideLabelProp ?? ui.input.hideLabel;
 	const variant = variantProp ?? ui.input.variant;
@@ -40,7 +39,6 @@ var DatePickerBase = (props) => {
 	const shouldUpdateDateOnMonthYearChange = shouldUpdateDateOnMonthYearChangeProp ?? ui.dateInput.shouldUpdateDateOnMonthYearChange;
 	const granularity = granularityProp ?? ui.dateInput.granularity;
 	const autoFixYear = autoFixYearProp ?? ui.dateInput.autoFixYear;
-	const fireBlurOnChange = fireBlurOnChangeProp ?? ui.dateInput.fireBlurOnChange;
 	const timeZone = ui.dateInput.timeZone;
 	let effectiveTimeZone = getLocalTimeZone();
 	if (timeZone !== "clientLocal") effectiveTimeZone = timeZone;
@@ -78,7 +76,6 @@ var DatePickerBase = (props) => {
 	const handleBlur = (val) => {
 		onBlur?.({ target: { value: val } });
 	};
-	const { callback: debouncedBlur } = useDebounceCallback(handleBlur, { delay: 500 });
 	const normalizedValue = value ?? null;
 	const dialogState = useDatePickerState({
 		...rest,
@@ -99,7 +96,6 @@ var DatePickerBase = (props) => {
 			}
 			onChange?.(normalizedValue_0);
 			dialogState.setValue(normalizedValue_0);
-			if (fireBlurOnChange) debouncedBlur(normalizedValue_0);
 			if (normalizedValue_0) {
 				calendarState.setFocusedDate(normalizedValue_0);
 				return;
@@ -139,7 +135,6 @@ var DatePickerBase = (props) => {
 		const newValue = dialogState.value ? normalizeByGranularity(dialogState.value) : dialogState.value;
 		state.setValue(newValue);
 		state.toggle();
-		if (fireBlurOnChange) handleBlur(newValue);
 	};
 	const onMonthYearChange = (selectedDate) => {
 		if (!(shouldUpdateDateOnMonthYearChange || granularity !== "day")) return;
@@ -161,7 +156,6 @@ var DatePickerBase = (props) => {
 	const onInputClear = () => {
 		onChange?.(null);
 		dialogState.setValue(null);
-		if (fireBlurOnChange) handleBlur(null);
 	};
 	const syncDialogFromControlledValue = () => {
 		dialogState.setValue(state.value);
@@ -233,6 +227,7 @@ var DatePickerBase = (props) => {
 				variant,
 				size,
 				isClearable,
+				isClearableIfDisabled,
 				headerProps,
 				todayIcon,
 				todayIconButtonSize,
@@ -244,7 +239,6 @@ var DatePickerBase = (props) => {
 				dateGranularity: granularity,
 				format,
 				timeZone: effectiveTimeZone,
-				fireBlurOnChange,
 				onClear: onInputClear
 			}), (!disableDropdown || disableManualEntry) && state.isOpen && /* @__PURE__ */ jsx(DateTimeDialog, {
 				footer: /* @__PURE__ */ jsx(DateTimeDialogFooter, {
@@ -347,6 +341,7 @@ var DatePickerInner = ({ fullIso = true, granularity = "day", minValue, maxValue
 		});
 		return /* @__PURE__ */ jsx(InputFrame, {
 			...props,
+			onClear: () => props.onChange?.(null),
 			isDisabled,
 			className: clsx("group relative inline-flex w-full flex-col text-left", props.className),
 			inputClassName: clsx("min-w-input-width-min-width", props.inputClassName),
@@ -391,20 +386,20 @@ var DatePickerInner = ({ fullIso = true, granularity = "day", minValue, maxValue
 	});
 };
 var DatePicker = ({ fullIso = true, granularity = "day", minValue, maxValue, renderStaticInput, ...props }) => {
-	if ("formControl" in props && props.formControl) {
-		const { 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(DatePickerInner, {
+	if ("field" in props && props.field) {
+		const { 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(DatePickerInner, {
 				...innerProps,
-				ref: mergeRefs(ref, field.ref),
-				value: field.value ?? null,
-				onChange: field.onChange,
-				onBlur: field.onBlur,
+				ref: mergeRefs(ref, field_0.ref),
+				value: field_0.value ?? null,
+				onChange: (value) => field_0.onChange(value ?? null),
+				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,
 				fullIso,

package/dist/components/inputs/DateTime/DateRangePicker/DateRangePicker.d.ts

@@ -1,7 +1,7 @@
 import { CalendarDate } from '@internationalized/date';
 import { FocusEvent, Ref } from 'react';
 import { DateValue } from 'react-aria';
-import { FieldValues } from 'react-hook-form';
+import { FieldValues } from '../../shared/form.binding';
 import { DateRangePickerStateOptions } from 'react-stately';
 import { DatePickerInputHandle } from '../shared/DatePickerInput';
 import { DatePickerTodayIcon, DatePickerTodayIconButtonComponent, DatePickerTodayIconButtonSize, DatePickerTodayIconPlacement } from '../shared/datePicker.types';
@@ -12,6 +12,7 @@ interface DateRangePickerBaseProps extends FormFieldProps, InputVariantProps, Om
     ref?: Ref<DatePickerInputHandle & HTMLDivElement>;
     disableDropdown?: boolean;
     isClearable?: boolean;
+    isClearableIfDisabled?: boolean;
     hideSidebar?: boolean;
     className?: string;
     todayIcon?: DatePickerTodayIcon;
@@ -24,7 +25,6 @@ interface DateRangePickerBaseProps extends FormFieldProps, InputVariantProps, Om
     placeholder?: string;
     inputClassName?: string;
     onBlur?: (e: FocusEvent<HTMLInputElement>) => void;
-    fireBlurOnChange?: boolean;
     allowPartialRange?: boolean;
 }
 export interface DateRangePickerProps extends Omit<DateRangePickerBaseProps, "value" | "onChange" | "minValue" | "maxValue"> {