@ozen-ui/kit 0.74.0 → 0.75.0

package/__inner__/esm/components/Calendar/types.d.ts

@@ -1,6 +1,6 @@
 import type { MouseEvent, ReactElement, ReactNode } from 'react';
 import type { DPExcludeConfig, DPDayInteger } from '@rehookify/datepicker';
-import type { ExtendableComponentPropsWithRef } from '../../types/ExtendableComponentPropsWithRef';
+import type { WithRequired, ExtendableComponentPropsWithRef } from '../../types';
 import type { WithDisplayName } from '../../types/react';
 import type { CALENDAR_DEFAULT_MODE } from './constants';
 export declare const calendarStepVariant: readonly ["days", "months", "years"];
@@ -18,6 +18,7 @@ export type CalendarPropRenderAdditionalControls<MODE extends CalendarModeVarian
     date?: MODE extends 'range' ? Date[] : Date;
 }) => ReactElement;
 export type CalendarPropCalendars = 1 | 2;
+export type CalendarSteps = CalendarStepVariant[];
 /**
  * @deprecated
  * Use the `CalendarPropOnChange` type to replace it.
@@ -44,6 +45,9 @@ export type CalendarExclude = CalendarPropExclude;
  * */
 export type CalendarStartDay = CalendarPropStartDay;
 export type CalendarRenderAdditionalControls<MODE extends CalendarModeVariant> = CalendarPropRenderAdditionalControls<MODE>;
+export type CalendarOnMonthClick = (event: MouseEvent<HTMLElement>, date: Date) => void;
+export type CalendarOnDayClick = (event: MouseEvent<HTMLElement>, date: Date) => void;
+export type CalendarOnYearClick = (event: MouseEvent<HTMLElement>, date: Date) => void;
 export type CalendarProps<MODE extends CalendarModeVariant = typeof CALENDAR_DEFAULT_MODE> = ExtendableComponentPropsWithRef<{
     /** Способ выбора даты:
      * - `single` — позволяет выбрать одну дату (показывает один календарь).
@@ -75,11 +79,11 @@ export type CalendarProps<MODE extends CalendarModeVariant = typeof CALENDAR_DEF
     /** Ограничение выбора дат по большей дате */
     maxDate?: Date;
     /** Обработчик нажатия на кнопку месяца */
-    onMonthClick?(e: MouseEvent<HTMLElement>, date: Date): void;
+    onMonthClick?: CalendarOnMonthClick;
     /** Обработчик нажатия на кнопку дня */
-    onDayClick?(e: MouseEvent<HTMLElement>, date: Date): void;
+    onDayClick?: CalendarOnDayClick;
     /** Обработчик нажатия на кнопку года */
-    onYearClick?(e: MouseEvent<HTMLElement>, date: Date): void;
+    onYearClick?: CalendarOnYearClick;
     /** Дополнительные контролы — рендер функция */
     renderAdditionalControls?: CalendarPropRenderAdditionalControls<MODE>;
     /** Функция форматирования атрибута `aria-label` для кнопок переключения периодов */
@@ -89,6 +93,10 @@ export type CalendarProps<MODE extends CalendarModeVariant = typeof CALENDAR_DEF
     /** Количество отображаемых календарей в компоненте: один или два */
     calendars?: CalendarPropCalendars;
     children?: never;
+    /** Шаги календаря. Определяет порядок и наличие этапов выбора. */
+    steps?: CalendarSteps;
+    /** Изначальный шаг */
+    initialStep?: CalendarStepVariant;
 }, 'div'>;
 export type CalendarComponent = WithDisplayName<(<MODE extends CalendarModeVariant = typeof CALENDAR_DEFAULT_MODE>(props: CalendarProps<MODE>) => ReactNode)>;
-export type CalendarModeComponent<MODE extends CalendarModeVariant> = WithDisplayName<(props: Omit<CalendarProps<MODE>, 'mode'>) => ReactNode>;
+export type CalendarModeComponent<MODE extends CalendarModeVariant> = WithDisplayName<(props: Omit<WithRequired<CalendarProps<MODE>, 'steps' | 'initialStep'>, 'mode'>) => ReactNode>;

package/__inner__/esm/components/Calendar/utils.d.ts

@@ -1,3 +1,12 @@
-import type { CalendarProps } from './index';
+import type { CalendarProps, CalendarSteps } from './index';
 export declare const cnCalendar: import("@bem-react/classname").ClassNameFormatter;
 export declare const getPeriodSwitchAriaLabel: CalendarProps['getPeriodSwitchAriaLabel'];
+export declare const calculateStepsAvailability: (steps: CalendarSteps) => {
+    hasDaysStep: boolean;
+    hasMonthsStep: boolean;
+    hasYearsStep: boolean;
+};
+export declare const calculateStepsHelpers: (steps: CalendarSteps) => {
+    lastStep: "days" | "months" | "years";
+    firstStep: "days" | "months" | "years";
+};

package/__inner__/esm/components/Calendar/utils.js

@@ -9,3 +9,12 @@ export var getPeriodSwitchAriaLabel = function (step) {
     }
     return ['Previous period', 'Next period'];
 };
+export var calculateStepsAvailability = function (steps) { return ({
+    hasDaysStep: steps.includes('days'),
+    hasMonthsStep: steps.includes('months'),
+    hasYearsStep: steps.includes('years'),
+}); };
+export var calculateStepsHelpers = function (steps) { return ({
+    lastStep: steps[steps.length - 1],
+    firstStep: steps[0],
+}); };

package/__inner__/esm/components/DatePicker/components/DateInput/DateInput.js

@@ -1,10 +1,11 @@
 import { __assign, __rest } from "tslib";
 import React, { forwardRef } from 'react';
 import { useMultiRef } from '../../../../hooks/useMultiRef';
+import { isFunction } from '../../../../utils';
 import { Input } from '../../../Input';
 import { dateInputMask } from './utils';
 export var DateInput = forwardRef(function (_a, ref) {
-    var valueProp = _a.value, defaultValue = _a.defaultValue, other = __rest(_a, ["value", "defaultValue"]);
-    return (React.createElement(Input, __assign({ value: dateInputMask(valueProp), defaultValue: dateInputMask(defaultValue) }, other, { ref: useMultiRef([ref]) })));
+    var valueProp = _a.value, defaultValue = _a.defaultValue, steps = _a.steps, placeholder = _a.placeholder, other = __rest(_a, ["value", "defaultValue", "steps", "placeholder"]);
+    return (React.createElement(Input, __assign({ value: dateInputMask(valueProp, steps), defaultValue: dateInputMask(defaultValue, steps) }, other, { placeholder: isFunction(placeholder) ? placeholder(steps) : placeholder, ref: useMultiRef([ref]) })));
 });
 DateInput.displayName = 'DateInput';

package/__inner__/esm/components/DatePicker/components/DateInput/types.d.ts

@@ -1,9 +1,13 @@
 import type { ComponentRef } from 'react';
-import type { ExtendableComponentPropsWithRef } from '../../../../types/ExtendableComponentPropsWithRef';
+import type { ExtendableComponentPropsWithRef } from '../../../../types';
+import type { CalendarSteps } from '../../../Calendar';
 import type { FIELD_CONTROL_DEFAULT_TAG } from '../../../FieldControl';
 import type { InputProps } from '../../../Input';
+import type { InputPropPlaceholder } from '../../types';
 export type DateInputRef = ComponentRef<typeof FIELD_CONTROL_DEFAULT_TAG>;
 export type DateInputProps = ExtendableComponentPropsWithRef<{
+    steps: CalendarSteps;
     value?: string;
     defaultValue?: string;
-} & Omit<InputProps, 'value' | 'defaultValue'>, typeof FIELD_CONTROL_DEFAULT_TAG>;
+    placeholder?: InputPropPlaceholder;
+} & Omit<InputProps, 'value' | 'defaultValue' | 'placeholder'>, typeof FIELD_CONTROL_DEFAULT_TAG>;

package/__inner__/esm/components/DatePicker/components/DateInput/utils/dateInputMask/dateInputMask.d.ts

@@ -1 +1,2 @@
-export declare const dateInputMask: (value: string | undefined) => string | undefined;
+import type { CalendarSteps } from '../../../../../Calendar';
+export declare const dateInputMask: (value: string | undefined, steps: CalendarSteps) => string | undefined;

package/__inner__/esm/components/DatePicker/components/DateInput/utils/dateInputMask/dateInputMask.js

@@ -1,14 +1,74 @@
-export var dateInputMask = function (value) {
+var onlyOneDot = function (value) {
+    // Разрешить только первую точку, остальные убрать
+    var firstDotIndex = value.indexOf('.');
+    if (firstDotIndex === -1) {
+        return value;
+    }
+    // Сохраняем первую часть и одну точку
+    var beforeDot = value.slice(0, firstDotIndex + 1);
+    var afterDot = value.slice(firstDotIndex + 1).replace(/\./g, '');
+    return beforeDot + afterDot;
+};
+export var dateInputMask = function (value, steps) {
     if (!value) {
         return value;
     }
+    var hasDaysStep = steps.includes('days');
+    var hasMonthsStep = steps.includes('months');
+    var hasYearsStep = steps.includes('years');
+    var maxLength = 0;
     var newValue = value.replace(/[^0-9.]/g, ''); // Запрещаем ввод, кроме цифр и точек
     newValue = newValue.replace(/\.\.+/g, '..'); // Удаляем лишние точки
-    newValue = newValue.replace(/^(\d)\.$/g, '0$1.'); // Добавляем 0 в D.
-    newValue = newValue.replace(/^(\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.M
-    newValue = newValue.replace(/^(\d\d)\.(\d)\.$/g, '$1.0$2.'); // Добавляем 0 в DD.M.
-    newValue = newValue.replace(/^(\d\d\.\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.MM.Y
-    if (newValue.length > 10)
-        newValue = newValue.slice(0, 10); // Ограничиваем длину
+    // DD
+    if (hasDaysStep && !hasMonthsStep && !hasYearsStep) {
+        maxLength = 2;
+        newValue = newValue.replace('.', '');
+    }
+    // MM
+    if (!hasDaysStep && hasMonthsStep && !hasYearsStep) {
+        maxLength = 2;
+        newValue = newValue.replace('.', '');
+    }
+    // YYYY
+    if (!hasDaysStep && !hasMonthsStep && hasYearsStep) {
+        maxLength = 4;
+        newValue = newValue.replace('.', '');
+    }
+    // DD.MM.YYYY
+    if (hasDaysStep && hasMonthsStep && hasYearsStep) {
+        newValue = newValue.replace(/^(\d)\.$/g, '0$1.'); // Добавляем 0 в D.
+        newValue = newValue.replace(/^(\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.M
+        newValue = newValue.replace(/^(\d\d)\.(\d)\.$/g, '$1.0$2.'); // Добавляем 0 в DD.M.
+        newValue = newValue.replace(/^(\d\d\.\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.MM.Y
+        // + 2, так как одно соединение в виде "."
+        maxLength = 8 + 2;
+    }
+    // DD.MM
+    if (hasDaysStep && hasMonthsStep && !hasYearsStep) {
+        newValue = newValue.replace(/^(\d)\.$/g, '0$1.'); // Добавляем 0 в D.
+        newValue = newValue.replace(/^(\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.M
+        newValue = onlyOneDot(newValue); // Разрешаем только одну точку
+        // + 1, так как одно соединение в виде "."
+        maxLength = 4 + 1;
+    }
+    // DD.YYYY
+    if (hasDaysStep && !hasMonthsStep && hasYearsStep) {
+        newValue = newValue.replace(/^(\d)\.$/g, '0$1.'); // Добавляем 0 в D.
+        newValue = newValue.replace(/^(\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в DD.Y
+        newValue = onlyOneDot(newValue);
+        // + 1, так как одно соединение в виде "."
+        maxLength = 6 + 1;
+    }
+    // MM.YYYY
+    if (!hasDaysStep && hasMonthsStep && hasYearsStep) {
+        newValue = newValue.replace(/^(\d)\.$/g, '0$1.'); // Добавляем 0 в M.
+        newValue = newValue.replace(/^(\d\d)(\d)$/g, '$1.$2'); // Добавляем точку в MM.Y
+        newValue = onlyOneDot(newValue);
+        // + 1, так как одно соединение в виде "."
+        maxLength = 6 + 1;
+    }
+    if (newValue.length > maxLength) {
+        newValue = newValue.slice(0, maxLength); // Ограничиваем длину
+    }
     return newValue;
 };

package/__inner__/esm/components/DatePicker/components/DatePickerModeDate/DatePickerModeDate.js

@@ -2,44 +2,47 @@ import { __assign, __read, __rest } from "tslib";
 import React, { useEffect, useState, forwardRef, useRef } from 'react';
 import { useControlled } from '../../../../hooks/useControlled';
 import { useMultiRef } from '../../../../hooks/useMultiRef';
+import { useStoredValue } from '../../../../hooks/useStoredValue';
 import { isKeys } from '../../../../utils/isKeys';
 import { Calendar } from '../../../Calendar';
 import { Popover } from '../../../Popover';
+import { DATE_PICKER_DEFAULT_INITIAL_STEP, DATE_PICKER_DEFAULT_STEPS, } from '../../constants';
 import { cnDatePicker } from '../../index';
-import { formatDateToString, formatStringToDate, getCommonCalendarProps, getCommonPopoverProps, isInExclude, isValidDateString, isOutOfRange, useCalendarKeyboard, } from '../../utils';
+import { maskPastedDate, formatDateToString, formatStringToDate, getCommonCalendarProps, getCommonPopoverProps, isInExclude, isValidDateString, isOutOfRange, useCalendarKeyboard, } from '../../utils';
 import { DateInput, DatePickerRenderRight } from '../index';
 export var DatePickerModeDate = forwardRef(function (props, ref) {
-    var size = props.size, valueProp = props.value, label = props.label, defaultValue = props.defaultValue, openProp = props.open, onCloseProp = props.onClose, onOpenProp = props.onOpen, onInputChange = props.onInputChange, clearText = props.clearText, defaultOpen = props.defaultOpen, disabled = props.disabled, minDate = props.minDate, maxDate = props.maxDate, exclude = props.exclude, inputProps = props.inputProps, renderRight = props.renderRight, className = props.className, _a = props.calendars, calendars = _a === void 0 ? 1 : _a, disableClearButton = props.disableClearButton, onChange = props.onChange, onKeyDown = props.onKeyDown, autoFocus = props.autoFocus, disableCloseOnSelect = props.disableCloseOnSelect, popoverPropsProp = props.popoverProps, calendarPropsProp = props.calendarProps, onError = props.onError, other = __rest(props, ["size", "value", "label", "defaultValue", "open", "onClose", "onOpen", "onInputChange", "clearText", "defaultOpen", "disabled", "minDate", "maxDate", "exclude", "inputProps", "renderRight", "className", "calendars", "disableClearButton", "onChange", "onKeyDown", "autoFocus", "disableCloseOnSelect", "popoverProps", "calendarProps", "onError"]);
+    var size = props.size, valueProp = props.value, label = props.label, defaultValue = props.defaultValue, openProp = props.open, onCloseProp = props.onClose, onOpenProp = props.onOpen, onInputChange = props.onInputChange, clearText = props.clearText, defaultOpen = props.defaultOpen, disabled = props.disabled, minDate = props.minDate, maxDate = props.maxDate, exclude = props.exclude, inputProps = props.inputProps, renderRight = props.renderRight, className = props.className, _a = props.calendars, calendars = _a === void 0 ? 1 : _a, disableClearButton = props.disableClearButton, onChange = props.onChange, onKeyDown = props.onKeyDown, autoFocus = props.autoFocus, disableCloseOnSelect = props.disableCloseOnSelect, popoverPropsProp = props.popoverProps, calendarPropsProp = props.calendarProps, onError = props.onError, _b = props.steps, steps = _b === void 0 ? DATE_PICKER_DEFAULT_STEPS : _b, _c = props.initialStep, initialStep = _c === void 0 ? DATE_PICKER_DEFAULT_INITIAL_STEP : _c, other = __rest(props, ["size", "value", "label", "defaultValue", "open", "onClose", "onOpen", "onInputChange", "clearText", "defaultOpen", "disabled", "minDate", "maxDate", "exclude", "inputProps", "renderRight", "className", "calendars", "disableClearButton", "onChange", "onKeyDown", "autoFocus", "disableCloseOnSelect", "popoverProps", "calendarProps", "onError", "steps", "initialStep"]);
     var anchorRef = useRef(null);
     var calendarInnerRef = useRef(null);
     var calendarRef = useMultiRef([calendarInnerRef, calendarPropsProp === null || calendarPropsProp === void 0 ? void 0 : calendarPropsProp.ref]);
     var lastValidDate = useRef('');
-    var _b = __read(useState(null), 2), offsetDate = _b[0], setOffsetDate = _b[1];
-    var _c = __read(useControlled({
+    var _d = __read(useState(null), 2), offsetDate = _d[0], setOffsetDate = _d[1];
+    var isWasPaste = useStoredValue(false);
+    var _e = __read(useControlled({
         value: undefined,
         defaultValue: '',
         name: 'DatePicker',
         state: 'inputValue',
-    }), 2), inputValue = _c[0], setInputValue = _c[1];
-    var _d = __read(useControlled({
+    }), 2), inputValue = _e[0], setInputValue = _e[1];
+    var _f = __read(useControlled({
         value: openProp,
         defaultValue: defaultOpen,
         name: 'DatePicker',
         state: 'open',
-    }), 2), open = _d[0], setOpen = _d[1];
-    var _e = __read(useControlled({
+    }), 2), open = _f[0], setOpen = _f[1];
+    var _g = __read(useControlled({
         value: valueProp,
         defaultValue: defaultValue,
         name: 'DatePicker',
         state: 'value',
-    }), 2), value = _e[0], setValue = _e[1];
+    }), 2), value = _g[0], setValue = _g[1];
     var popoverProps = getCommonPopoverProps(__assign(__assign({}, props), { popoverProps: popoverPropsProp }));
     var calendarProps = getCommonCalendarProps(__assign(__assign({}, props), { calendarProps: calendarPropsProp, ref: calendarRef }));
     var onOffsetDateChange = function (date) {
         setOffsetDate(date);
     };
     var callOnChange = function (value) {
-        var formattedDate = formatStringToDate(value);
+        var formattedDate = formatStringToDate(value, steps);
         setValue(formattedDate);
         onChange === null || onChange === void 0 ? void 0 : onChange(formattedDate);
         lastValidDate.current = value;
@@ -47,9 +50,9 @@ export var DatePickerModeDate = forwardRef(function (props, ref) {
     var changeInputValue = function (e, value) {
         setInputValue(value);
         onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(e, value);
-        if (isValidDateString(value)) {
+        if (isValidDateString(value, steps)) {
             callOnChange(value);
-            onOffsetDateChange(formatStringToDate(value));
+            onOffsetDateChange(formatStringToDate(value, steps));
         }
     };
     var handleExited = function () {
@@ -71,7 +74,7 @@ export var DatePickerModeDate = forwardRef(function (props, ref) {
     }, [autoFocus]);
     /** Эффект — синхронизируем значение текстового поля со значением в списке */
     useEffect(function () {
-        var formattedDate = formatDateToString(value);
+        var formattedDate = formatDateToString(value, steps);
         if (formattedDate !== inputValue) {
             setInputValue(formattedDate);
             onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(null, formattedDate);
@@ -127,7 +130,7 @@ export var DatePickerModeDate = forwardRef(function (props, ref) {
         (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onBlur) === null || _a === void 0 ? void 0 : _a.call(inputProps, e);
         if (!inputValue)
             return;
-        if (!isValidDateString(inputValue))
+        if (!isValidDateString(inputValue, steps))
             changeInputValue(null, lastValidDate.current);
     };
     /** Очистка поля */
@@ -135,22 +138,31 @@ export var DatePickerModeDate = forwardRef(function (props, ref) {
         changeInputValue(null, '');
     };
     /** Событие ввода значения в текстовом поле */
-    var handleChangeInput = function (e) {
+    var handleChangeInput = function (event) {
+        var _a;
+        var value = event.target.value.trim();
+        var preparedValue = isWasPaste.current
+            ? maskPastedDate(value, steps)
+            : value;
+        changeInputValue(event, preparedValue);
+        (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _a === void 0 ? void 0 : _a.call(inputProps, event);
+        isWasPaste.current = false;
+    };
+    var handlePasteInput = function (event) {
         var _a;
-        var value = e.target.value;
-        changeInputValue(e, value);
-        (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _a === void 0 ? void 0 : _a.call(inputProps, e);
+        isWasPaste.current = true;
+        (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onPaste) === null || _a === void 0 ? void 0 : _a.call(inputProps, event);
     };
     /** Событие выбора значения из календаря */
     var handleChangeCalendar = function (date) {
-        var formattedDate = formatDateToString(date);
+        var formattedDate = formatDateToString(date, steps);
         changeInputValue(null, formattedDate);
         if (!disableCloseOnSelect)
             handleClose();
     };
     return (React.createElement(React.Fragment, null,
-        React.createElement(DateInput, __assign({ size: size, disabled: disabled, label: label }, other, { className: cnDatePicker({ mode: 'date' }, className), renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, onClear: handleClear, clearText: clearText, hasValue: !!value, renderRight: renderRight, disableClearButton: disableClearButton }), value: inputValue, inputProps: __assign(__assign({ autoComplete: 'off' }, inputProps), { onBlur: handleBlur, onClick: handleClickOnInput, onChange: handleChangeInput }), bodyProps: { ref: anchorRef, 'aria-expanded': open }, onKeyDown: handleKeyDown, ref: ref })),
+        React.createElement(DateInput, __assign({ size: size, disabled: disabled, label: label }, other, { steps: steps, className: cnDatePicker({ mode: 'date' }, className), renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, onClear: handleClear, clearText: clearText, hasValue: !!value, renderRight: renderRight, disableClearButton: disableClearButton }), value: inputValue, inputProps: __assign(__assign({ autoComplete: 'off' }, inputProps), { onBlur: handleBlur, onClick: handleClickOnInput, onChange: handleChangeInput, onPaste: handlePasteInput }), bodyProps: { ref: anchorRef, 'aria-expanded': open }, onKeyDown: handleKeyDown, ref: ref })),
         React.createElement(Popover, __assign({ open: open, anchorRef: anchorRef, onClose: handleClose }, popoverProps, { disableEnforceFocus: !enableEnforceFocus, onExited: handleExited }),
-            React.createElement(Calendar, __assign({ calendars: calendars }, calendarProps, { mode: "single", value: value || null, offsetDate: offsetDate, onOffsetDateChange: onOffsetDateChange, onChange: handleChangeCalendar })))));
+            React.createElement(Calendar, __assign({ calendars: calendars }, calendarProps, { steps: steps, initialStep: initialStep, mode: "single", value: value || null, offsetDate: offsetDate, onOffsetDateChange: onOffsetDateChange, onChange: handleChangeCalendar })))));
 });
 DatePickerModeDate.displayName = 'DatePickerModeDate';

package/__inner__/esm/components/DatePicker/components/DatePickerModeDateRange/DatePickerModeDateRange.js

@@ -5,13 +5,15 @@ import { useBoolean } from '../../../../hooks/useBoolean';
 import { useControlled } from '../../../../hooks/useControlled';
 import { useMultiRef } from '../../../../hooks/useMultiRef';
 import { useMutableRef } from '../../../../hooks/useMutableRef';
-import { isKeys } from '../../../../utils/isKeys';
+import { useStoredValue } from '../../../../hooks/useStoredValue';
+import { isKeys } from '../../../../utils';
 import { Calendar } from '../../../Calendar';
 import { FieldHint } from '../../../FieldHint';
 import { Popover } from '../../../Popover';
 import { Stack } from '../../../Stack';
+import { DATE_PICKER_DEFAULT_INITIAL_STEP, DATE_PICKER_DEFAULT_STEPS, } from '../../constants';
 import { cnDatePicker } from '../../index';
-import { formatDateToString, formatStringToDate, getCommonCalendarProps, getCommonPopoverProps, isValidDateString, useCalendarKeyboard, } from '../../utils';
+import { maskPastedDate, formatDateToString, formatStringToDate, getCommonCalendarProps, getCommonPopoverProps, isValidDateString, useCalendarKeyboard, } from '../../utils';
 import { DateInput, DatePickerRenderRight } from '../index';
 import { formatDateForCalendar, getOffsetDateInRange, getValueForDoubleProp, } from './utils';
 export var DatePickerModeDateRange = forwardRef(function (props, ref) {
@@ -19,13 +21,14 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     minDate = props.minDate, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    maxDate = props.maxDate, other = __rest(props, ["size", "error", "open", "label", "onKeyDown", "onInputChange", "renderLeft", "renderRight", "required", "fullWidth", "placeholder", "hint", "disableStroke", "hintProps", "onChange", "labelProps", "popoverProps", "calendarProps", "defaultOpen", "onClose", "defaultValue", "value", "inputProps", "disabled", "className", "calendars", "onError", "clearText", "disableCloseOnSelect", "disableClearButton", "onOpen", "fieldsProps", "minDate", "maxDate"]);
-    var _b = __read(getValueForDoubleProp(label), 2), labelFrom = _b[0], labelTo = _b[1];
-    var _c = __read(getValueForDoubleProp(renderLeft), 2), renderLeftFrom = _c[0], renderLeftTo = _c[1];
-    var _d = __read(getValueForDoubleProp(renderRight), 2), renderRightFrom = _d[0], renderRightTo = _d[1];
-    var _e = __read(getValueForDoubleProp(placeholder), 2), placeholderFrom = _e[0], placeholderTo = _e[1];
-    var _f = __read(getValueForDoubleProp(inputProps), 2), inputPropsFrom = _f[0], inputPropsTo = _f[1];
-    var _g = __read(getValueForDoubleProp(labelProps), 2), labelPropsFrom = _g[0], labelPropsTo = _g[1];
+    maxDate = props.maxDate, _b = props.steps, steps = _b === void 0 ? DATE_PICKER_DEFAULT_STEPS : _b, _c = props.initialStep, initialStep = _c === void 0 ? DATE_PICKER_DEFAULT_INITIAL_STEP : _c, other = __rest(props, ["size", "error", "open", "label", "onKeyDown", "onInputChange", "renderLeft", "renderRight", "required", "fullWidth", "placeholder", "hint", "disableStroke", "hintProps", "onChange", "labelProps", "popoverProps", "calendarProps", "defaultOpen", "onClose", "defaultValue", "value", "inputProps", "disabled", "className", "calendars", "onError", "clearText", "disableCloseOnSelect", "disableClearButton", "onOpen", "fieldsProps", "minDate", "maxDate", "steps", "initialStep"]);
+    var _d = __read(getValueForDoubleProp(label), 2), labelFrom = _d[0], labelTo = _d[1];
+    var _e = __read(getValueForDoubleProp(renderLeft), 2), renderLeftFrom = _e[0], renderLeftTo = _e[1];
+    var _f = __read(getValueForDoubleProp(renderRight), 2), renderRightFrom = _f[0], renderRightTo = _f[1];
+    var _g = __read(getValueForDoubleProp(placeholder), 2), placeholderFrom = _g[0], placeholderTo = _g[1];
+    var _h = __read(getValueForDoubleProp(inputProps), 2), inputPropsFrom = _h[0], inputPropsTo = _h[1];
+    var _j = __read(getValueForDoubleProp(labelProps), 2), labelPropsFrom = _j[0], labelPropsTo = _j[1];
+    var isWasPaste = useStoredValue(false);
     var containerRef = useRef(null);
     var anchorRef = useRef(null);
     var calendarInnerRef = useRef(null);
@@ -33,32 +36,32 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     var calendarRef = useMultiRef([calendarInnerRef, calendarPropsProp === null || calendarPropsProp === void 0 ? void 0 : calendarPropsProp.ref]);
     var fieldsRef = useMultiRef([anchorRef, fieldsProps === null || fieldsProps === void 0 ? void 0 : fieldsProps.ref]);
     var rootRef = useMultiRef([ref, containerRef]);
-    var _h = __read(useState(null), 2), offsetDate = _h[0], setOffsetDate = _h[1];
-    var _j = __read(useState(null), 2), calendarPeriod = _j[0], setCalendarPeriod = _j[1];
+    var _k = __read(useState(null), 2), offsetDate = _k[0], setOffsetDate = _k[1];
+    var _l = __read(useState(null), 2), calendarPeriod = _l[0], setCalendarPeriod = _l[1];
     var savedCalendarPeriod = useMutableRef(calendarPeriod);
     var lastValidDate = useRef(['', '']);
-    var _k = __read(useBoolean(false), 2), focusInputFrom = _k[0], setFocusInputFrom = _k[1];
-    var _l = __read(useBoolean(false), 2), focusInputTo = _l[0], setFocusInputTo = _l[1];
-    var _m = __read(useControlled({
+    var _m = __read(useBoolean(false), 2), focusInputFrom = _m[0], setFocusInputFrom = _m[1];
+    var _o = __read(useBoolean(false), 2), focusInputTo = _o[0], setFocusInputTo = _o[1];
+    var _p = __read(useControlled({
         value: valueProp,
         defaultValue: defaultValue,
         name: 'DatePicker',
         state: 'value',
-    }), 2), value = _m[0], setValue = _m[1];
-    var _o = __read(useControlled({
+    }), 2), value = _p[0], setValue = _p[1];
+    var _q = __read(useControlled({
         value: undefined,
         defaultValue: [],
         name: 'DatePicker',
         state: 'inputValue',
-    }), 2), inputValue = _o[0], setInputValue = _o[1];
-    var _p = __read(value || [], 2), valueFrom = _p[0], valueTo = _p[1];
-    var _q = __read(inputValue || [], 2), _r = _q[0], inputValueFrom = _r === void 0 ? '' : _r, _s = _q[1], inputValueTo = _s === void 0 ? '' : _s;
-    var _t = __read(useControlled({
+    }), 2), inputValue = _q[0], setInputValue = _q[1];
+    var _r = __read(value || [], 2), valueFrom = _r[0], valueTo = _r[1];
+    var _s = __read(inputValue || [], 2), _t = _s[0], inputValueFrom = _t === void 0 ? '' : _t, _u = _s[1], inputValueTo = _u === void 0 ? '' : _u;
+    var _v = __read(useControlled({
         value: openProp,
         defaultValue: defaultOpen,
         name: 'DatePicker',
         state: 'open',
-    }), 2), open = _t[0], setOpen = _t[1];
+    }), 2), open = _v[0], setOpen = _v[1];
     var popoverProps = getCommonPopoverProps(__assign(__assign({}, props), { popoverProps: popoverPropsProp }));
     var calendarProps = getCommonCalendarProps(__assign(__assign({}, props), { calendarProps: calendarPropsProp, ref: calendarRef }));
     var onOffsetDateChange = function (date) {
@@ -76,8 +79,8 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     var disableEnforceFocus = !enableEnforceFocusTo;
     /** Эффект — синхронизируем значение текстового поля со значением в списке */
     useEffect(function () {
-        var formattedDateFrom = formatDateToString(valueFrom);
-        var formattedDateTo = formatDateToString(valueTo);
+        var formattedDateFrom = formatDateToString(valueFrom, steps);
+        var formattedDateTo = formatDateToString(valueTo, steps);
         if (formattedDateFrom !== inputValueFrom ||
             formattedDateTo !== inputValueTo) {
             setInputValue([formattedDateFrom, formattedDateTo]);
@@ -93,13 +96,13 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     }, [onError]);
     /** Calendar offset when interacting with inputs */
     useEffect(function () {
-        if (!isValidDateString(inputValueFrom) ||
-            !isValidDateString(inputValueTo) ||
+        if (!isValidDateString(inputValueFrom, steps) ||
+            !isValidDateString(inputValueTo, steps) ||
             !savedCalendarPeriod.current)
             return;
         if ((focusInputFrom || focusInputTo) && open && (calendarPeriod === null || calendarPeriod === void 0 ? void 0 : calendarPeriod.length)) {
-            var firstDate = formatStringToDate(inputValueFrom);
-            var secondDate = formatStringToDate(inputValueTo);
+            var firstDate = formatStringToDate(inputValueFrom, steps);
+            var secondDate = formatStringToDate(inputValueTo, steps);
             var offset = getOffsetDateInRange(__assign(__assign({}, (focusInputTo && { type: 'end' })), { calendarPeriod: savedCalendarPeriod.current, value: [firstDate || undefined, secondDate || undefined] }));
             setOffsetDate(offset);
         }
@@ -125,8 +128,8 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     };
     var callOnChange = function (value) {
         var _a = __read(value || [], 2), dateFrom = _a[0], dateTo = _a[1];
-        var formattedDateFrom = formatStringToDate(dateFrom) || undefined;
-        var formattedDateTo = formatStringToDate(dateTo) || undefined;
+        var formattedDateFrom = formatStringToDate(dateFrom, steps) || undefined;
+        var formattedDateTo = formatStringToDate(dateTo, steps) || undefined;
         if (formattedDateTo &&
             formattedDateFrom &&
             (formattedDateFrom === null || formattedDateFrom === void 0 ? void 0 : formattedDateFrom.getTime()) > (formattedDateTo === null || formattedDateTo === void 0 ? void 0 : formattedDateTo.getTime())) {
@@ -141,7 +144,8 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
         setInputValue(value);
         onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(e, value);
         var _a = __read(value || [], 2), valueFrom = _a[0], valueTo = _a[1];
-        if (isValidDateString(valueFrom) && isValidDateString(valueTo))
+        if (isValidDateString(valueFrom, steps) &&
+            isValidDateString(valueTo, steps))
             callOnChange([valueFrom, valueTo]);
     };
     var handleExited = function () {
@@ -150,12 +154,20 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
         setCalendarPeriod(null);
         (_a = popoverProps === null || popoverProps === void 0 ? void 0 : popoverProps.onExited) === null || _a === void 0 ? void 0 : _a.call(popoverProps);
     };
+    var prepareInputValue = function (value) {
+        var trimmed = value.trim();
+        if (isWasPaste.current) {
+            return maskPastedDate(trimmed, steps);
+        }
+        return trimmed;
+    };
     /** Событие ввода значения в текстовом поле */
-    var handleChangeInputFrom = function (e) {
+    var handleChangeInputFrom = function (event) {
         var _a;
-        var value = e.target.value;
-        (_a = inputPropsFrom === null || inputPropsFrom === void 0 ? void 0 : inputPropsFrom.onChange) === null || _a === void 0 ? void 0 : _a.call(inputPropsFrom, e);
-        changeInputValue(e, [value, inputValueTo]);
+        var value = prepareInputValue(event.target.value);
+        (_a = inputPropsFrom === null || inputPropsFrom === void 0 ? void 0 : inputPropsFrom.onChange) === null || _a === void 0 ? void 0 : _a.call(inputPropsFrom, event);
+        changeInputValue(event, [value, inputValueTo]);
+        isWasPaste.current = false;
     };
     /** Очистка поля */
     var handleClear = function (type) { return function () {
@@ -177,7 +189,7 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
         setFocusInputFrom.off();
         if (!inputValue)
             return;
-        if (!isValidDateString(inputValueFrom)) {
+        if (!isValidDateString(inputValueFrom, steps)) {
             changeInputValue(null, lastValidDate.current);
         }
     };
@@ -187,15 +199,26 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
         setFocusInputTo.off();
         if (!inputValue)
             return;
-        if (!isValidDateString(inputValueTo))
+        if (!isValidDateString(inputValueTo, steps))
             changeInputValue(null, lastValidDate.current);
     };
     /** Событие ввода значения в текстовом поле */
-    var handleChangeInputTo = function (e) {
+    var handleChangeInputTo = function (event) {
+        var _a;
+        var value = prepareInputValue(event.target.value);
+        (_a = inputPropsTo === null || inputPropsTo === void 0 ? void 0 : inputPropsTo.onChange) === null || _a === void 0 ? void 0 : _a.call(inputPropsTo, event);
+        changeInputValue(event, [inputValueFrom, value]);
+        isWasPaste.current = false;
+    };
+    var handlePasteInputFrom = function (event) {
+        var _a;
+        isWasPaste.current = true;
+        (_a = inputPropsFrom === null || inputPropsFrom === void 0 ? void 0 : inputPropsFrom.onPaste) === null || _a === void 0 ? void 0 : _a.call(inputPropsFrom, event);
+    };
+    var handlePasteInputTo = function (event) {
         var _a;
-        var value = e.target.value;
-        (_a = inputPropsTo === null || inputPropsTo === void 0 ? void 0 : inputPropsTo.onChange) === null || _a === void 0 ? void 0 : _a.call(inputPropsTo, e);
-        changeInputValue(e, [inputValueFrom, value]);
+        isWasPaste.current = true;
+        (_a = inputPropsTo === null || inputPropsTo === void 0 ? void 0 : inputPropsTo.onPaste) === null || _a === void 0 ? void 0 : _a.call(inputPropsTo, event);
     };
     /** Открытие списка по клику на текстовом поле */
     var handleClickOnInputFrom = function (e) {
@@ -221,8 +244,8 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
     var handleChangeCalendar = function (date) {
         var _a = __read(date || [], 2), dateFrom = _a[0], dateTo = _a[1];
         var formattedDate = [
-            formatDateToString(dateFrom),
-            formatDateToString(dateTo),
+            formatDateToString(dateFrom, steps),
+            formatDateToString(dateTo, steps),
         ];
         changeInputValue(null, formattedDate);
         if (!disableCloseOnSelect && dateFrom && dateTo)
@@ -238,10 +261,10 @@ export var DatePickerModeDateRange = forwardRef(function (props, ref) {
             disableStroke: disableStroke,
         }, [className]) }, other, { ref: rootRef }),
         React.createElement(Stack, __assign({ gap: "l", className: cnDatePicker('Fields', [fieldsProps === null || fieldsProps === void 0 ? void 0 : fieldsProps.className]) }, fieldsProps, { ref: fieldsRef }),
-            React.createElement(DateInput, { size: size, error: error, label: labelFrom, required: required, disabled: disabled, value: inputValueFrom, onKeyDown: handleKeyDown, renderLeft: renderLeftFrom, labelProps: labelPropsFrom, disableStroke: disableStroke, placeholder: placeholderFrom, renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, hasValue: !!valueFrom, clearText: clearText, renderRight: renderRightFrom, onClear: handleClear('from'), disableClearButton: disableClearButton }), inputProps: __assign(__assign({ autoComplete: 'off' }, inputPropsFrom), { onBlur: handleBlurInputFrom, onFocus: handleFocusInputFrom, onClick: handleClickOnInputFrom, onChange: handleChangeInputFrom }), "data-testid": "date-input-from", bodyProps: { 'aria-expanded': open } }),
-            React.createElement(DateInput, { size: size, error: error, label: labelTo, required: required, disabled: disabled, value: inputValueTo, onKeyDown: handleKeyDown, renderLeft: renderLeftTo, labelProps: labelPropsTo, placeholder: placeholderTo, disableStroke: disableStroke, renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, hasValue: !!valueTo, clearText: clearText, renderRight: renderRightTo, onClear: handleClear('to'), disableClearButton: disableClearButton }), inputProps: __assign(__assign({ autoComplete: 'off' }, inputPropsTo), { onBlur: handleBlurInputTo, onFocus: handleFocusInputTo, onClick: handleClickOnInputTo, onChange: handleChangeInputTo }), "data-testid": "date-input-to", bodyProps: { ref: dateInputToRef, 'aria-expanded': open } })),
+            React.createElement(DateInput, { size: size, error: error, label: labelFrom, required: required, disabled: disabled, value: inputValueFrom, onKeyDown: handleKeyDown, renderLeft: renderLeftFrom, labelProps: labelPropsFrom, disableStroke: disableStroke, steps: steps, placeholder: placeholderFrom, renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, hasValue: !!valueFrom, clearText: clearText, renderRight: renderRightFrom, onClear: handleClear('from'), disableClearButton: disableClearButton }), inputProps: __assign(__assign({ autoComplete: 'off' }, inputPropsFrom), { onBlur: handleBlurInputFrom, onFocus: handleFocusInputFrom, onClick: handleClickOnInputFrom, onChange: handleChangeInputFrom, onPaste: handlePasteInputFrom }), "data-testid": "date-input-from", bodyProps: { 'aria-expanded': open } }),
+            React.createElement(DateInput, { size: size, error: error, label: labelTo, required: required, disabled: disabled, value: inputValueTo, onKeyDown: handleKeyDown, renderLeft: renderLeftTo, labelProps: labelPropsTo, placeholder: placeholderTo, disableStroke: disableStroke, steps: steps, renderRight: React.createElement(DatePickerRenderRight, { size: size, open: open, hasValue: !!valueTo, clearText: clearText, renderRight: renderRightTo, onClear: handleClear('to'), disableClearButton: disableClearButton }), inputProps: __assign(__assign({ autoComplete: 'off' }, inputPropsTo), { onBlur: handleBlurInputTo, onFocus: handleFocusInputTo, onClick: handleClickOnInputTo, onChange: handleChangeInputTo, onPaste: handlePasteInputTo }), "data-testid": "date-input-to", bodyProps: { ref: dateInputToRef, 'aria-expanded': open } })),
         React.createElement(FieldHint, __assign({ size: size, error: error, disabled: disabled }, hintProps), hint),
         React.createElement(Popover, __assign({ open: open, anchorRef: anchorRef, onClose: handleClose }, popoverProps, { onExited: handleExited, ignoreClickOutsideRefs: [containerRef], disableEnforceFocus: disableEnforceFocus }),
-            React.createElement(Calendar, __assign({ calendars: calendars }, calendarProps, { mode: "range", offsetDate: offsetDate, onChange: handleChangeCalendar, value: formatDateForCalendar(value), onCalendarsChange: onCalendarsChange, onOffsetDateChange: onOffsetDateChange })))));
+            React.createElement(Calendar, __assign({ calendars: calendars }, calendarProps, { initialStep: initialStep, steps: steps, mode: "range", offsetDate: offsetDate, onChange: handleChangeCalendar, value: formatDateForCalendar(value), onCalendarsChange: onCalendarsChange, onOffsetDateChange: onOffsetDateChange })))));
 });
 DatePickerModeDateRange.displayName = 'DatePickerModeDateRange';

package/__inner__/esm/components/DatePicker/constants.d.ts

@@ -1,2 +1,4 @@
 export declare const DATE_PICKER_DEFAULT_SIZE = "m";
 export declare const DATE_PICKER_DEFAULT_MODE = "date";
+export declare const DATE_PICKER_DEFAULT_STEPS: ("days" | "months" | "years")[];
+export declare const DATE_PICKER_DEFAULT_INITIAL_STEP = "days";

package/__inner__/esm/components/DatePicker/constants.js

@@ -1,2 +1,5 @@
+import { CALENDAR_DEFAULT_INITIAL_STEP, CALENDAR_DEFAULT_STEPS, } from '../Calendar';
 export var DATE_PICKER_DEFAULT_SIZE = 'm';
 export var DATE_PICKER_DEFAULT_MODE = 'date';
+export var DATE_PICKER_DEFAULT_STEPS = CALENDAR_DEFAULT_STEPS;
+export var DATE_PICKER_DEFAULT_INITIAL_STEP = CALENDAR_DEFAULT_INITIAL_STEP;