@consta/uikit 3.23.1 → 3.24.0

package/__internal__/src/components/DatePickerCanary/DatePickerTypeMonth/DatePickerTypeMonth.js

@@ -1,19 +1,29 @@
 import { __assign, __read, __rest } from "tslib";
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
-import { addMonths, startOfYear } from 'date-fns';
+import React, { forwardRef, useEffect, useRef } from 'react';
+import addYears from 'date-fns/addYears';
+import startOfYear from 'date-fns/startOfYear';
 import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
 import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { setRef } from '../../../utils/setRef';
 import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeMonth } from '../DatePickerFieldTypeMonth/DatePickerFieldTypeMonth';
+import { getDropdownZIndex } from '../helpers';
+import { datePickerPropDateTimeViewDefault } from '../types';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeMonth = forwardRef(function (props, ref) {
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, style = props.style, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "style"]);
+    var events = props.events, _a = props.dateTimeView, dateTimeView = _a === void 0 ? datePickerPropDateTimeViewDefault : _a, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
     var fieldRef = useRef(null);
     var calendarRef = useRef(null);
-    var _a = __read(useFlag(false), 2), calendarVisible = _a[0], setCalendarVisible = _a[1];
-    var _b = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _b[0], setCurrentVisibleDate = _b[1];
-    var _c = __read(useState(), 2), calendarVisibleDate = _c[0], setCalendarVisibleDate = _c[1];
+    var _b = __read(useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = __read(useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfYear,
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _c[0], setCurrentVisibleDate = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -24,35 +34,31 @@ export var DatePickerTypeMonth = forwardRef(function (props, ref) {
         }
     }, [ref, fieldRef]);
     useEffect(function () {
-        if (props.value && props.dateTimeView === 'classic' && calendarVisibleDate) {
+        if (props.value && dateTimeView === 'classic' && currentVisibleDate) {
             var newVisibleDate = startOfYear(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime()) {
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (props.value && props.dateTimeView !== 'classic' && calendarVisibleDate) {
+        if (props.value && dateTimeView !== 'classic' && currentVisibleDate) {
             var newVisibleDate = startOfYear(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== addMonths(calendarVisibleDate, 1).getTime()) {
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
+                newVisibleDate.getTime() !== addYears(currentVisibleDate, 1).getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
         }
     }, [props.value]);
-    var handleClose = function () {
-        setCalendarVisible.off();
-        setCurrentVisibleDate(props.value ? undefined : currentVisibleDateProp);
-    };
     useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: handleClose
+        handler: setCalendarVisible.off
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeMonth, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, style: style })),
+        React.createElement(DatePickerFieldTypeMonth, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler })),
         React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "month", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: function (params) {
                 var _a;
                 (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, params);
-                handleClose();
-            }, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined, onChangeCurrentVisibleDate: setCalendarVisibleDate })));
+                setCalendarVisible.off();
+            }, renderAdditionalControls: renderAdditionalControls, onChangeCurrentVisibleDate: setCurrentVisibleDate, zIndex: getDropdownZIndex(props.style) })));
 });

package/__internal__/src/components/DatePickerCanary/DatePickerTypeMonthRange/DatePickerTypeMonthRange.js

@@ -1,22 +1,24 @@
 import { __assign, __read, __rest } from "tslib";
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
-import { addMonths, startOfYear } from 'date-fns';
+import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
+import addYears from 'date-fns/addYears';
+import startOfYear from 'date-fns/startOfYear';
 import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
 import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeMonthRange } from '../DatePickerFieldTypeMonthRange/DatePickerFieldTypeMonthRange';
-import { normalizeRangeValue } from '../helpers';
+import { getDropdownZIndex, normalizeRangeValue } from '../helpers';
+import { datePickerPropDateTimeViewDefault } from '../types';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeMonthRange = forwardRef(function (props, ref) {
     var _a, _b, _c, _d;
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, style = props.style, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, inputRef = props.inputRef, name = props.name, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
+    var events = props.events, _e = props.dateTimeView, dateTimeView = _e === void 0 ? datePickerPropDateTimeViewDefault : _e, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, inputRef = props.inputRef, name = props.name, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
     var startFieldRef = useRef(null);
     var endFieldRef = useRef(null);
     var startFieldInputRef = useRef(null);
     var endFieldInputRef = useRef(null);
     var calendarRef = useRef(null);
-    var _e = __read(useState(false), 2), fieldFocused = _e[0], setFieldFocused = _e[1];
+    var _f = __read(useState(false), 2), fieldFocused = _f[0], setFieldFocused = _f[1];
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
@@ -29,8 +31,16 @@ export var DatePickerTypeMonthRange = forwardRef(function (props, ref) {
             (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = __read(useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
+    var _g = __read(useFlag(false), 2), calendarVisible = _g[0], setCalendarVisible = _g[1];
+    var _h = __read(useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfYear,
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _h[0], setCurrentVisibleDate = _h[1];
     var startFieldOnBlurHandler = function (e) { var _a; return Array.isArray(onBlur) ? (_a = onBlur[0]) === null || _a === void 0 ? void 0 : _a.call(onBlur, e) : onBlur === null || onBlur === void 0 ? void 0 : onBlur(e); };
     var endFieldOnBlurHandler = function (e) { var _a; return Array.isArray(onBlur) ? (_a = onBlur[1]) === null || _a === void 0 ? void 0 : _a.call(onBlur, e) : onBlur === null || onBlur === void 0 ? void 0 : onBlur(e); };
     var startFieldOnFocusHandler = function (e) {
@@ -47,58 +57,50 @@ export var DatePickerTypeMonthRange = forwardRef(function (props, ref) {
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && props.dateTimeView === 'classic' && startFocused) {
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && dateTimeView === 'classic' && startFocused) {
             var newVisibleDate = startOfYear(props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && props.dateTimeView !== 'classic' && startFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && dateTimeView !== 'classic' && startFocused) {
             var newVisibleDate = startOfYear(props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
-                    (currentVisibleDate && addMonths(currentVisibleDate, 1).getTime())) {
+                    (currentVisibleDate && addYears(currentVisibleDate, 1).getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
-            return;
-        }
-        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[0]) && startFocused) {
-            setCurrentVisibleDate(currentVisibleDateProp);
         }
     }, [(_b = (_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.getTime(), calendarVisible, startFocused]);
     useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && props.dateTimeView === 'classic' && endFocused) {
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && dateTimeView === 'classic' && endFocused) {
             var newVisibleDate = startOfYear(props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && props.dateTimeView !== 'classic' && endFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && dateTimeView !== 'classic' && endFocused) {
             var newVisibleDate = startOfYear(props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
-                    (currentVisibleDate && addMonths(currentVisibleDate, 1).getTime())) {
-                setCurrentVisibleDate(addMonths(newVisibleDate, -1));
+                    (currentVisibleDate && addYears(currentVisibleDate, 1).getTime())) {
+                setCurrentVisibleDate(addYears(newVisibleDate, -1));
             }
-            return;
-        }
-        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) && endFocused) {
-            setCurrentVisibleDate(currentVisibleDateProp);
         }
     }, [(_d = (_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.getTime(), calendarVisible, endFocused]);
     useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [startFieldRef, endFieldRef, calendarRef],
-        handler: function () {
+        handler: useCallback(function () {
             setFieldFocused(false);
             setCalendarVisible.off();
-        }
+        }, [])
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeMonthRange, __assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef([endFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[1]]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[0] : leftSide, startFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[0] : undefined, endFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[1] : undefined, endFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[1] : rightSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused, startFieldName: Array.isArray(name) ? name[0] : name + "_start", endFieldName: Array.isArray(name) ? name[1] : name + "_end" })),
-        React.createElement(DatePickerDropdown, { type: "month", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
+        React.createElement(DatePickerFieldTypeMonthRange, __assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef([endFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[1]]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[0] : leftSide, startFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[0] : undefined, endFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[1] : undefined, endFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[1] : rightSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused, startFieldName: Array.isArray(name) ? name[0] : name + "_start", endFieldName: Array.isArray(name) ? name[1] : name + "_end" })),
+        React.createElement(DatePickerDropdown, { type: "month", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, zIndex: getDropdownZIndex(props.style) })));
 });

package/__internal__/src/components/DatePickerCanary/DatePickerTypeTime/DatePickerTypeTime.js

@@ -5,13 +5,14 @@ import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { setRef } from '../../../utils/setRef';
 import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeTime } from '../DatePickerFieldTypeTime/DatePickerFieldTypeTime';
-import { datePickerPropFormatTypeDateTime, getMultiplicityTime } from '../helpers';
+import { datePickerPropFormatTypeDateTime, getDropdownZIndex, getMultiplicityTime, } from '../helpers';
+import { datePickerPropDateTimeViewDefault } from '../types';
 export var DatePickerTypeTime = forwardRef(function (props, ref) {
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, multiplicityHoursProp = props.multiplicityHours, multiplicityMinutesProp = props.multiplicityMinutes, multiplicitySecondsProp = props.multiplicitySeconds, renderAdditionalControls = props.renderAdditionalControls, style = props.style, currentVisibleDate = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "style", "currentVisibleDate", "onChangeCurrentVisibleDate"]);
-    var _a = __read(getMultiplicityTime(otherProps.format || datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _a[0], multiplicityMinutes = _a[1], multiplicitySeconds = _a[2];
+    var events = props.events, _a = props.dateTimeView, dateTimeView = _a === void 0 ? datePickerPropDateTimeViewDefault : _a, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, multiplicityHoursProp = props.multiplicityHours, multiplicityMinutesProp = props.multiplicityMinutes, multiplicitySecondsProp = props.multiplicitySeconds, renderAdditionalControls = props.renderAdditionalControls, currentVisibleDate = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "currentVisibleDate", "onChangeCurrentVisibleDate"]);
+    var _b = __read(getMultiplicityTime(otherProps.format || datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _b[0], multiplicityMinutes = _b[1], multiplicitySeconds = _b[2];
     var fieldRef = useRef(null);
     var calendarRef = useRef(null);
-    var _b = __read(useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = __read(useFlag(false), 2), calendarVisible = _c[0], setCalendarVisible = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -24,9 +25,9 @@ export var DatePickerTypeTime = forwardRef(function (props, ref) {
     useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: function () { return setCalendarVisible.off(); }
+        handler: setCalendarVisible.off
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeTime, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, style: style })),
-        React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "time", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: props.onChange, renderAdditionalControls: renderAdditionalControls, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
+        React.createElement(DatePickerFieldTypeTime, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes })),
+        React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "time", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: props.onChange, renderAdditionalControls: renderAdditionalControls, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, zIndex: getDropdownZIndex(props.style) })));
 });

package/__internal__/src/components/DatePickerCanary/DatePickerTypeYear/DatePickerTypeYear.js

@@ -1,19 +1,28 @@
 import { __assign, __read, __rest } from "tslib";
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useRef } from 'react';
 import { addYears, startOfDecade } from 'date-fns';
 import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
 import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { setRef } from '../../../utils/setRef';
 import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeYear } from '../DatePickerFieldTypeYear/DatePickerFieldTypeYear';
+import { getDropdownZIndex } from '../helpers';
+import { datePickerPropDateTimeViewDefault } from '../types';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeYear = forwardRef(function (props, ref) {
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, style = props.style, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "style"]);
+    var events = props.events, _a = props.dateTimeView, dateTimeView = _a === void 0 ? datePickerPropDateTimeViewDefault : _a, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
     var fieldRef = useRef(null);
     var calendarRef = useRef(null);
-    var _a = __read(useFlag(false), 2), calendarVisible = _a[0], setCalendarVisible = _a[1];
-    var _b = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _b[0], setCurrentVisibleDate = _b[1];
-    var _c = __read(useState(), 2), calendarVisibleDate = _c[0], setCalendarVisibleDate = _c[1];
+    var _b = __read(useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = __read(useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfDecade,
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _c[0], setCurrentVisibleDate = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -24,35 +33,31 @@ export var DatePickerTypeYear = forwardRef(function (props, ref) {
         }
     }, [ref, fieldRef]);
     useEffect(function () {
-        if (props.value && props.dateTimeView === 'classic' && calendarVisibleDate) {
+        if (props.value && dateTimeView === 'classic' && currentVisibleDate) {
             var newVisibleDate = startOfDecade(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime()) {
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (props.value && props.dateTimeView !== 'classic' && calendarVisibleDate) {
+        if (props.value && dateTimeView !== 'classic' && currentVisibleDate) {
             var newVisibleDate = startOfDecade(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== addYears(calendarVisibleDate, 10).getTime()) {
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
+                newVisibleDate.getTime() !== addYears(currentVisibleDate, 10).getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
         }
     }, [props.value]);
-    var handleClose = function () {
-        setCalendarVisible.off();
-        setCurrentVisibleDate(props.value ? undefined : currentVisibleDateProp);
-    };
     useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: handleClose
+        handler: setCalendarVisible.off
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeYear, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, style: style })),
+        React.createElement(DatePickerFieldTypeYear, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler })),
         React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "year", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: function (params) {
                 var _a;
                 (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, params);
-                handleClose();
-            }, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined, onChangeCurrentVisibleDate: setCalendarVisibleDate })));
+                setCalendarVisible.off();
+            }, renderAdditionalControls: renderAdditionalControls, zIndex: getDropdownZIndex(props.style), onChangeCurrentVisibleDate: setCurrentVisibleDate })));
 });

package/__internal__/src/components/DatePickerCanary/DatePickerTypeYearRange/DatePickerTypeYearRange.js

@@ -6,17 +6,18 @@ import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeYearRange } from '../DatePickerFieldTypeYearRange/DatePickerFieldTypeYearRange';
-import { normalizeRangeValue } from '../helpers';
+import { getDropdownZIndex, normalizeRangeValue } from '../helpers';
+import { datePickerPropDateTimeViewDefault } from '../types';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeYearRange = forwardRef(function (props, ref) {
     var _a, _b, _c, _d;
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, style = props.style, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, inputRef = props.inputRef, name = props.name, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
+    var events = props.events, _e = props.dateTimeView, dateTimeView = _e === void 0 ? datePickerPropDateTimeViewDefault : _e, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, inputRef = props.inputRef, name = props.name, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
     var startFieldRef = useRef(null);
     var endFieldRef = useRef(null);
     var startFieldInputRef = useRef(null);
     var endFieldInputRef = useRef(null);
     var calendarRef = useRef(null);
-    var _e = __read(useState(false), 2), fieldFocused = _e[0], setFieldFocused = _e[1];
+    var _f = __read(useState(false), 2), fieldFocused = _f[0], setFieldFocused = _f[1];
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
@@ -29,8 +30,16 @@ export var DatePickerTypeYearRange = forwardRef(function (props, ref) {
             (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = __read(useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
+    var _g = __read(useFlag(false), 2), calendarVisible = _g[0], setCalendarVisible = _g[1];
+    var _h = __read(useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfDecade,
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _h[0], setCurrentVisibleDate = _h[1];
     var startFieldOnBlurHandler = function (e) { var _a; return Array.isArray(onBlur) ? (_a = onBlur[0]) === null || _a === void 0 ? void 0 : _a.call(onBlur, e) : onBlur === null || onBlur === void 0 ? void 0 : onBlur(e); };
     var endFieldOnBlurHandler = function (e) { var _a; return Array.isArray(onBlur) ? (_a = onBlur[1]) === null || _a === void 0 ? void 0 : _a.call(onBlur, e) : onBlur === null || onBlur === void 0 ? void 0 : onBlur(e); };
     var startFieldOnFocusHandler = function (e) {
@@ -47,47 +56,39 @@ export var DatePickerTypeYearRange = forwardRef(function (props, ref) {
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && props.dateTimeView === 'classic' && startFocused) {
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && dateTimeView === 'classic' && startFocused) {
             var newVisibleDate = startOfDecade(props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && props.dateTimeView !== 'classic' && startFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && dateTimeView !== 'classic' && startFocused) {
             var newVisibleDate = startOfDecade(props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
                     (currentVisibleDate && addYears(currentVisibleDate, 10).getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
-            return;
-        }
-        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[0]) && startFocused) {
-            setCurrentVisibleDate(currentVisibleDateProp);
         }
     }, [(_b = (_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.getTime(), calendarVisible, startFocused]);
     useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && props.dateTimeView === 'classic' && endFocused) {
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && dateTimeView === 'classic' && endFocused) {
             var newVisibleDate = startOfDecade(props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && props.dateTimeView !== 'classic' && endFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && dateTimeView !== 'classic' && endFocused) {
             var newVisibleDate = startOfDecade(props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
                     (currentVisibleDate && addYears(currentVisibleDate, 10).getTime())) {
                 setCurrentVisibleDate(addYears(newVisibleDate, -10));
             }
-            return;
-        }
-        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) && endFocused) {
-            setCurrentVisibleDate(currentVisibleDateProp);
         }
     }, [(_d = (_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.getTime(), calendarVisible, endFocused]);
     useClickOutside({
@@ -99,6 +100,6 @@ export var DatePickerTypeYearRange = forwardRef(function (props, ref) {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeYearRange, __assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef([endFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[1]]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[0] : leftSide, startFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[0] : undefined, endFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[1] : undefined, endFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[1] : rightSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused, startFieldName: Array.isArray(name) ? name[0] : name + "_start", endFieldName: Array.isArray(name) ? name[1] : name + "_end" })),
-        React.createElement(DatePickerDropdown, { type: "year", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
+        React.createElement(DatePickerFieldTypeYearRange, __assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef([endFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[1]]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[0] : leftSide, startFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[0] : undefined, endFieldLeftSide: Array.isArray(leftSide) ? leftSide === null || leftSide === void 0 ? void 0 : leftSide[1] : undefined, endFieldRightSide: Array.isArray(rightSide) ? rightSide === null || rightSide === void 0 ? void 0 : rightSide[1] : rightSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused, startFieldName: Array.isArray(name) ? name[0] : name + "_start", endFieldName: Array.isArray(name) ? name[1] : name + "_end" })),
+        React.createElement(DatePickerDropdown, { type: "year", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, zIndex: getDropdownZIndex(props.style) })));
 });

package/__internal__/src/components/DatePickerCanary/helpers.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateRange } from '../../utils/types/Date';
 import { TextFieldPropForm } from '../TextField/TextField';
 import { DatePickerPropType } from './types';
@@ -21,3 +22,4 @@ export declare const getParts: (format: string, separator: string, withTime?: bo
 export declare const getPartsDate: (value: string, format: string, separator: string, withTime: boolean, markers: string[]) => (string | undefined)[];
 export declare const isTypeWithTime: (type: DatePickerPropType) => boolean;
 export declare const getFieldName: (name: [string?, string?] | string | undefined, rangeIndex: 0 | 1) => string | undefined;
+export declare const getDropdownZIndex: (style?: import("react").CSSProperties | undefined) => number | undefined;

package/__internal__/src/components/DatePickerCanary/helpers.js

@@ -106,3 +106,6 @@ export var getFieldName = function (name, rangeIndex) {
     }
     return name + "_" + fieldPrefixs[rangeIndex];
 };
+export var getDropdownZIndex = function (style) {
+    return typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined;
+};

package/__internal__/src/components/DatePickerCanary/types.d.ts

@@ -3,12 +3,13 @@ import { Locale } from 'date-fns';
 import { IconComponent, IconPropSize } from '../../icons/Icon/Icon';
 import { DateRange } from '../../utils/types/Date';
 import { PropsWithHTMLAttributesAndRef } from '../../utils/types/PropsWithHTMLAttributes';
-import { DateTimeAdditionalControlRenderProp, DateTimePropView } from '../DateTimeCanary/helpers';
+import { DateTimePropView } from '../DateTimeCanary/helpers';
 import { TextFieldPropForm, TextFieldPropSize, TextFieldPropStatus, TextFieldPropView, TextFieldPropWidth } from '../TextField/TextField';
 export declare const datePickerPropType: readonly ["date", "date-range", "date-time", "date-time-range", "time", "year", "year-range", "month", "month-range"];
 export declare type DatePickerPropType = typeof datePickerPropType[number];
 export declare const datePickerPropTypeDefault: "date";
 export declare type DatePickerPropDateTimeView = DateTimePropView;
+export declare const datePickerPropDateTimeViewDefault: "classic";
 declare type Range = 'date-range' | 'date-time-range' | 'year-range' | 'month-range';
 export declare const datePickerErrorTypes: readonly ["outOfRange", "invalidInputAttempt", "startDateIsGreaterThanEndDate"];
 export declare type DatePickerPropValue<TYPE extends DatePickerPropType> = (TYPE extends Range ? DateRange : Date) | null;
@@ -24,13 +25,17 @@ declare type DatePickerPropInputRef<TYPE> = TYPE extends Range ? [React.Ref<HTML
 declare type DatePickerPropSide<TYPE> = TYPE extends Range ? [(string | IconComponent)?, (string | IconComponent)?] | string | IconComponent : string | IconComponent;
 declare type DatePickerPropOnFocus<TYPE> = TYPE extends Range ? [React.FocusEventHandler<HTMLElement>?, React.FocusEventHandler<HTMLElement>?] | React.FocusEventHandler<HTMLElement> : React.FocusEventHandler<HTMLElement>;
 declare type DatePickerPropName<TYPE> = TYPE extends Range ? [string?, string?] | string : string;
+export declare type DatePickerAdditionalControlRenderFn = (props: {
+    currentVisibleDate?: Date;
+}) => React.ReactNode | React.ReactNode[];
+export declare type DatePickerAdditionalControlRenderProp = React.ReactNode | DatePickerAdditionalControlRenderFn;
 export declare type DatePickerProps<TYPE extends DatePickerPropType = 'date'> = PropsWithHTMLAttributesAndRef<{
     type?: TYPE;
     value?: DatePickerPropValue<TYPE>;
     onChange?: DatePickerPropOnChange<TYPE>;
     minDate?: Date;
     maxDate?: Date;
-    renderAdditionalControls?: DateTimeAdditionalControlRenderProp;
+    renderAdditionalControls?: DatePickerAdditionalControlRenderProp;
     events?: Date[];
     dateTimeView?: DatePickerPropDateTimeView;
     locale?: Locale;
@@ -67,6 +72,7 @@ export declare type DatePickerProps<TYPE extends DatePickerPropType = 'date'> =
     multiplicitySeconds?: number;
     multiplicityMinutes?: number;
     multiplicityHours?: number;
+    isMobile?: number;
 }, HTMLDivElement>;
 export declare type DatePickerComponent = <TYPE extends DatePickerPropType = 'date'>(props: DatePickerProps<TYPE>) => React.ReactElement | null;
 export declare type DatePickerTypeComponent<TYPE extends DatePickerPropType> = (props: Omit<DatePickerProps<TYPE>, 'type'>) => React.ReactElement | null;

package/__internal__/src/components/DatePickerCanary/types.js

@@ -1,3 +1,4 @@
+import { dateTimePropViewDefault } from '../DateTimeCanary/helpers';
 export var datePickerPropType = [
     'date',
     'date-range',
@@ -10,6 +11,7 @@ export var datePickerPropType = [
     'month-range',
 ];
 export var datePickerPropTypeDefault = datePickerPropType[0];
+export var datePickerPropDateTimeViewDefault = dateTimePropViewDefault;
 export var datePickerErrorTypes = [
     'outOfRange',
     'invalidInputAttempt',

package/__internal__/src/components/DatePickerCanary/useCurrentVisibleDate.d.ts

@@ -1,2 +1,5 @@
-import React from 'react';
-export declare const useCurrentVisibleDate: (date?: Date | undefined, onChange?: ((date: Date) => void) | undefined) => [Date | undefined, React.Dispatch<React.SetStateAction<Date | undefined>>];
+/// <reference types="react" />
+import { UseCurrentVisibleDateProps } from '../DateTimeCanary/helpers/useCurrentVisibleDate';
+export declare const useCurrentVisibleDate: (props: UseCurrentVisibleDateProps & {
+    calendarVisible: boolean;
+}) => [Date, import("react").Dispatch<import("react").SetStateAction<Date>>];

package/__internal__/src/components/DatePickerCanary/useCurrentVisibleDate.js

@@ -1,8 +1,11 @@
-import { useEffect, useState } from 'react';
-export var useCurrentVisibleDate = function (date, onChange) {
-    var _a;
-    var state = useState(date);
-    useEffect(function () { return state[1](date); }, [date === null || date === void 0 ? void 0 : date.getTime()]);
-    useEffect(function () { return state[0] && (onChange === null || onChange === void 0 ? void 0 : onChange(state[0])); }, [(_a = state[0]) === null || _a === void 0 ? void 0 : _a.getTime()]);
+import { useEffect } from 'react';
+import { getCurrentVisibleDate, useCurrentVisibleDate as useDateTimeCurrentVisibleDate, } from '../DateTimeCanary/helpers/useCurrentVisibleDate';
+export var useCurrentVisibleDate = function (props) {
+    var state = useDateTimeCurrentVisibleDate(props);
+    useEffect(function () {
+        if (props.calendarVisible) {
+            state[1](getCurrentVisibleDate(props));
+        }
+    }, [props.calendarVisible]);
     return state;
 };

package/__internal__/src/components/DateTimeCanary/DateTimeSlider/DateTimeSlider.css

@@ -83,7 +83,7 @@
 
 /* исправляет разрыв между полосками */
 
-.DateTimeSlider-Parent_selected + .DateTimeSlider-Parent_selected {
+.DateTimeSlider-Parent_selected + .DateTimeSlider-Parent_selected::before {
         left: calc(var(--value-offset) - 1px);
         width: calc(var(--value-width) + 1px);
       }