@gravity-ui/date-components 2.4.0 → 2.6.0

package/dist/cjs/components/RelativeRangeDatePicker/RelativeRangeDatePicker.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelativeRangeDatePicker = void 0;
 const tslib_1 = require("tslib");
@@ -7,6 +8,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const icons_1 = require("@gravity-ui/icons");
 const uikit_1 = require("@gravity-ui/uikit");
 const cn_1 = require("../../utils/cn");
+const HiddenInput_1 = require("../HiddenInput/HiddenInput");
 const getButtonSizeForInput_1 = require("../utils/getButtonSizeForInput");
 const PickerDialog_1 = require("./components/PickerDialog/PickerDialog");
 const useRelativeRangeDatePickerState_1 = require("./hooks/useRelativeRangeDatePickerState");
@@ -53,7 +55,7 @@ function RelativeRangeDatePicker(props) {
         }), [alwaysShowAsAbsolute, format, getRangeTitle, presetTabs, state.timeZone, state.value]);
     const validationState = props.validationState || (state.isInvalid ? 'invalid' : undefined);
     const errorMessage = (_a = props.errorMessage) !== null && _a !== void 0 ? _a : state.errors.join('\n');
-    return ((0, jsx_runtime_1.jsxs)("div", Object.assign({ ref: anchorRef }, focusWithinProps, { className: b(null, props.className), style: props.style, children: [(0, jsx_runtime_1.jsx)(uikit_1.TextInput, { autoFocus: props.autoFocus, controlRef: inputRef, value: text, placeholder: props.placeholder, onUpdate: (v) => {
+    return ((0, jsx_runtime_1.jsxs)("div", Object.assign({ ref: anchorRef }, focusWithinProps, { className: b(null, props.className), style: props.style, children: [(0, jsx_runtime_1.jsx)(uikit_1.TextInput, { id: props.id, autoFocus: props.autoFocus, controlRef: inputRef, value: text, placeholder: props.placeholder, onUpdate: (v) => {
                     if (!props.readOnly && !v) {
                         state.setValue(null, 'default');
                     }
@@ -88,8 +90,19 @@ function RelativeRangeDatePicker(props) {
                 }), onClick: () => {
                     setIsActive(true);
                     setOpen(true);
-                } })) : null, (0, jsx_runtime_1.jsx)(PickerDialog_1.PickerDialog, { state: state, props: props, open: open, onClose: () => {
+                } })) : null, (0, jsx_runtime_1.jsx)(HiddenInput_1.HiddenInput, { name: props.name, form: props.form, value: state.value, toStringValue: (v) => { var _a, _b; return (_b = (_a = v === null || v === void 0 ? void 0 : v.start) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : ''; }, disabled: props.disabled }), (0, jsx_runtime_1.jsx)(HiddenInput_1.HiddenInput, { name: props.name, form: props.form, value: state.value, toStringValue: (v) => { var _a; return getNativeValue((_a = v === null || v === void 0 ? void 0 : v.start) !== null && _a !== void 0 ? _a : null); }, disabled: props.disabled }), (0, jsx_runtime_1.jsx)(HiddenInput_1.HiddenInput, { name: props.name, form: props.form, value: state.value, toStringValue: (v) => { var _a, _b; return (_b = (_a = v === null || v === void 0 ? void 0 : v.end) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : ''; }, disabled: props.disabled }), (0, jsx_runtime_1.jsx)(HiddenInput_1.HiddenInput, { name: props.name, form: props.form, value: state.value, toStringValue: (v) => { var _a; return getNativeValue((_a = v === null || v === void 0 ? void 0 : v.end) !== null && _a !== void 0 ? _a : null); }, disabled: props.disabled }), (0, jsx_runtime_1.jsx)(HiddenInput_1.HiddenInput, { name: props.name, form: props.form, onReset: (v) => {
+                    state.setValue(v.value, v.timeZone);
+                }, value: { value: state.value, timeZone: state.timeZone }, toStringValue: (v) => v.timeZone, disabled: props.disabled }), (0, jsx_runtime_1.jsx)(PickerDialog_1.PickerDialog, { state: state, props: props, open: open, onClose: () => {
                     setOpen(false);
                 }, anchorRef: anchorRef, isMobile: isMobile, className: props.className })] })));
 }
 exports.RelativeRangeDatePicker = RelativeRangeDatePicker;
+function getNativeValue(value) {
+    if (!value) {
+        return '';
+    }
+    if (value.type === 'relative') {
+        return value.value;
+    }
+    return value.value.toISOString();
+}

package/dist/cjs/components/RelativeRangeDatePicker/components/PickerDialog/PickerDialog.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickerDialog = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");

package/dist/cjs/components/RelativeRangeDatePicker/components/Presets/Presets.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SIZE_TO_ITEM_HEIGHT = exports.Presets = void 0;
 const tslib_1 = require("tslib");

package/dist/cjs/components/RelativeRangeDatePicker/components/Presets/PresetsDoc.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresetsDoc = void 0;
 const tslib_1 = require("tslib");

package/dist/cjs/components/RelativeRangeDatePicker/components/Zones/Zones.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zones = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");

package/dist/cjs/components/types/datePicker.d.ts

@@ -17,3 +17,11 @@ export interface DateFieldBase<T = DateTime> extends ValueBase<T | null>, InputB
      */
     timeZone?: string;
 }
+export interface PopupTriggerProps<Args extends unknown[] = []> {
+    /** Whether the popup is open (controlled). */
+    open?: boolean;
+    /** Whether the popup is open by default (uncontrolled). */
+    defaultOpen?: boolean;
+    /** Handler that is called when the popup's open state changes. */
+    onOpenChange?: (open: boolean, ...args: Args) => void;
+}

package/dist/cjs/components/types/inputs.d.ts

@@ -29,6 +29,11 @@ export interface InputDOMProps {
      * The name of the input element, used when submitting an HTML form.
      */
     name?: string;
+    /**
+     * The id of a <form> in the same document. If this attribute is not set,
+     * the <input> is associated with its ancestor <form> element, if any.
+     */
+    form?: string;
 }
 export interface InputBase {
     /**

package/dist/cjs/components/utils/mergeProps.js

@@ -38,9 +38,9 @@ function mergeProps(...args) {
 exports.mergeProps = mergeProps;
 function chain(...fns) {
     return (...args) => {
-        for (const callback of fns) {
-            if (typeof callback === 'function') {
-                callback(...args);
+        for (const fn of fns) {
+            if (typeof fn === 'function') {
+                fn(...args);
             }
         }
     };

package/dist/cjs/components/utils/validation/datePicker.js

@@ -9,13 +9,13 @@ function getValidationResult(value, minValue, maxValue, isDateUnavailable, timeZ
     const isInvalid = rangeOverflow || rangeUnderflow || isUnavailable;
     const errors = [];
     if (isInvalid) {
-        if (rangeUnderflow) {
+        if (rangeUnderflow && minValue) {
             errors.push((0, i18n_1.i18n)('Value must be {minValue} or later.', {
                 minValue: minValue.timeZone(timeZone).format(),
                 value: valueTitle,
             }));
         }
-        if (rangeOverflow) {
+        if (rangeOverflow && maxValue) {
             errors.push((0, i18n_1.i18n)('Value must be {maxValue} or earlier.', {
                 maxValue: maxValue.timeZone(timeZone).format(),
                 value: valueTitle,

package/dist/esm/components/Calendar/Calendar.js

@@ -1,3 +1,4 @@
+'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { CalendarView } from '../CalendarView/CalendarView';

package/dist/esm/components/CalendarView/CalendarView.js

@@ -1,3 +1,4 @@
+'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { ChevronLeft, ChevronRight } from '@gravity-ui/icons';

package/dist/esm/components/DateField/DateField.js

@@ -1,8 +1,10 @@
+'use client';
 import { __rest } from "tslib";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { TextInput, useFocusWithin } from '@gravity-ui/uikit';
 import { block } from '../../utils/cn';
+import { HiddenInput } from '../HiddenInput/HiddenInput';
 import { useDateFieldProps } from './hooks/useDateFieldProps';
 import { useDateFieldState } from './hooks/useDateFieldState';
 import './DateField.css';
@@ -17,7 +19,7 @@ export function DateField(_a) {
             setActive(isFocusWithin);
         },
     });
-    return (_jsxs("div", Object.assign({ className: b(null, className), style: props.style }, focusWithinProps, { children: [_jsx(TextInput, Object.assign({}, inputProps, { value: state.isEmpty && !isActive && props.placeholder ? '' : inputProps.value })), _jsx("input", { type: "text", hidden: true, name: props.name, value: state.value ? state.value.toISOString() : '', 
-                // Ignore React warning
-                onChange: () => { } })] })));
+    return (_jsxs("div", Object.assign({ className: b(null, className), style: props.style }, focusWithinProps, { children: [_jsx(TextInput, Object.assign({}, inputProps, { value: state.isEmpty && !isActive && props.placeholder ? '' : inputProps.value })), _jsx(HiddenInput, { name: props.name, value: state.value, toStringValue: (value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.toISOString()) !== null && _a !== void 0 ? _a : ''; }, onReset: (value) => {
+                    state.setDate(value);
+                }, disabled: state.disabled, form: props.form })] })));
 }

package/dist/esm/components/DateField/hooks/useBaseDateFieldState.d.ts

@@ -37,6 +37,8 @@ export type DateFieldState<T = DateTime> = {
     displayValue: T;
     /** Sets the field's value. */
     setValue: (value: T) => void;
+    /** Sets the date value. */
+    setDate: (value: T | null) => void;
     /** Formatted value */
     text: string;
     /** Whether the field is read only. */

package/dist/esm/components/DateField/hooks/useBaseDateFieldState.js

@@ -30,6 +30,7 @@ export function useBaseDateFieldState(props) {
         isEmpty,
         displayValue,
         setValue,
+        setDate,
         text: formatSections(editableSections),
         readOnly: props.readOnly,
         disabled: props.disabled,

package/dist/esm/components/DateField/hooks/useDateFieldState.js

@@ -135,7 +135,7 @@ export function useDateFieldState(props) {
         }).timeZone(timeZone);
     }
     function setValueFromString(str) {
-        const date = parseDateFromString(str, props.format || 'L', timeZone);
+        const date = parseDateFromString(str, format, timeZone);
         if (isValid(date)) {
             handleUpdateDate(date);
             return true;

package/dist/esm/components/DateField/utils.d.ts

@@ -1,7 +1,6 @@
 import type { DateTime } from '@gravity-ui/date-utils';
 import type { DateFieldSection, DateFieldSectionType, DateFieldSectionWithoutPosition } from './types';
 export declare const EDITABLE_SEGMENTS: Partial<Record<DateFieldSectionType, boolean>>;
-export declare function expandFormat(format: string): string;
 export declare function getSectionLimits(section: DateFieldSectionWithoutPosition, date: DateTime): {
     minValue: number;
     maxValue: number;
@@ -9,7 +8,7 @@ export declare function getSectionLimits(section: DateFieldSectionWithoutPositio
     minValue?: undefined;
     maxValue?: undefined;
 };
-export declare function getSectionValue(sections: DateFieldSectionWithoutPosition, date: DateTime): number | undefined;
+export declare function getSectionValue(section: DateFieldSectionWithoutPosition, date: DateTime): number | undefined;
 export declare function getDurationUnitFromSectionType(type: DateFieldSectionType): "year" | "month" | "day" | "hour" | "minute" | "second" | "date";
 export declare function addSegment(section: DateFieldSection, date: DateTime, amount: number): DateTime;
 export declare function setSegment(section: DateFieldSection, date: DateTime, amount: number): DateTime;

package/dist/esm/components/DateField/utils.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { dateTime, isValid, settings } from '@gravity-ui/date-utils';
+import { dateTime, expandFormat, isValid } from '@gravity-ui/date-utils';
 import { mergeDateTime } from '../utils/dates';
 import { i18n } from './i18n';
 export const EDITABLE_SEGMENTS = {
@@ -12,16 +12,6 @@ export const EDITABLE_SEGMENTS = {
     dayPeriod: true,
     weekday: true,
 };
-export function expandFormat(format) {
-    const localeFormats = settings.getLocaleData().formats;
-    const getShortLocalizedFormatFromLongLocalizedFormat = (formatBis) => formatBis.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g, (_, escapeSequence, localizedFormat) => escapeSequence || localizedFormat.slice(1));
-    return format.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g, (_, escapeSequence, localizedFormat) => {
-        const LongLocalizedFormat = localizedFormat && localizedFormat.toUpperCase();
-        return (escapeSequence ||
-            localeFormats[localizedFormat] ||
-            getShortLocalizedFormatFromLongLocalizedFormat(localeFormats[LongLocalizedFormat]));
-    });
-}
 const escapedCharacters = { start: '[', end: ']' };
 const formatTokenMap = {
     // Year
@@ -142,13 +132,13 @@ export function getSectionLimits(section, date) {
     }
     return {};
 }
-export function getSectionValue(sections, date) {
-    const type = sections.type;
+export function getSectionValue(section, date) {
+    const type = section.type;
     switch (type) {
         case 'year': {
-            return isFourDigitYearFormat(sections.format)
+            return isFourDigitYearFormat(section.format)
                 ? date.year()
-                : Number(date.format(sections.format));
+                : Number(date.format(section.format));
         }
         case 'month':
         case 'hour':

package/dist/esm/components/DatePicker/DatePicker.d.ts

@@ -1,9 +1,12 @@
 import React from 'react';
 import type { DateTime } from '@gravity-ui/date-utils';
 import type { CalendarProps } from '../Calendar';
-import type { AccessibilityProps, DateFieldBase, DomProps, FocusableProps, InputDOMProps, KeyboardEvents, StyleProps, TextInputProps } from '../types';
+import type { AccessibilityProps, DomProps, FocusableProps, InputDOMProps, KeyboardEvents, StyleProps, TextInputProps } from '../types';
+import type { DatePickerStateOptions } from './hooks/datePickerStateFactory';
 import './DatePicker.css';
-export interface DatePickerProps<T = DateTime> extends DateFieldBase<T>, TextInputProps, FocusableProps, KeyboardEvents, DomProps, InputDOMProps, StyleProps, AccessibilityProps {
+export interface DatePickerProps<T = DateTime> extends DatePickerStateOptions<T>, TextInputProps, FocusableProps, KeyboardEvents, DomProps, InputDOMProps, StyleProps, AccessibilityProps {
     children?: (props: CalendarProps<T>) => React.ReactNode;
+    disablePortal?: boolean;
+    disableFocusTrap?: boolean;
 }
 export declare function DatePicker({ className, ...props }: DatePickerProps): import("react/jsx-runtime").JSX.Element;

package/dist/esm/components/DatePicker/DatePicker.js

@@ -1,3 +1,4 @@
+'use client';
 import { __rest } from "tslib";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
@@ -5,6 +6,7 @@ import { Calendar as CalendarIcon, Clock as ClockIcon } from '@gravity-ui/icons'
 import { Button, Icon, Popup, TextInput, useMobile } from '@gravity-ui/uikit';
 import { Calendar } from '../Calendar';
 import { DateField } from '../DateField';
+import { HiddenInput } from '../HiddenInput/HiddenInput';
 import { MobileCalendar } from './MobileCalendar';
 import { StubButton } from './StubButton';
 import { useDatePickerProps } from './hooks/useDatePickerProps';
@@ -18,7 +20,7 @@ export function DatePicker(_a) {
     const { groupProps, fieldProps, calendarButtonProps, popupProps, calendarProps, timeInputProps } = useDatePickerProps(state, props);
     const isMobile = useMobile();
     const isOnlyTime = state.hasTime && !state.hasDate;
-    return (_jsxs("div", Object.assign({ className: b(null, className) }, groupProps, { children: [isMobile ? (_jsx(MobileCalendar, { props: props, state: state })) : (!isOnlyTime && (_jsx("div", { ref: anchorRef, className: b('popup-anchor'), children: _jsx(Popup, Object.assign({ anchorRef: anchorRef }, popupProps, { children: _jsxs("div", { className: b('popup-content'), children: [typeof props.children === 'function' ? (props.children(calendarProps)) : (_jsx(Calendar, Object.assign({}, calendarProps))), state.hasTime && (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(DateField, Object.assign({}, timeInputProps)) }))] }) })) }))), _jsx(TextInput, Object.assign({}, fieldProps, { className: b('field', { mobile: isMobile }), hasClear: !isMobile && fieldProps.hasClear, endContent: _jsxs(React.Fragment, { children: [!isMobile && !isOnlyTime && (_jsx(Button, Object.assign({}, calendarButtonProps, { children: _jsx(Icon, { data: CalendarIcon }) }))), !isMobile && isOnlyTime && (_jsx(StubButton, { size: calendarButtonProps.size, icon: ClockIcon })), isMobile && (_jsx(StubButton, { size: calendarButtonProps.size, icon: isOnlyTime ? ClockIcon : CalendarIcon }))] }) })), _jsx("input", { type: "text", hidden: true, name: props.name, value: state.value ? state.value.toISOString() : '', 
-                // Ignore React warning
-                onChange: () => { } })] })));
+    return (_jsxs("div", Object.assign({ className: b(null, className) }, groupProps, { children: [isMobile ? (_jsx(MobileCalendar, { props: props, state: state })) : (!isOnlyTime && (_jsx("div", { ref: anchorRef, className: b('popup-anchor'), children: _jsx(Popup, Object.assign({ anchorRef: anchorRef }, popupProps, { children: _jsxs("div", { className: b('popup-content'), children: [typeof props.children === 'function' ? (props.children(calendarProps)) : (_jsx(Calendar, Object.assign({}, calendarProps))), state.hasTime && (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(DateField, Object.assign({}, timeInputProps)) }))] }) })) }))), _jsx(TextInput, Object.assign({}, fieldProps, { className: b('field', { mobile: isMobile }), hasClear: !isMobile && fieldProps.hasClear, endContent: _jsxs(React.Fragment, { children: [!isMobile && !isOnlyTime && (_jsx(Button, Object.assign({}, calendarButtonProps, { children: _jsx(Icon, { data: CalendarIcon }) }))), !isMobile && isOnlyTime && (_jsx(StubButton, { size: calendarButtonProps.size, icon: ClockIcon })), isMobile && (_jsx(StubButton, { size: calendarButtonProps.size, icon: isOnlyTime ? ClockIcon : CalendarIcon }))] }) })), _jsx(HiddenInput, { name: props.name, value: state.value, toStringValue: (value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.toISOString()) !== null && _a !== void 0 ? _a : ''; }, onReset: (value) => {
+                    state.setValue(value);
+                }, disabled: state.disabled, form: props.form })] })));
 }

package/dist/esm/components/DatePicker/MobileCalendar.js

@@ -1,3 +1,4 @@
+'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { dateTime } from '@gravity-ui/date-utils';
 import { block } from '../../utils/cn';

package/dist/esm/components/DatePicker/hooks/datePickerStateFactory.d.ts

@@ -1,6 +1,7 @@
 import type { DateTime } from '@gravity-ui/date-utils';
 import type { DateFieldState } from '../../DateField';
-import type { DateFieldBase } from '../../types';
+import type { DateFieldBase, PopupTriggerProps } from '../../types';
+type OpenChangeReason = 'EscapeKeyDown' | 'FocusOut' | 'ClickOutside' | 'ValueSelected' | 'TriggerButtonClick' | 'ShortcutKeyDown';
 export interface DatePickerState<T = DateTime> {
     /** The currently selected date. */
     value: T | null;
@@ -36,7 +37,7 @@ export interface DatePickerState<T = DateTime> {
     /** Whether the calendar popover is currently open. */
     isOpen: boolean;
     /** Sets whether the calendar popover is open. */
-    setOpen: (isOpen: boolean) => void;
+    setOpen: (isOpen: boolean, reason: OpenChangeReason) => void;
     dateFieldState: DateFieldState<T>;
 }
 export interface DatePickerStateFactoryOptions<T, O extends DateFieldBase<T>> {
@@ -46,4 +47,7 @@ export interface DatePickerStateFactoryOptions<T, O extends DateFieldBase<T>> {
     getDateTime: (date: T | null | undefined) => DateTime | undefined;
     useDateFieldState: (props: O) => DateFieldState<T>;
 }
-export declare function datePickerStateFactory<T, O extends DateFieldBase<T>>({ getPlaceholderTime, mergeDateTime, setTimezone, getDateTime, useDateFieldState, }: DatePickerStateFactoryOptions<T, O>): (props: O) => DatePickerState<T>;
+export interface DatePickerStateOptions<T> extends DateFieldBase<T>, PopupTriggerProps<[OpenChangeReason]> {
+}
+export declare function datePickerStateFactory<T, O extends DatePickerStateOptions<T>>({ getPlaceholderTime, mergeDateTime, setTimezone, getDateTime, useDateFieldState, }: DatePickerStateFactoryOptions<T, O>): (props: O) => DatePickerState<T>;
+export {};

package/dist/esm/components/DatePicker/hooks/datePickerStateFactory.js

@@ -3,10 +3,11 @@ import { useControlledState } from '@gravity-ui/uikit';
 import { useDefaultTimeZone } from '../../utils/useDefaultTimeZone';
 export function datePickerStateFactory({ getPlaceholderTime, mergeDateTime, setTimezone, getDateTime, useDateFieldState, }) {
     return function useDatePickerState(props) {
-        var _a;
+        var _a, _b;
         const { disabled, readOnly } = props;
-        const [isOpen, setOpen] = React.useState(false);
-        const [value, setValue] = useControlledState(props.value, (_a = props.defaultValue) !== null && _a !== void 0 ? _a : null, props.onUpdate);
+        const [isOpen, _setOpen] = useControlledState(props.open, (_a = props.defaultOpen) !== null && _a !== void 0 ? _a : false, props.onOpenChange);
+        const setOpen = _setOpen;
+        const [value, setValue] = useControlledState(props.value, (_b = props.defaultValue) !== null && _b !== void 0 ? _b : null, props.onUpdate);
         const [selectedDateInner, setSelectedDate] = React.useState(null);
         const [selectedTimeInner, setSelectedTime] = React.useState(null);
         const inputTimeZone = useDefaultTimeZone(getDateTime(props.value) || getDateTime(props.defaultValue) || props.placeholderValue);
@@ -61,7 +62,7 @@ export function datePickerStateFactory({ getPlaceholderTime, mergeDateTime, setT
                 commitValue(newValue, newValue);
             }
             if (shouldClose) {
-                setOpen(false);
+                setOpen(false, 'ValueSelected');
             }
         };
         const selectTime = (newValue) => {
@@ -104,11 +105,11 @@ export function datePickerStateFactory({ getPlaceholderTime, mergeDateTime, setT
             timeFormat,
             timeZone,
             isOpen,
-            setOpen(newIsOpen) {
+            setOpen(newIsOpen, reason) {
                 if (!newIsOpen && !value && selectedDate && dateFieldState.hasTime) {
                     commitValue(selectedDate, selectedTime || getPlaceholderTime(props.placeholderValue, props.timeZone));
                 }
-                setOpen(newIsOpen);
+                setOpen(newIsOpen, reason);
             },
             dateFieldState,
         };

package/dist/esm/components/DatePicker/hooks/useDatePickerProps.js

@@ -1,5 +1,6 @@
 import { __rest } from "tslib";
 import React from 'react';
+import { isDateTime } from '@gravity-ui/date-utils';
 import { useFocusWithin, useForkRef } from '@gravity-ui/uikit';
 import { useDateFieldProps } from '../../DateField';
 import { getButtonSizeForInput } from '../../utils/getButtonSizeForInput';
@@ -9,13 +10,31 @@ import { getDateTimeValue } from '../utils';
 export function useDatePickerProps(state, _a) {
     var { onFocus, onBlur } = _a, props = __rest(_a, ["onFocus", "onBlur"]);
     const [isActive, setActive] = React.useState(false);
+    const [focusedDate, setFocusedDate] = React.useState(isDateTime(state.dateFieldState.displayValue)
+        ? state.dateFieldState.displayValue
+        : state.dateFieldState.displayValue.start);
+    const [prevDateValue, setPrevDateValue] = React.useState(state.dateFieldState.displayValue);
+    if (isDateTime(state.dateFieldState.displayValue)) {
+        if (!state.dateFieldState.displayValue.isSame(prevDateValue, 'day')) {
+            setPrevDateValue(state.dateFieldState.displayValue);
+            setFocusedDate(state.dateFieldState.displayValue);
+        }
+    }
+    else if (!state.dateFieldState.displayValue.start.isSame(prevDateValue.start, 'day')) {
+        setPrevDateValue(state.dateFieldState.displayValue);
+        setFocusedDate(state.dateFieldState.displayValue.start);
+    }
+    else if (!state.dateFieldState.displayValue.end.isSame(prevDateValue.end, 'day')) {
+        setPrevDateValue(state.dateFieldState.displayValue);
+        setFocusedDate(state.dateFieldState.displayValue.end);
+    }
     const { focusWithinProps } = useFocusWithin({
         onFocusWithin: onFocus,
         onBlurWithin: onBlur,
         onFocusWithinChange(isFocusWithin) {
             setActive(isFocusWithin);
             if (!isFocusWithin) {
-                state.setOpen(false);
+                state.setOpen(false, 'FocusOut');
             }
         },
     });
@@ -37,7 +56,7 @@ export function useDatePickerProps(state, _a) {
                 if (!onlyTime && e.altKey && (e.key === 'ArrowDown' || e.key === 'ArrowUp')) {
                     e.preventDefault();
                     e.stopPropagation();
-                    state.setOpen(true);
+                    state.setOpen(true, 'ShortcutKeyDown');
                 }
             } }),
         fieldProps: mergeProps(inputProps, state.dateFieldState.isEmpty && !isActive && props.placeholder
@@ -55,25 +74,31 @@ export function useDatePickerProps(state, _a) {
             view: 'flat-secondary',
             onClick: () => {
                 setActive(true);
-                state.setOpen(!state.isOpen);
+                state.setOpen(!state.isOpen, 'TriggerButtonClick');
             },
         },
         popupProps: {
             open: state.isOpen,
             onEscapeKeyDown: () => {
-                state.setOpen(false);
+                state.setOpen(false, 'EscapeKeyDown');
                 focusInput();
             },
             onOutsideClick: (e) => {
                 var _a;
                 if (e.target !== calendarButtonRef.current) {
-                    state.setOpen(false);
+                    state.setOpen(false, 'ClickOutside');
                 }
                 if (e.target && ((_a = groupRef.current) === null || _a === void 0 ? void 0 : _a.contains(e.target))) {
                     focusInput();
                 }
             },
-            focusTrap: true,
+            onTransitionExited: () => {
+                setFocusedDate(isDateTime(state.dateFieldState.displayValue)
+                    ? state.dateFieldState.displayValue
+                    : state.dateFieldState.displayValue.start);
+            },
+            focusTrap: !props.disableFocusTrap,
+            disablePortal: props.disablePortal,
         },
         calendarProps: {
             ref: calendarRef,
@@ -92,6 +117,8 @@ export function useDatePickerProps(state, _a) {
             maxValue: props.maxValue,
             isDateUnavailable: props.isDateUnavailable,
             timeZone: state.timeZone,
+            focusedValue: focusedDate,
+            onFocusUpdate: setFocusedDate,
         },
         timeInputProps: {
             value: state.timeValue,

package/dist/esm/components/HiddenInput/HiddenInput.d.ts

@@ -0,0 +1,14 @@
+interface HiddenInputProps<T> {
+    value: T;
+    onReset?: (value: T) => void;
+    toStringValue?: (value: T) => string;
+    name?: string;
+    disabled?: boolean;
+    form?: string;
+}
+export declare function HiddenInput<T>({ name, value, onReset, form, disabled, toStringValue, }: HiddenInputProps<T>): import("react/jsx-runtime").JSX.Element | null;
+export declare function useFormResetHandler<T>({ initialValue, onReset, }: {
+    initialValue: T;
+    onReset?: (value: T) => void;
+}): (node: HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | null) => void;
+export {};

package/dist/esm/components/HiddenInput/HiddenInput.js

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
+export function HiddenInput({ name, value, onReset, form, disabled, toStringValue, }) {
+    const ref = useFormResetHandler({ initialValue: value, onReset });
+    if (!name) {
+        return null;
+    }
+    const v = toStringValue ? toStringValue(value) : `${value !== null && value !== void 0 ? value : ''}`;
+    return _jsx("input", { ref: ref, type: "hidden", name: name, value: v, disabled: disabled, form: form });
+}
+export function useFormResetHandler({ initialValue, onReset, }) {
+    const [formElement, setFormElement] = React.useState(null);
+    const resetValue = React.useRef(initialValue);
+    React.useEffect(() => {
+        if (!formElement || !onReset) {
+            return undefined;
+        }
+        const handleReset = () => {
+            onReset(resetValue.current);
+        };
+        formElement.addEventListener('reset', handleReset);
+        return () => {
+            formElement.removeEventListener('reset', handleReset);
+        };
+    }, [formElement, onReset]);
+    const ref = React.useCallback((node) => {
+        var _a;
+        setFormElement((_a = node === null || node === void 0 ? void 0 : node.form) !== null && _a !== void 0 ? _a : null);
+    }, []);
+    return ref;
+}

package/dist/esm/components/RangeCalendar/RangeCalendar.js

@@ -1,3 +1,4 @@
+'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { CalendarView } from '../CalendarView/CalendarView';

package/dist/esm/components/RangeDateField/RangeDateField.js

@@ -1,13 +1,16 @@
+'use client';
 import { __rest } from "tslib";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { TextInput, useFocusWithin } from '@gravity-ui/uikit';
 import { block } from '../../utils/cn';
 import { useDateFieldProps } from '../DateField/hooks/useDateFieldProps';
+import { HiddenInput } from '../HiddenInput/HiddenInput';
 import { useRangeDateFieldState } from './hooks/useRangeDateFieldState';
 import './RangeDateField.css';
 const b = block('range-date-field');
 export function RangeDateField(_a) {
+    var _b, _c;
     var { className } = _a, props = __rest(_a, ["className"]);
     const state = useRangeDateFieldState(props);
     const { inputProps } = useDateFieldProps(state, props);
@@ -17,5 +20,7 @@ export function RangeDateField(_a) {
             setActive(isFocusWithin);
         },
     });
-    return (_jsx("div", Object.assign({ className: b(null, className), style: props.style }, focusWithinProps, { children: _jsx(TextInput, Object.assign({}, inputProps, { value: state.isEmpty && !isActive && props.placeholder ? '' : inputProps.value })) })));
+    return (_jsxs("div", Object.assign({ className: b(null, className), style: props.style }, focusWithinProps, { children: [_jsx(TextInput, Object.assign({}, inputProps, { value: state.isEmpty && !isActive && props.placeholder ? '' : inputProps.value })), _jsx(HiddenInput, { name: props.name, form: props.form, onReset: (v) => {
+                    state.setDate(v);
+                }, value: (_b = state.value) !== null && _b !== void 0 ? _b : null, toStringValue: (v) => (v ? v.start.toISOString() : ''), disabled: state.disabled }), _jsx(HiddenInput, { name: props.name, form: props.form, value: (_c = state.value) !== null && _c !== void 0 ? _c : null, toStringValue: (v) => (v ? v.end.toISOString() : ''), disabled: state.disabled })] })));
 }

package/dist/esm/components/RangeDatePicker/RangeDatePicker.js

@@ -1,3 +1,4 @@
+'use client';
 import { __rest } from "tslib";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
@@ -7,6 +8,7 @@ import { block } from '../../utils/cn';
 import { RangeCalendar } from '../Calendar';
 import { useDatePickerProps } from '../DatePicker';
 import { StubButton } from '../DatePicker/StubButton';
+import { HiddenInput } from '../HiddenInput/HiddenInput';
 import { RangeDateField } from '../RangeDateField';
 import { useRangeDatePickerState } from './hooks/useRangeDatePickerState';
 import './RangeDatePicker.css';
@@ -17,5 +19,7 @@ export function RangeDatePicker(_a) {
     const state = useRangeDatePickerState(props);
     const { groupProps, fieldProps, calendarButtonProps, popupProps, calendarProps, timeInputProps } = useDatePickerProps(state, props);
     const isOnlyTime = state.hasTime && !state.hasDate;
-    return (_jsxs("div", Object.assign({ className: b(null, className) }, groupProps, { children: [!isOnlyTime && (_jsx("div", { ref: anchorRef, className: b('popup-anchor'), children: _jsx(Popup, Object.assign({ anchorRef: anchorRef }, popupProps, { children: _jsxs("div", { className: b('popup-content'), children: [typeof props.children === 'function' ? (props.children(Object.assign(Object.assign({}, calendarProps), { value: state.value }))) : (_jsx(RangeCalendar, Object.assign({}, calendarProps, { value: state.value }))), state.hasTime && (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(RangeDateField, Object.assign({}, timeInputProps)) }))] }) })) })), _jsx(TextInput, Object.assign({}, fieldProps, { className: b('field'), hasClear: fieldProps.hasClear, endContent: _jsxs(React.Fragment, { children: [!isOnlyTime && (_jsx(Button, Object.assign({}, calendarButtonProps, { children: _jsx(Icon, { data: CalendarIcon }) }))), isOnlyTime && (_jsx(StubButton, { size: calendarButtonProps.size, icon: ClockIcon }))] }) }))] })));
+    return (_jsxs("div", Object.assign({ className: b(null, className) }, groupProps, { children: [!isOnlyTime && (_jsx("div", { ref: anchorRef, className: b('popup-anchor'), children: _jsx(Popup, Object.assign({ anchorRef: anchorRef }, popupProps, { children: _jsxs("div", { className: b('popup-content'), children: [typeof props.children === 'function' ? (props.children(Object.assign(Object.assign({}, calendarProps), { value: state.value }))) : (_jsx(RangeCalendar, Object.assign({}, calendarProps, { value: state.value }))), state.hasTime && (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(RangeDateField, Object.assign({}, timeInputProps)) }))] }) })) })), _jsx(TextInput, Object.assign({}, fieldProps, { className: b('field'), hasClear: fieldProps.hasClear, endContent: _jsxs(React.Fragment, { children: [!isOnlyTime && (_jsx(Button, Object.assign({}, calendarButtonProps, { children: _jsx(Icon, { data: CalendarIcon }) }))), isOnlyTime && (_jsx(StubButton, { size: calendarButtonProps.size, icon: ClockIcon }))] }) })), _jsx(HiddenInput, { name: props.name, form: props.form, onReset: (v) => {
+                    state.dateFieldState.setDate(v);
+                }, value: state.value, toStringValue: (v) => (v ? v.start.toISOString() : ''), disabled: state.disabled }), _jsx(HiddenInput, { name: props.name, form: props.form, value: state.value, toStringValue: (v) => (v ? v.end.toISOString() : ''), disabled: state.disabled })] })));
 }

package/dist/esm/components/RelativeDateField/RelativeDateField.js

@@ -1,15 +1,16 @@
+'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Popup, TextInput, useFocusWithin, useMobile } from '@gravity-ui/uikit';
 import { block } from '../../utils/cn';
 import { Calendar } from '../Calendar';
 import { DateField } from '../DateField';
+import { HiddenInput } from '../HiddenInput/HiddenInput';
 import { useRelativeDateFieldProps } from './hooks/useRelativeDateFieldProps';
 import { useRelativeDateFieldState } from './hooks/useRelativeDateFieldState';
 import './RelativeDateField.css';
 const b = block('relative-date-field');
 export function RelativeDateField(props) {
-    var _a;
     const state = useRelativeDateFieldState(props);
     const { inputProps, calendarProps, timeInputProps } = useRelativeDateFieldProps(state, props);
     const isMobile = useMobile();
@@ -27,7 +28,7 @@ export function RelativeDateField(props) {
                         setOpen(true);
                     }
                     (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
-                }, onBlur: props.onBlur })), _jsx("input", { type: "text", hidden: true, name: props.name, value: (_a = state.value) !== null && _a !== void 0 ? _a : '', 
-                // Ignore React warning
-                onChange: () => { } }), !isMobile && (_jsx(Popup, { anchorRef: anchorRef, open: isOpen, children: _jsxs("div", { className: b('popup-content'), children: [_jsx(Calendar, Object.assign({}, calendarProps)), props.hasTime ? (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(DateField, Object.assign({ className: b('time-field') }, timeInputProps)) })) : null] }) }))] })));
+                }, onBlur: props.onBlur })), _jsx(HiddenInput, { name: props.name, value: state.value, onReset: (value) => {
+                    state.setValue(value);
+                }, disabled: state.disabled, form: props.form }), !isMobile && (_jsx(Popup, { anchorRef: anchorRef, open: isOpen, children: _jsxs("div", { className: b('popup-content'), children: [_jsx(Calendar, Object.assign({}, calendarProps)), props.hasTime ? (_jsx("div", { className: b('time-field-wrapper'), children: _jsx(DateField, Object.assign({ className: b('time-field') }, timeInputProps)) })) : null] }) }))] })));
 }