@consta/uikit 3.22.0 → 3.24.0

package/__internal__/cjs-src/components/DatePickerCanary/DatePickerTypeDateRange/DatePickerTypeDateRange.js

@@ -11,16 +11,17 @@ var useForkRef_1 = require("../../../hooks/useForkRef/useForkRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeDateRange_1 = require("../DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var useCurrentVisibleDate_1 = require("../useCurrentVisibleDate");
 exports.DatePickerTypeDateRange = react_1.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 = tslib_1.__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 ? types_1.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 = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
     var startFieldRef = react_1.useRef(null);
     var endFieldRef = react_1.useRef(null);
     var startFieldInputRef = react_1.useRef(null);
     var endFieldInputRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _e = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _e[0], setFieldFocused = _e[1];
+    var _f = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _f[0], setFieldFocused = _f[1];
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
@@ -33,8 +34,16 @@ exports.DatePickerTypeDateRange = react_1.forwardRef(function (props, ref) {
             (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: helpers_1.normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
+    var _g = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _g[0], setCalendarVisible = _g[1];
+    var _h = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfMonth_1["default"],
+        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) {
@@ -51,58 +60,50 @@ exports.DatePickerTypeDateRange = react_1.forwardRef(function (props, ref) {
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     react_1.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 = startOfMonth_1["default"](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 = startOfMonth_1["default"](props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
                     (currentVisibleDate && addMonths_1["default"](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]);
     react_1.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 = startOfMonth_1["default"](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 = startOfMonth_1["default"](props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
                     (currentVisibleDate && addMonths_1["default"](currentVisibleDate, 1).getTime())) {
                 setCurrentVisibleDate(addMonths_1["default"](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_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [startFieldRef, endFieldRef, calendarRef],
-        handler: function () {
+        handler: react_1.useCallback(function () {
             setFieldFocused(false);
             setCalendarVisible.off();
-        }
+        }, [])
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeDateRange_1.DatePickerFieldTypeDateRange, tslib_1.__assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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: helpers_1.getFieldName(name, 0), endFieldName: helpers_1.getFieldName(name, 1) })),
-        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { type: "date", 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_1["default"].createElement(DatePickerFieldTypeDateRange_1.DatePickerFieldTypeDateRange, tslib_1.__assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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: helpers_1.getFieldName(name, 0), endFieldName: helpers_1.getFieldName(name, 1) })),
+        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { type: "date", 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: helpers_1.getDropdownZIndex(props.style) })));
 });

package/__internal__/cjs-src/components/DatePickerCanary/DatePickerTypeDateTime/DatePickerTypeDateTime.js

@@ -11,15 +11,23 @@ var setRef_1 = require("../../../utils/setRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeDateTime_1 = require("../DatePickerFieldTypeDateTime/DatePickerFieldTypeDateTime");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var useCurrentVisibleDate_1 = require("../useCurrentVisibleDate");
 exports.DatePickerTypeDateTime = react_1.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, multiplicityHoursProp = props.multiplicityHours, multiplicityMinutesProp = props.multiplicityMinutes, multiplicitySecondsProp = props.multiplicitySeconds, renderAdditionalControls = props.renderAdditionalControls, style = props.style, otherProps = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "style"]);
-    var _a = tslib_1.__read(helpers_1.getMultiplicityTime(otherProps.format || helpers_1.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 ? types_1.datePickerPropDateTimeViewDefault : _a, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, multiplicityHoursProp = props.multiplicityHours, multiplicityMinutesProp = props.multiplicityMinutes, multiplicitySecondsProp = props.multiplicitySeconds, renderAdditionalControls = props.renderAdditionalControls, otherProps = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls"]);
+    var _b = tslib_1.__read(helpers_1.getMultiplicityTime(otherProps.format || helpers_1.datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _b[0], multiplicityMinutes = _b[1], multiplicitySeconds = _b[2];
     var fieldRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _b = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
-    var _c = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _c[0], setCurrentVisibleDate = _c[1];
-    var _d = tslib_1.__read(react_1.useState(), 2), calendarVisibleDate = _d[0], setCalendarVisibleDate = _d[1];
+    var _c = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _c[0], setCalendarVisible = _c[1];
+    var _d = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfMonth_1["default"],
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _d[0], setCurrentVisibleDate = _d[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -30,17 +38,17 @@ exports.DatePickerTypeDateTime = react_1.forwardRef(function (props, ref) {
         }
     }, [ref, fieldRef]);
     react_1.useEffect(function () {
-        if (props.value && props.dateTimeView === 'classic' && calendarVisibleDate) {
+        if (props.value && dateTimeView === 'classic' && currentVisibleDate) {
             var newVisibleDate = startOfMonth_1["default"](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 = startOfMonth_1["default"](props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== addMonths_1["default"](calendarVisibleDate, 1).getTime()) {
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
+                newVisibleDate.getTime() !== addMonths_1["default"](currentVisibleDate, 1).getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
         }
@@ -48,12 +56,9 @@ exports.DatePickerTypeDateTime = react_1.forwardRef(function (props, ref) {
     useClickOutside_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: function () {
-            setCalendarVisible.off();
-            setCurrentVisibleDate(props.value ? undefined : currentVisibleDateProp);
-        }
+        handler: setCalendarVisible.off
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeDateTime_1.DatePickerFieldTypeDateTime, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, style: style })),
-        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "date-time", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: props.onChange, renderAdditionalControls: renderAdditionalControls, onChangeCurrentVisibleDate: setCalendarVisibleDate, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
+        react_1["default"].createElement(DatePickerFieldTypeDateTime_1.DatePickerFieldTypeDateTime, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes })),
+        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "date-time", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: props.onChange, renderAdditionalControls: renderAdditionalControls, onChangeCurrentVisibleDate: setCurrentVisibleDate, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, zIndex: helpers_1.getDropdownZIndex(props.style) })));
 });

package/__internal__/cjs-src/components/DatePickerCanary/DatePickerTypeDateTimeRange/DatePickerTypeDateTimeRange.js

@@ -10,16 +10,17 @@ var useForkRef_1 = require("../../../hooks/useForkRef/useForkRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeDateTimeRange_1 = require("../DatePickerFieldTypeDateTimeRange/DatePickerFieldTypeDateTimeRange");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var useCurrentVisibleDate_1 = require("../useCurrentVisibleDate");
 exports.DatePickerTypeDateTimeRange = react_1.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, multiplicityMinutes = props.multiplicityMinutes, multiplicitySeconds = props.multiplicitySeconds, multiplicityHours = props.multiplicityHours, fieldProps = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
+    var events = props.events, _e = props.dateTimeView, dateTimeView = _e === void 0 ? types_1.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, multiplicityMinutes = props.multiplicityMinutes, multiplicitySeconds = props.multiplicitySeconds, multiplicityHours = props.multiplicityHours, fieldProps = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
     var startFieldRef = react_1.useRef(null);
     var endFieldRef = react_1.useRef(null);
     var startFieldInputRef = react_1.useRef(null);
     var endFieldInputRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _e = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _e[0], setFieldFocused = _e[1];
+    var _f = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _f[0], setFieldFocused = _f[1];
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
@@ -32,8 +33,16 @@ exports.DatePickerTypeDateTimeRange = react_1.forwardRef(function (props, ref) {
             (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: helpers_1.normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
+    var _g = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _g[0], setCalendarVisible = _g[1];
+    var _h = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfMonth_1["default"],
+        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) {
@@ -50,40 +59,32 @@ exports.DatePickerTypeDateTimeRange = react_1.forwardRef(function (props, ref) {
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     react_1.useEffect(function () {
-        var _a, _b;
+        var _a;
         if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && startFocused) {
             var newVisibleDate = startOfMonth_1["default"](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]) && 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]);
     react_1.useEffect(function () {
-        var _a, _b;
+        var _a;
         if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && endFocused) {
             var newVisibleDate = startOfMonth_1["default"](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]) && 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_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [startFieldRef, endFieldRef, calendarRef],
-        handler: function () {
+        handler: react_1.useCallback(function () {
             setFieldFocused(false);
             setCalendarVisible.off();
-        }
+        }, [])
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeDateTimeRange_1.DatePickerFieldTypeDateTimeRange, tslib_1.__assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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: helpers_1.getFieldName(name, 0), endFieldName: helpers_1.getFieldName(name, 1) })),
-        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { type: "date-time", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, timeFor: fieldFocused || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, multiplicityMinutes: multiplicityMinutes, multiplicitySeconds: multiplicitySeconds, multiplicityHours: multiplicityHours, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
+        react_1["default"].createElement(DatePickerFieldTypeDateTimeRange_1.DatePickerFieldTypeDateTimeRange, tslib_1.__assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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: helpers_1.getFieldName(name, 0), endFieldName: helpers_1.getFieldName(name, 1) })),
+        react_1["default"].createElement(DatePickerDropdown_1.DatePickerDropdown, { type: "date-time", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, timeFor: fieldFocused || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, multiplicityMinutes: multiplicityMinutes, multiplicitySeconds: multiplicitySeconds, multiplicityHours: multiplicityHours, zIndex: helpers_1.getDropdownZIndex(props.style) })));
 });

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

@@ -3,20 +3,30 @@ exports.__esModule = true;
 exports.DatePickerTypeMonth = void 0;
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
-var date_fns_1 = require("date-fns");
+var addYears_1 = tslib_1.__importDefault(require("date-fns/addYears"));
+var startOfYear_1 = tslib_1.__importDefault(require("date-fns/startOfYear"));
 var useClickOutside_1 = require("../../../hooks/useClickOutside/useClickOutside");
 var useFlag_1 = require("../../../hooks/useFlag/useFlag");
 var setRef_1 = require("../../../utils/setRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeMonth_1 = require("../DatePickerFieldTypeMonth/DatePickerFieldTypeMonth");
+var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var useCurrentVisibleDate_1 = require("../useCurrentVisibleDate");
 exports.DatePickerTypeMonth = react_1.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 = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "style"]);
+    var events = props.events, _a = props.dateTimeView, dateTimeView = _a === void 0 ? types_1.datePickerPropDateTimeViewDefault : _a, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDate = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, otherProps = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
     var fieldRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _a = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _a[0], setCalendarVisible = _a[1];
-    var _b = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _b[0], setCurrentVisibleDate = _b[1];
-    var _c = tslib_1.__read(react_1.useState(), 2), calendarVisibleDate = _c[0], setCalendarVisibleDate = _c[1];
+    var _b = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfYear_1["default"],
+        onChangeCurrentVisibleDate: onChangeCurrentVisibleDate,
+        calendarVisible: calendarVisible
+    }), 2), currentVisibleDate = _c[0], setCurrentVisibleDate = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -27,35 +37,31 @@ exports.DatePickerTypeMonth = react_1.forwardRef(function (props, ref) {
         }
     }, [ref, fieldRef]);
     react_1.useEffect(function () {
-        if (props.value && props.dateTimeView === 'classic' && calendarVisibleDate) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime()) {
+        if (props.value && dateTimeView === 'classic' && currentVisibleDate) {
+            var newVisibleDate = startOfYear_1["default"](props.value);
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (props.value && props.dateTimeView !== 'classic' && calendarVisibleDate) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value);
-            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== date_fns_1.addMonths(calendarVisibleDate, 1).getTime()) {
+        if (props.value && dateTimeView !== 'classic' && currentVisibleDate) {
+            var newVisibleDate = startOfYear_1["default"](props.value);
+            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
+                newVisibleDate.getTime() !== addYears_1["default"](currentVisibleDate, 1).getTime()) {
                 setCurrentVisibleDate(newVisibleDate);
             }
         }
     }, [props.value]);
-    var handleClose = function () {
-        setCalendarVisible.off();
-        setCurrentVisibleDate(props.value ? undefined : currentVisibleDateProp);
-    };
     useClickOutside_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: handleClose
+        handler: setCalendarVisible.off
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeMonth_1.DatePickerFieldTypeMonth, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, style: style })),
+        react_1["default"].createElement(DatePickerFieldTypeMonth_1.DatePickerFieldTypeMonth, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler })),
         react_1["default"].createElement(DatePickerDropdown_1.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: helpers_1.getDropdownZIndex(props.style) })));
 });

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

@@ -3,23 +3,25 @@ exports.__esModule = true;
 exports.DatePickerTypeMonthRange = void 0;
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
-var date_fns_1 = require("date-fns");
+var addYears_1 = tslib_1.__importDefault(require("date-fns/addYears"));
+var startOfYear_1 = tslib_1.__importDefault(require("date-fns/startOfYear"));
 var useClickOutside_1 = require("../../../hooks/useClickOutside/useClickOutside");
 var useFlag_1 = require("../../../hooks/useFlag/useFlag");
 var useForkRef_1 = require("../../../hooks/useForkRef/useForkRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeMonthRange_1 = require("../DatePickerFieldTypeMonthRange/DatePickerFieldTypeMonthRange");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var useCurrentVisibleDate_1 = require("../useCurrentVisibleDate");
 exports.DatePickerTypeMonthRange = react_1.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 = tslib_1.__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 ? types_1.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 = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "onBlur", "leftSide", "rightSide", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "inputRef", "name"]);
     var startFieldRef = react_1.useRef(null);
     var endFieldRef = react_1.useRef(null);
     var startFieldInputRef = react_1.useRef(null);
     var endFieldInputRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _e = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _e[0], setFieldFocused = _e[1];
+    var _f = tslib_1.__read(react_1.useState(false), 2), fieldFocused = _f[0], setFieldFocused = _f[1];
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
@@ -32,8 +34,16 @@ exports.DatePickerTypeMonthRange = react_1.forwardRef(function (props, ref) {
             (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: helpers_1.normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
+    var _g = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _g[0], setCalendarVisible = _g[1];
+    var _h = tslib_1.__read(useCurrentVisibleDate_1.useCurrentVisibleDate({
+        currentVisibleDate: currentVisibleDateProp,
+        maxDate: props.maxDate,
+        minDate: props.minDate,
+        value: props.value,
+        startOfUnit: startOfYear_1["default"],
+        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) {
@@ -50,58 +60,50 @@ exports.DatePickerTypeMonthRange = react_1.forwardRef(function (props, ref) {
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     react_1.useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && props.dateTimeView === 'classic' && startFocused) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value[0]);
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && dateTimeView === 'classic' && startFocused) {
+            var newVisibleDate = startOfYear_1["default"](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) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value[0]);
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && dateTimeView !== 'classic' && startFocused) {
+            var newVisibleDate = startOfYear_1["default"](props.value[0]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
-                    (currentVisibleDate && date_fns_1.addMonths(currentVisibleDate, 1).getTime())) {
+                    (currentVisibleDate && addYears_1["default"](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]);
     react_1.useEffect(function () {
-        var _a, _b, _c;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && props.dateTimeView === 'classic' && endFocused) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value[1]);
+        var _a, _b;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && dateTimeView === 'classic' && endFocused) {
+            var newVisibleDate = startOfYear_1["default"](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) {
-            var newVisibleDate = date_fns_1.startOfYear(props.value[1]);
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && dateTimeView !== 'classic' && endFocused) {
+            var newVisibleDate = startOfYear_1["default"](props.value[1]);
             if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
                 newVisibleDate.getTime() !==
-                    (currentVisibleDate && date_fns_1.addMonths(currentVisibleDate, 1).getTime())) {
-                setCurrentVisibleDate(date_fns_1.addMonths(newVisibleDate, -1));
+                    (currentVisibleDate && addYears_1["default"](currentVisibleDate, 1).getTime())) {
+                setCurrentVisibleDate(addYears_1["default"](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_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [startFieldRef, endFieldRef, calendarRef],
-        handler: function () {
+        handler: react_1.useCallback(function () {
             setFieldFocused(false);
             setCalendarVisible.off();
-        }
+        }, [])
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeMonthRange_1.DatePickerFieldTypeMonthRange, tslib_1.__assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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_1["default"].createElement(DatePickerDropdown_1.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_1["default"].createElement(DatePickerFieldTypeMonthRange_1.DatePickerFieldTypeMonthRange, tslib_1.__assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef_1.useForkRef([startFieldInputRef, inputRef === null || inputRef === void 0 ? void 0 : inputRef[0]]), endFieldInputRef: useForkRef_1.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_1["default"].createElement(DatePickerDropdown_1.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: helpers_1.getDropdownZIndex(props.style) })));
 });

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

@@ -9,12 +9,13 @@ var setRef_1 = require("../../../utils/setRef");
 var DatePickerDropdown_1 = require("../DatePickerDropdown/DatePickerDropdown");
 var DatePickerFieldTypeTime_1 = require("../DatePickerFieldTypeTime/DatePickerFieldTypeTime");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 exports.DatePickerTypeTime = react_1.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 = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "style", "currentVisibleDate", "onChangeCurrentVisibleDate"]);
-    var _a = tslib_1.__read(helpers_1.getMultiplicityTime(otherProps.format || helpers_1.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 ? types_1.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 = tslib_1.__rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "currentVisibleDate", "onChangeCurrentVisibleDate"]);
+    var _b = tslib_1.__read(helpers_1.getMultiplicityTime(otherProps.format || helpers_1.datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _b[0], multiplicityMinutes = _b[1], multiplicitySeconds = _b[2];
     var fieldRef = react_1.useRef(null);
     var calendarRef = react_1.useRef(null);
-    var _b = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = tslib_1.__read(useFlag_1.useFlag(false), 2), calendarVisible = _c[0], setCalendarVisible = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
         setCalendarVisible.on();
@@ -27,9 +28,9 @@ exports.DatePickerTypeTime = react_1.forwardRef(function (props, ref) {
     useClickOutside_1.useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [fieldRef, calendarRef],
-        handler: function () { return setCalendarVisible.off(); }
+        handler: setCalendarVisible.off
     });
     return (react_1["default"].createElement(react_1["default"].Fragment, null,
-        react_1["default"].createElement(DatePickerFieldTypeTime_1.DatePickerFieldTypeTime, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes, style: style })),
-        react_1["default"].createElement(DatePickerDropdown_1.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_1["default"].createElement(DatePickerFieldTypeTime_1.DatePickerFieldTypeTime, tslib_1.__assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes })),
+        react_1["default"].createElement(DatePickerDropdown_1.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: helpers_1.getDropdownZIndex(props.style) })));
 });