@povio/ui 2.3.0-rc.3 → 2.3.0-rc.33

package/dist/components/inputs/DateTime/DateRangePicker/DateRangePicker.js

@@ -15,6 +15,7 @@ import { InputFrame } from "../../Skeleton/InputFrame.js";
 import { useStaticInputHandoff } from "../../shared/useStaticInputHandoff.js";
 import { useDebounceCallback } from "../../../../hooks/useDebounceCallback.js";
 import { RangeCalendar } from "../shared/RangeCalendar.js";
+import { c } from "react/compiler-runtime";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { clsx } from "clsx";
 import { useCallback, useImperativeHandle, useMemo, useRef, useState } from "react";
@@ -22,15 +23,16 @@ import { Button } from "react-aria-components";
 import { useDateRangePicker, useLocale as useLocale$1 } from "react-aria";
 import { mergeRefs } from "@react-aria/utils";
 import { useTranslation } from "react-i18next";
-import { Controller, useWatch } from "react-hook-form";
-import { createCalendar, endOfMonth, endOfWeek, endOfYear, getLocalTimeZone, startOfMonth, startOfWeek, startOfYear, toCalendarDate, today } from "@internationalized/date";
+import { Controller } from "react-hook-form";
+import { createCalendar, endOfMonth, endOfWeek, endOfYear, startOfMonth, startOfWeek, startOfYear, toCalendarDate, today } from "@internationalized/date";
 import { DateTime } from "luxon";
 import { useDateRangePickerState, useRangeCalendarState } from "react-stately";
 //#region src/components/inputs/DateTime/DateRangePicker/DateRangePicker.tsx
+var DATE_PICKER_TIME_ZONE = "UTC";
 var DateRangePickerBase = (props) => {
 	const ui = UIConfig.useConfig();
 	const { t } = useTranslation();
-	const { ref, label, tooltipText, helperText, isRequired, rightContent, isDisabled, isDirty, headerClassName, errorClassName, isHeaderHidden, error, onChange, onBlur, value, disableDropdown, className, hideSidebar, placeholder, inputClassName, hideLabel: hideLabelProp, variant: variantProp, as: asProp, size: sizeProp, isClearable: isClearableProp, todayIcon: todayIconProp, todayIconButtonSize: todayIconButtonSizeProp, todayIconPlacement: todayIconPlacementProp, shouldForceLeadingZeros: shouldForceLeadingZerosProp, disableManualEntry: disableManualEntryProp, autoFixYear: autoFixYearProp, ...rest } = props;
+	const { ref, label, tooltipText, helperText, isRequired, rightContent, isDisabled, isDirty, headerClassName, errorClassName, isHeaderHidden, error, onChange, onBlur, value, disableDropdown, className, hideSidebar, placeholder, inputClassName, hideLabel: hideLabelProp, variant: variantProp, as: asProp, size: sizeProp, isClearable: isClearableProp, todayIcon: todayIconProp, todayIconButtonSize: todayIconButtonSizeProp, todayIconPlacement: todayIconPlacementProp, shouldForceLeadingZeros: shouldForceLeadingZerosProp, disableManualEntry: disableManualEntryProp, autoFixYear: autoFixYearProp, fireBlurOnChange: fireBlurOnChangeProp, ...rest } = props;
 	const hideLabel = hideLabelProp ?? ui.input.hideLabel;
 	const variant = variantProp ?? ui.input.variant;
 	const as = asProp ?? ui.input.as;
@@ -42,26 +44,28 @@ var DateRangePickerBase = (props) => {
 	const shouldForceLeadingZeros = shouldForceLeadingZerosProp ?? ui.dateInput.shouldForceLeadingZeros;
 	const disableManualEntry = disableManualEntryProp ?? ui.dateInput.disableManualEntry;
 	const autoFixYear = autoFixYearProp ?? ui.dateInput.autoFixYear;
+	const fireBlurOnChange = fireBlurOnChangeProp ?? ui.dateInput.fireBlurOnChange;
 	const [validationRangeError, setValidationRangeError] = useState();
 	const datePickerInputRef = useRef(null);
 	const dateRangePickerRef = useMemo(() => ({ get current() {
 		return datePickerInputRef.current?.getContainer?.() || null;
 	} }), []);
+	const normalizedValue = value ?? null;
 	const dialogState = useDateRangePickerState({
 		...rest,
-		value,
+		value: normalizedValue,
 		shouldCloseOnSelect: false,
 		shouldForceLeadingZeros
 	});
 	const state = useDateRangePickerState({
 		...rest,
 		shouldForceLeadingZeros,
-		value,
+		value: normalizedValue,
 		onChange: (newValue) => {
 			if (isValidRange(newValue)) return;
 			onChange?.(newValue);
 			handleCalendarStatesChange(newValue);
-			debouncedBlur(newValue);
+			if (fireBlurOnChange) debouncedBlur(newValue);
 		},
 		shouldCloseOnSelect: false
 	});
@@ -76,11 +80,14 @@ var DateRangePickerBase = (props) => {
 		shouldForceLeadingZeros
 	}, dialogState, dateRangePickerRef);
 	const { locale } = useLocale$1();
-	useImperativeHandle(ref, () => ({ clear: () => {
-		datePickerInputRef.current?.clear();
-	} }));
-	const handleBlur = (newValue) => {
-		onBlur?.({ target: { value: newValue } });
+	useImperativeHandle(ref, () => ({
+		clear: () => {
+			datePickerInputRef.current?.clear();
+		},
+		getContainer: () => datePickerInputRef.current?.getContainer?.() ?? null
+	}));
+	const handleBlur = (newValue_0) => {
+		onBlur?.({ target: { value: newValue_0 } });
 	};
 	const { callback: debouncedBlur } = useDebounceCallback(handleBlur, { delay: 500 });
 	const formFieldProps = {
@@ -111,7 +118,7 @@ var DateRangePickerBase = (props) => {
 		createCalendar,
 		pageBehavior: "single",
 		visibleDuration: { months: 1 },
-		defaultFocusedValue: today(getLocalTimeZone()).add({ months: 1 }),
+		defaultFocusedValue: today(DATE_PICKER_TIME_ZONE).add({ months: 1 }),
 		minValue: void 0,
 		maxValue: void 0
 	});
@@ -133,10 +140,10 @@ var DateRangePickerBase = (props) => {
 		className: headerClassName,
 		labelProps
 	};
-	const isValidRange = useCallback((newValue) => {
-		if (newValue?.start && newValue?.end) {
-			const startDate = newValue.start;
-			if (newValue.end.compare(startDate) < 0) {
+	const isValidRange = useCallback((newValue_1) => {
+		if (newValue_1?.start && newValue_1?.end) {
+			const startDate = newValue_1.start;
+			if (newValue_1.end.compare(startDate) < 0) {
 				setValidationRangeError(t(($) => $.ui.datePicker.errors.endDateBeforeStart, { ns: "ui" }));
 				return true;
 			}
@@ -144,20 +151,20 @@ var DateRangePickerBase = (props) => {
 		} else setValidationRangeError(void 0);
 		return false;
 	}, [t]);
-	const handleCalendarStatesChange = (newValue) => {
-		if (newValue) {
-			if (isValidRange(newValue)) return;
-			dialogState.setValue(newValue);
-			const startDate = newValue.start;
-			const endDate = newValue.end;
-			leftCalendarState.setFocusedDate(startDate);
-			if (startDate.year === endDate.year && startDate.month === endDate.month) rightCalendarState.setFocusedDate(startDate.add({ months: 1 }));
-			else rightCalendarState.setFocusedDate(endDate);
-			leftCalendarState.setValue(newValue);
-			rightCalendarState.setValue(newValue);
+	const handleCalendarStatesChange = (newValue_2) => {
+		if (newValue_2) {
+			if (isValidRange(newValue_2)) return;
+			dialogState.setValue(newValue_2);
+			const startDate_0 = newValue_2.start;
+			const endDate_0 = newValue_2.end;
+			leftCalendarState.setFocusedDate(startDate_0);
+			if (startDate_0.year === endDate_0.year && startDate_0.month === endDate_0.month) rightCalendarState.setFocusedDate(startDate_0.add({ months: 1 }));
+			else rightCalendarState.setFocusedDate(endDate_0);
+			leftCalendarState.setValue(newValue_2);
+			rightCalendarState.setValue(newValue_2);
 			setRangeSelection({
-				start: newValue.start,
-				end: newValue.end,
+				start: newValue_2.start,
+				end: newValue_2.end,
 				isSelecting: false
 			});
 			setHoverDate(null);
@@ -181,27 +188,27 @@ var DateRangePickerBase = (props) => {
 			setHoverDate(date);
 		});
 	}, []);
-	const handleDateHover = useCallback((date) => {
-		if (rangeSelection.isSelecting && rangeSelection.start) throttledSetHoverDate(date);
+	const handleDateHover = useCallback((date_0) => {
+		if (rangeSelection.isSelecting && rangeSelection.start) throttledSetHoverDate(date_0);
 	}, [
 		rangeSelection.isSelecting,
 		rangeSelection.start,
 		throttledSetHoverDate
 	]);
-	const handleDateSelection = useCallback((date, calendarSide) => {
+	const handleDateSelection = useCallback((date_1, calendarSide) => {
 		if (calendarSide) {
 			const currentVisibleMonth = (calendarSide === "left" ? leftCalendarState : rightCalendarState).visibleRange.start;
-			if (date.month !== currentVisibleMonth.month || date.year !== currentVisibleMonth.year) if (calendarSide === "left") {
-				leftCalendarState.setFocusedDate(date);
-				rightCalendarState.setFocusedDate(date.add({ months: 1 }));
+			if (date_1.month !== currentVisibleMonth.month || date_1.year !== currentVisibleMonth.year) if (calendarSide === "left") {
+				leftCalendarState.setFocusedDate(date_1);
+				rightCalendarState.setFocusedDate(date_1.add({ months: 1 }));
 			} else {
-				rightCalendarState.setFocusedDate(date);
-				leftCalendarState.setFocusedDate(date.subtract({ months: 1 }));
+				rightCalendarState.setFocusedDate(date_1);
+				leftCalendarState.setFocusedDate(date_1.subtract({ months: 1 }));
 			}
 		}
 		if (!rangeSelection.isSelecting || !rangeSelection.start) {
 			setRangeSelection({
-				start: date,
+				start: date_1,
 				end: null,
 				isSelecting: true
 			});
@@ -210,7 +217,7 @@ var DateRangePickerBase = (props) => {
 			rightCalendarState.setValue(null);
 		} else {
 			const { start } = rangeSelection;
-			const end = date;
+			const end = date_1;
 			const finalStart = start.compare(end) <= 0 ? start : end;
 			const finalEnd = start.compare(end) <= 0 ? end : start;
 			const newRange = {
@@ -234,16 +241,16 @@ var DateRangePickerBase = (props) => {
 		rightCalendarState,
 		dialogState
 	]);
-	const handleKeyboardNavigation = useCallback((event, date, calendarSide) => {
-		const currentState = calendarSide === "left" ? leftCalendarState : rightCalendarState;
-		const otherState = calendarSide === "left" ? rightCalendarState : leftCalendarState;
+	const handleKeyboardNavigation = useCallback((event, date_2, calendarSide_0) => {
+		const currentState_0 = calendarSide_0 === "left" ? leftCalendarState : rightCalendarState;
+		const otherState = calendarSide_0 === "left" ? rightCalendarState : leftCalendarState;
 		let shouldPreventDefault = false;
 		switch (event.key) {
 			case "ArrowRight": {
-				const nextDate = date.add({ days: 1 });
-				const currentMonth = currentState.visibleRange.start;
-				const otherMonth = otherState.visibleRange.start;
-				if (calendarSide === "left" && nextDate.month !== currentMonth.month) if (nextDate.year === otherMonth.year && nextDate.month === otherMonth.month) {
+				const nextDate = date_2.add({ days: 1 });
+				const currentMonth_2 = currentState_0.visibleRange.start;
+				const otherMonth_2 = otherState.visibleRange.start;
+				if (calendarSide_0 === "left" && nextDate.month !== currentMonth_2.month) if (nextDate.year === otherMonth_2.year && nextDate.month === otherMonth_2.month) {
 					otherState.setFocusedDate(nextDate);
 					shouldPreventDefault = true;
 				} else {
@@ -253,10 +260,10 @@ var DateRangePickerBase = (props) => {
 				break;
 			}
 			case "ArrowLeft": {
-				const prevDate = date.subtract({ days: 1 });
-				const currentMonth = currentState.visibleRange.start;
-				const otherMonth = otherState.visibleRange.start;
-				if (calendarSide === "right" && prevDate.month !== currentMonth.month) if (prevDate.year === otherMonth.year && prevDate.month === otherMonth.month) {
+				const prevDate = date_2.subtract({ days: 1 });
+				const currentMonth_1 = currentState_0.visibleRange.start;
+				const otherMonth_1 = otherState.visibleRange.start;
+				if (calendarSide_0 === "right" && prevDate.month !== currentMonth_1.month) if (prevDate.year === otherMonth_1.year && prevDate.month === otherMonth_1.month) {
 					otherState.setFocusedDate(prevDate);
 					shouldPreventDefault = true;
 				} else {
@@ -266,10 +273,10 @@ var DateRangePickerBase = (props) => {
 				break;
 			}
 			case "ArrowDown": {
-				const nextWeekDate = date.add({ weeks: 1 });
-				const currentMonth = currentState.visibleRange.start;
-				const otherMonth = otherState.visibleRange.start;
-				if (calendarSide === "left" && nextWeekDate.month !== currentMonth.month) if (nextWeekDate.year === otherMonth.year && nextWeekDate.month === otherMonth.month) {
+				const nextWeekDate = date_2.add({ weeks: 1 });
+				const currentMonth_0 = currentState_0.visibleRange.start;
+				const otherMonth_0 = otherState.visibleRange.start;
+				if (calendarSide_0 === "left" && nextWeekDate.month !== currentMonth_0.month) if (nextWeekDate.year === otherMonth_0.year && nextWeekDate.month === otherMonth_0.month) {
 					otherState.setFocusedDate(nextWeekDate);
 					shouldPreventDefault = true;
 				} else {
@@ -279,10 +286,10 @@ var DateRangePickerBase = (props) => {
 				break;
 			}
 			case "ArrowUp": {
-				const prevWeekDate = date.subtract({ weeks: 1 });
-				const currentMonth = currentState.visibleRange.start;
+				const prevWeekDate = date_2.subtract({ weeks: 1 });
+				const currentMonth = currentState_0.visibleRange.start;
 				const otherMonth = otherState.visibleRange.start;
-				if (calendarSide === "right" && prevWeekDate.month !== currentMonth.month) if (prevWeekDate.year === otherMonth.year && prevWeekDate.month === otherMonth.month) {
+				if (calendarSide_0 === "right" && prevWeekDate.month !== currentMonth.month) if (prevWeekDate.year === otherMonth.year && prevWeekDate.month === otherMonth.month) {
 					otherState.setFocusedDate(prevWeekDate);
 					shouldPreventDefault = true;
 				} else {
@@ -293,7 +300,7 @@ var DateRangePickerBase = (props) => {
 			}
 			case "Enter":
 			case " ":
-				handleDateSelection(date);
+				handleDateSelection(date_2);
 				shouldPreventDefault = true;
 				break;
 			case "Escape":
@@ -317,14 +324,14 @@ var DateRangePickerBase = (props) => {
 		rightCalendarState,
 		handleDateSelection
 	]);
-	const syncCalendarStates = useCallback((newValue) => {
-		if (isValidRange(newValue)) return;
-		leftCalendarState.setValue(newValue);
-		rightCalendarState.setValue(newValue);
-		dialogState.setValue(newValue);
-		if (newValue) setRangeSelection({
-			start: newValue.start,
-			end: newValue.end,
+	const syncCalendarStates = useCallback((newValue_3) => {
+		if (isValidRange(newValue_3)) return;
+		leftCalendarState.setValue(newValue_3);
+		rightCalendarState.setValue(newValue_3);
+		dialogState.setValue(newValue_3);
+		if (newValue_3) setRangeSelection({
+			start: newValue_3.start,
+			end: newValue_3.end,
 			isSelecting: false
 		});
 		else setRangeSelection({
@@ -346,12 +353,12 @@ var DateRangePickerBase = (props) => {
 		} : dialogState.value;
 		if (valueToApply) {
 			state.setValue(valueToApply);
-			handleBlur(valueToApply);
+			if (fireBlurOnChange) handleBlur(valueToApply);
 		}
 		state.toggle();
 	};
 	const onTodayPress = () => {
-		const todayDate = today(getLocalTimeZone());
+		const todayDate = today(DATE_PICKER_TIME_ZONE);
 		leftCalendarState.setFocusedDate(todayDate);
 		rightCalendarState.setFocusedDate(todayDate.add({ months: 1 }));
 		syncCalendarStates({
@@ -359,6 +366,12 @@ var DateRangePickerBase = (props) => {
 			end: todayDate
 		});
 	};
+	const onInputClear = () => {
+		onChange?.(null);
+		state.setValue(null);
+		handleCalendarStatesChange(null);
+		if (fireBlurOnChange) handleBlur(null);
+	};
 	const onOpenChange = (isOpen) => {
 		state.toggle();
 		if (!isOpen) {
@@ -366,11 +379,11 @@ var DateRangePickerBase = (props) => {
 				dialogState.setValue(state.value);
 				leftCalendarState.setValue(state.value);
 				rightCalendarState.setValue(state.value);
-				const startDate = state.value.start || today(getLocalTimeZone());
-				const endDate = state.value.end || today(getLocalTimeZone()).add({ months: 1 });
-				leftCalendarState.setFocusedDate(startDate);
-				if (startDate.year === endDate.year && startDate.month === endDate.month) rightCalendarState.setFocusedDate(startDate.add({ months: 1 }));
-				else rightCalendarState.setFocusedDate(endDate);
+				const startDate_1 = state.value.start || today(DATE_PICKER_TIME_ZONE);
+				const endDate_1 = state.value.end || today(DATE_PICKER_TIME_ZONE).add({ months: 1 });
+				leftCalendarState.setFocusedDate(startDate_1);
+				if (startDate_1.year === endDate_1.year && startDate_1.month === endDate_1.month) rightCalendarState.setFocusedDate(startDate_1.add({ months: 1 }));
+				else rightCalendarState.setFocusedDate(endDate_1);
 				setRangeSelection({
 					start: state.value.start,
 					end: state.value.end,
@@ -379,87 +392,87 @@ var DateRangePickerBase = (props) => {
 			}
 		}
 	};
-	const todayDate = today(getLocalTimeZone());
+	const todayDate_0 = today(DATE_PICKER_TIME_ZONE);
 	const getThisWeekRange = () => {
 		return {
-			start: startOfWeek(todayDate, locale),
-			end: endOfWeek(todayDate, locale)
+			start: startOfWeek(todayDate_0, locale),
+			end: endOfWeek(todayDate_0, locale)
 		};
 	};
 	const getLastWeekRange = () => {
-		const thisWeekStart = startOfWeek(todayDate, locale);
+		const thisWeekStart = startOfWeek(todayDate_0, locale);
 		return {
 			start: thisWeekStart.subtract({ weeks: 1 }),
 			end: thisWeekStart.subtract({ days: 1 })
 		};
 	};
 	const getThisAndLastWeekRange = () => {
-		const thisWeekEnd = endOfWeek(todayDate, locale);
+		const thisWeekEnd = endOfWeek(todayDate_0, locale);
 		return {
-			start: startOfWeek(todayDate, locale).subtract({ weeks: 1 }),
+			start: startOfWeek(todayDate_0, locale).subtract({ weeks: 1 }),
 			end: thisWeekEnd
 		};
 	};
 	const getThisMonthRange = () => {
 		return {
-			start: startOfMonth(todayDate),
-			end: endOfMonth(todayDate)
+			start: startOfMonth(todayDate_0),
+			end: endOfMonth(todayDate_0)
 		};
 	};
 	const getThisAndLastMonthRange = () => {
-		const thisMonthEnd = endOfMonth(todayDate);
+		const thisMonthEnd = endOfMonth(todayDate_0);
 		return {
-			start: startOfMonth(todayDate).subtract({ months: 1 }),
+			start: startOfMonth(todayDate_0).subtract({ months: 1 }),
 			end: thisMonthEnd
 		};
 	};
 	const presets = [
 		{
-			label: t(($) => $.ui.datePicker.presets.thisWeek, { ns: "ui" }),
+			label: t(($_0) => $_0.ui.datePicker.presets.thisWeek, { ns: "ui" }),
 			getValue: getThisWeekRange
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.lastWeek, { ns: "ui" }),
+			label: t(($_1) => $_1.ui.datePicker.presets.lastWeek, { ns: "ui" }),
 			getValue: getLastWeekRange
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.thisAndLastWeek, { ns: "ui" }),
+			label: t(($_2) => $_2.ui.datePicker.presets.thisAndLastWeek, { ns: "ui" }),
 			getValue: getThisAndLastWeekRange
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.thisMonth, { ns: "ui" }),
+			label: t(($_3) => $_3.ui.datePicker.presets.thisMonth, { ns: "ui" }),
 			getValue: getThisMonthRange
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.thisAndLastMonth, { ns: "ui" }),
+			label: t(($_4) => $_4.ui.datePicker.presets.thisAndLastMonth, { ns: "ui" }),
 			getValue: getThisAndLastMonthRange
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.thisYear, { ns: "ui" }),
+			label: t(($_5) => $_5.ui.datePicker.presets.thisYear, { ns: "ui" }),
 			getValue: () => ({
-				start: startOfYear(todayDate),
-				end: todayDate
+				start: startOfYear(todayDate_0),
+				end: todayDate_0
 			})
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.lastYear, { ns: "ui" }),
+			label: t(($_6) => $_6.ui.datePicker.presets.lastYear, { ns: "ui" }),
 			getValue: () => ({
-				start: startOfYear(todayDate.subtract({ years: 1 })),
-				end: endOfYear(todayDate.subtract({ years: 1 }))
+				start: startOfYear(todayDate_0.subtract({ years: 1 })),
+				end: endOfYear(todayDate_0.subtract({ years: 1 }))
 			})
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.thisAndLastYear, { ns: "ui" }),
+			label: t(($_7) => $_7.ui.datePicker.presets.thisAndLastYear, { ns: "ui" }),
 			getValue: () => ({
-				start: startOfYear(todayDate.subtract({ years: 1 })),
-				end: todayDate
+				start: startOfYear(todayDate_0.subtract({ years: 1 })),
+				end: todayDate_0
 			})
 		},
 		{
-			label: t(($) => $.ui.datePicker.presets.soFar, { ns: "ui" }),
+			label: t(($_8) => $_8.ui.datePicker.presets.soFar, { ns: "ui" }),
 			getValue: () => ({
-				start: startOfYear(todayDate),
-				end: todayDate
+				start: startOfYear(todayDate_0),
+				end: todayDate_0
 			})
 		}
 	];
@@ -467,12 +480,12 @@ var DateRangePickerBase = (props) => {
 		setActivePreset(preset.label);
 		const presetValue = preset.getValue();
 		syncCalendarStates(presetValue);
-		const startDate = presetValue.start;
-		leftCalendarState.setFocusedDate(startDate);
-		const endDate = presetValue.end;
-		if ((endDate.year - startDate.year) * 12 + (endDate.month - startDate.month) > 2) rightCalendarState.setFocusedDate(endDate);
+		const startDate_2 = presetValue.start;
+		leftCalendarState.setFocusedDate(startDate_2);
+		const endDate_2 = presetValue.end;
+		if ((endDate_2.year - startDate_2.year) * 12 + (endDate_2.month - startDate_2.month) > 2) rightCalendarState.setFocusedDate(endDate_2);
 		else {
-			const rightCalendarMonth = startDate.add({ months: 1 });
+			const rightCalendarMonth = startDate_2.add({ months: 1 });
 			rightCalendarState.setFocusedDate(rightCalendarMonth);
 		}
 	};
@@ -492,6 +505,10 @@ var DateRangePickerBase = (props) => {
 				groupProps,
 				fieldProps: startFieldProps,
 				endFieldProps,
+				fieldValue: normalizedValue?.start ?? null,
+				endFieldValue: normalizedValue?.end ?? null,
+				isValueControlled: true,
+				hasValue: normalizedValue?.start != null || normalizedValue?.end != null,
 				buttonProps,
 				isDisabled,
 				isInvalid: !!error,
@@ -508,22 +525,25 @@ var DateRangePickerBase = (props) => {
 				autoFixYear,
 				placeholder,
 				className: inputClassName,
-				onOpenDropdown: () => state.toggle()
+				onOpenDropdown: () => state.toggle(),
+				timeZone: DATE_PICKER_TIME_ZONE,
+				fireBlurOnChange,
+				onClear: onInputClear
 			}), /* @__PURE__ */ jsx(DateTimeDialog, {
 				hideSidebar,
 				sidebar: /* @__PURE__ */ jsx("div", {
 					className: "flex w-full flex-row overflow-auto border-elevation-outline-default-1 border-solid [-ms-overflow-style:none] [scrollbar-width:none] md:w-[156px] md:flex-col md:border-r [&::-webkit-scrollbar]:hidden",
-					children: presets.map((preset) => /* @__PURE__ */ jsx(Button, {
-						onClick: () => selectPreset(preset),
-						className: clsx("w-full px-2 py-1 text-left md:px-list-side-item-left md:py-list-height-item", activePreset !== preset.label && "text-interactive-text-secondary-idle hover:text-interactive-text-secondary-hover", activePreset === preset.label && "bg-interactive-contained-primary-idle text-interactive-text-secondary-idle-inverted"),
+					children: presets.map((preset_0) => /* @__PURE__ */ jsx(Button, {
+						onClick: () => selectPreset(preset_0),
+						className: clsx("w-full px-2 py-1 text-left md:px-list-side-item-left md:py-list-height-item", activePreset !== preset_0.label && "text-interactive-text-secondary-idle hover:text-interactive-text-secondary-hover", activePreset === preset_0.label && "bg-interactive-contained-primary-idle text-interactive-text-secondary-idle-inverted"),
 						children: /* @__PURE__ */ jsx(Typography, {
 							size: "label-2",
 							sizeMobile: "label-3",
 							as: "span",
 							className: "whitespace-nowrap",
-							children: preset.label
+							children: preset_0.label
 						})
-					}, preset.label))
+					}, preset_0.label))
 				}),
 				footer: /* @__PURE__ */ jsx(DateTimeDialogFooter, {
 					isDisabled,
@@ -558,7 +578,10 @@ var DateRangePickerBase = (props) => {
 		})
 	});
 };
-var DateRangePicker = ({ fullIso = true, minValue, maxValue, renderStaticInput, ...props }) => {
+var DateRangePickerInner = (t0) => {
+	const $ = c(25);
+	const { fullIso: t1, minValue, maxValue, renderStaticInput, isFormControlDisabled, ...props } = t0;
+	const fullIso = t1 === void 0 ? true : t1;
 	const ui = UIConfig.useConfig();
 	const datePickerInputContentRowCva = UIStyle.useCva("datePickerInput.contentRowCva", datePickerInputContentRow);
 	const { locale } = useLocale$1();
@@ -569,59 +592,90 @@ var DateRangePicker = ({ fullIso = true, minValue, maxValue, renderStaticInput,
 		inputRef,
 		renderInput,
 		setRenderInput,
-		getFocusTarget: (input) => {
-			return (input.getContainer?.() ?? input).querySelector("input, button, [tabindex]:not([tabindex='-1'])");
-		}
+		getFocusTarget: _temp
 	});
-	const watchedValue = "formControl" in props && props.formControl ? useWatch({
-		control: props.formControl.control,
-		name: props.formControl.name
-	}) : props.value;
-	let isFormControlDisabled = false;
-	if ("formControl" in props && props.formControl) isFormControlDisabled = !!props.formControl.control._options?.disabled;
-	const rawValue = watchedValue ?? props.value ?? null;
-	const formatDateRange = (range) => {
-		if (!range?.start || !range?.end) return null;
-		if (fullIso) return {
-			start: DateTimeUtils.fromCalendarDateToUTCISO(range.start),
-			end: DateTimeUtils.fromCalendarDateToUTCISO(range.end, { endOfDay: true })
+	const normalizedValue = props.value ?? null;
+	let t2;
+	if ($[0] !== fullIso) {
+		t2 = (range) => {
+			if (!range?.start || !range?.end) return null;
+			if (fullIso) return {
+				start: DateTimeUtils.fromCalendarDateToUTCISO(range.start),
+				end: DateTimeUtils.fromCalendarDateToUTCISO(range.end, { endOfDay: true })
+			};
+			const startDate = DateTimeUtils.fromDateValueToLocal(range.start, "UTC");
+			const endDate = DateTimeUtils.fromDateValueToLocal(range.end, "UTC");
+			return {
+				start: DateTime.fromJSDate(startDate, { zone: "UTC" }).toISODate(),
+				end: DateTime.fromJSDate(endDate, { zone: "UTC" }).toISODate()
+			};
 		};
-		const startDate = DateTimeUtils.fromDateValueToLocal(range.start);
-		const endDate = DateTimeUtils.fromDateValueToLocal(range.end);
-		return {
-			start: DateTime.fromJSDate(startDate).toISODate(),
-			end: DateTime.fromJSDate(endDate).toISODate()
+		$[0] = fullIso;
+		$[1] = t2;
+	} else t2 = $[1];
+	const formatDateRange = t2;
+	let t3;
+	if ($[2] !== fullIso) {
+		t3 = (formattedRange) => {
+			if (!formattedRange?.start || !formattedRange?.end) return formattedRange;
+			if (fullIso) return {
+				start: DateTimeUtils.fromUTCISOToCalendarDate(formattedRange.start),
+				end: DateTimeUtils.fromUTCISOToCalendarDate(formattedRange.end)
+			};
+			const startDate_0 = DateTime.fromISO(formattedRange.start, { zone: "UTC" }).toJSDate();
+			const endDate_0 = DateTime.fromISO(formattedRange.end, { zone: "UTC" }).toJSDate();
+			const startZonedDateTime = DateTimeUtils.fromLocalToZonedDateTime(startDate_0, "UTC");
+			const endZonedDateTime = DateTimeUtils.fromLocalToZonedDateTime(endDate_0, "UTC");
+			return {
+				start: toCalendarDate(startZonedDateTime),
+				end: toCalendarDate(endZonedDateTime)
+			};
 		};
-	};
-	const parseDateRange = (formattedRange) => {
-		if (!formattedRange?.start || !formattedRange?.end) return formattedRange;
-		if (fullIso) return {
-			start: DateTimeUtils.fromUTCISOToCalendarDate(formattedRange.start),
-			end: DateTimeUtils.fromUTCISOToCalendarDate(formattedRange.end)
+		$[2] = fullIso;
+		$[3] = t3;
+	} else t3 = $[3];
+	const parseDateRange = t3;
+	let t4;
+	if ($[4] !== fullIso) {
+		t4 = (formattedDate) => {
+			if (formattedDate == null) return formattedDate;
+			if (fullIso) return DateTimeUtils.fromUTCISOToCalendarDate(formattedDate);
+			const date = DateTime.fromISO(formattedDate, { zone: "UTC" }).toJSDate();
+			return toCalendarDate(DateTimeUtils.fromLocalToZonedDateTime(date, "UTC"));
 		};
-		const startDate = DateTime.fromISO(formattedRange.start).toJSDate();
-		const endDate = DateTime.fromISO(formattedRange.end).toJSDate();
-		const startZonedDateTime = DateTimeUtils.fromLocalToZonedDateTime(startDate);
-		const endZonedDateTime = DateTimeUtils.fromLocalToZonedDateTime(endDate);
-		return {
-			start: toCalendarDate(startZonedDateTime),
-			end: toCalendarDate(endZonedDateTime)
+		$[4] = fullIso;
+		$[5] = t4;
+	} else t4 = $[5];
+	const parseCalendarDate = t4;
+	let t5;
+	if ($[6] !== minValue || $[7] !== parseCalendarDate) {
+		t5 = typeof minValue === "string" ? parseCalendarDate(minValue) : minValue;
+		$[6] = minValue;
+		$[7] = parseCalendarDate;
+		$[8] = t5;
+	} else t5 = $[8];
+	let t6;
+	if ($[9] !== maxValue || $[10] !== parseCalendarDate) {
+		t6 = typeof maxValue === "string" ? parseCalendarDate(maxValue) : maxValue;
+		$[9] = maxValue;
+		$[10] = parseCalendarDate;
+		$[11] = t6;
+	} else t6 = $[11];
+	let t7;
+	if ($[12] !== t5 || $[13] !== t6) {
+		t7 = {
+			minValue: t5,
+			maxValue: t6
 		};
-	};
-	const parseCalendarDate = (formattedDate) => {
-		if (formattedDate == null) return formattedDate;
-		if (fullIso) return DateTimeUtils.fromUTCISOToCalendarDate(formattedDate);
-		const date = DateTime.fromISO(formattedDate).toJSDate();
-		return toCalendarDate(DateTimeUtils.fromLocalToZonedDateTime(date));
-	};
-	const dateLimits = {
-		minValue: typeof minValue === "string" ? parseCalendarDate(minValue) : minValue,
-		maxValue: typeof maxValue === "string" ? parseCalendarDate(maxValue) : maxValue
-	};
+		$[12] = t5;
+		$[13] = t6;
+		$[14] = t7;
+	} else t7 = $[14];
+	const dateLimits = t7;
 	if (!renderInput) {
-		const startDateValue = parseCalendarDate(rawValue?.start ?? null);
-		const endDateValue = parseCalendarDate(rawValue?.end ?? null);
-		const hasProvidedRangeValue = !!(rawValue?.start || rawValue?.end);
+		const startDateValue = parseCalendarDate(normalizedValue?.start ?? null);
+		const endDateValue = parseCalendarDate(normalizedValue?.end ?? null);
+		const hasProvidedRangeValue = !!(normalizedValue?.start || normalizedValue?.end);
 		const as = props.as ?? ui.input.as;
 		const size = props.size ?? ui.input.size;
 		const isDisabled = isFormControlDisabled || !!props.isDisabled;
@@ -661,36 +715,148 @@ var DateRangePicker = ({ fullIso = true, minValue, maxValue, renderStaticInput,
 			onStaticInteract: renderRealInput,
 			actionContent: staticTodayIcon,
 			actionContentPlacement: todayIconPlacement === "fieldLabel" ? "content-row" : "content-wrapper",
+			wrapContentAndTrailing: true,
+			contentAndTrailingClassName: "gap-2!",
 			trailingClassName: "py-0! pl-0!",
 			trailingContent: showDropdown ? ui.dateInput.calendarIcon : void 0,
 			children: staticSegments
 		});
 	}
-	if ("formControl" in props && props.formControl) {
-		const { formControl, ref, ...innerProps } = props;
-		return /* @__PURE__ */ jsx(Controller, {
-			control: formControl.control,
-			name: formControl.name,
-			render: ({ field, fieldState: { error, isDirty } }) => /* @__PURE__ */ jsx(DateRangePickerBase, {
-				...innerProps,
-				...dateLimits,
-				ref: mergeRefs(ref, field.ref, inputRef),
-				value: parseDateRange(field.value),
-				onChange: (value) => field.onChange(formatDateRange(value)),
-				onBlur: field.onBlur,
-				isDirty,
-				isDisabled: field.disabled || props.isDisabled,
-				error: props.error ?? error?.message
-			})
+	const T0 = DateRangePickerBase;
+	const t8 = mergeRefs(props.ref, inputRef);
+	const t9 = parseDateRange(normalizedValue);
+	let t10;
+	if ($[15] !== formatDateRange || $[16] !== props) {
+		t10 = (value) => props.onChange?.(formatDateRange(value));
+		$[15] = formatDateRange;
+		$[16] = props;
+		$[17] = t10;
+	} else t10 = $[17];
+	let t11;
+	if ($[18] !== T0 || $[19] !== dateLimits || $[20] !== props || $[21] !== t10 || $[22] !== t8 || $[23] !== t9) {
+		t11 = /* @__PURE__ */ jsx(T0, {
+			...props,
+			...dateLimits,
+			ref: t8,
+			value: t9,
+			onChange: t10
 		});
+		$[18] = T0;
+		$[19] = dateLimits;
+		$[20] = props;
+		$[21] = t10;
+		$[22] = t8;
+		$[23] = t9;
+		$[24] = t11;
+	} else t11 = $[24];
+	return t11;
+};
+var DateRangePicker = (t0) => {
+	const $ = c(30);
+	let maxValue;
+	let minValue;
+	let props;
+	let renderStaticInput;
+	let t1;
+	if ($[0] !== t0) {
+		({fullIso: t1, minValue, maxValue, renderStaticInput, ...props} = t0);
+		$[0] = t0;
+		$[1] = maxValue;
+		$[2] = minValue;
+		$[3] = props;
+		$[4] = renderStaticInput;
+		$[5] = t1;
+	} else {
+		maxValue = $[1];
+		minValue = $[2];
+		props = $[3];
+		renderStaticInput = $[4];
+		t1 = $[5];
 	}
-	return /* @__PURE__ */ jsx(DateRangePickerBase, {
-		...props,
-		...dateLimits,
-		ref: mergeRefs(props.ref, inputRef),
-		value: parseDateRange(props.value),
-		onChange: (value) => props.onChange?.(formatDateRange(value))
-	});
+	const fullIso = t1 === void 0 ? true : t1;
+	if ("formControl" in props && props.formControl) {
+		let formControl;
+		let innerProps;
+		let ref;
+		if ($[6] !== props) {
+			({formControl, ref, ...innerProps} = props);
+			$[6] = props;
+			$[7] = formControl;
+			$[8] = innerProps;
+			$[9] = ref;
+		} else {
+			formControl = $[7];
+			innerProps = $[8];
+			ref = $[9];
+		}
+		const controlWithOptions = formControl.control;
+		let t2;
+		if ($[10] !== controlWithOptions._options?.disabled || $[11] !== fullIso || $[12] !== innerProps || $[13] !== maxValue || $[14] !== minValue || $[15] !== props.error || $[16] !== props.isDisabled || $[17] !== ref || $[18] !== renderStaticInput) {
+			t2 = (t3) => {
+				const { field, fieldState: t4 } = t3;
+				const { error, isDirty } = t4;
+				return /* @__PURE__ */ jsx(DateRangePickerInner, {
+					...innerProps,
+					ref: mergeRefs(ref, field.ref),
+					value: field.value,
+					onChange: field.onChange,
+					onBlur: field.onBlur,
+					isDirty,
+					isDisabled: field.disabled || props.isDisabled,
+					isFormControlDisabled: !!controlWithOptions._options?.disabled,
+					error: props.error ?? error?.message,
+					fullIso,
+					minValue,
+					maxValue,
+					renderStaticInput
+				});
+			};
+			$[10] = controlWithOptions._options?.disabled;
+			$[11] = fullIso;
+			$[12] = innerProps;
+			$[13] = maxValue;
+			$[14] = minValue;
+			$[15] = props.error;
+			$[16] = props.isDisabled;
+			$[17] = ref;
+			$[18] = renderStaticInput;
+			$[19] = t2;
+		} else t2 = $[19];
+		let t3;
+		if ($[20] !== formControl.control || $[21] !== formControl.name || $[22] !== t2) {
+			t3 = /* @__PURE__ */ jsx(Controller, {
+				control: formControl.control,
+				name: formControl.name,
+				render: t2
+			});
+			$[20] = formControl.control;
+			$[21] = formControl.name;
+			$[22] = t2;
+			$[23] = t3;
+		} else t3 = $[23];
+		return t3;
+	}
+	let t2;
+	if ($[24] !== fullIso || $[25] !== maxValue || $[26] !== minValue || $[27] !== props || $[28] !== renderStaticInput) {
+		t2 = /* @__PURE__ */ jsx(DateRangePickerInner, {
+			...props,
+			fullIso,
+			minValue,
+			maxValue,
+			renderStaticInput
+		});
+		$[24] = fullIso;
+		$[25] = maxValue;
+		$[26] = minValue;
+		$[27] = props;
+		$[28] = renderStaticInput;
+		$[29] = t2;
+	} else t2 = $[29];
+	return t2;
 };
+function _temp(input) {
+	const container = input.getContainer?.() ?? input;
+	return container instanceof HTMLElement ? container.querySelector("input, button, [tabindex]:not([tabindex='-1'])") : null;
+}
 //#endregion
 export { DateRangePicker };