@consta/uikit 3.18.2 → 3.20.0

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

@@ -7,11 +7,11 @@ import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDateRange } from '../DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange';
-import { normalizeRangeValue } from '../helpers';
+import { getFieldName, normalizeRangeValue } from '../helpers';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
     var _a, _b, _c, _d;
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, startFieldRightSide = props.startFieldRightSide, startFieldLeftSide = props.startFieldLeftSide, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldRightSide = props.endFieldRightSide, endFieldLeftSide = props.endFieldLeftSide, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, endFieldInputRefProp = props.endFieldInputRef, startFieldInputRefProp = props.startFieldInputRef, style = props.style, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "startFieldRightSide", "startFieldLeftSide", "startFieldOnBlur", "startFieldOnFocus", "endFieldRightSide", "endFieldLeftSide", "endFieldOnBlur", "endFieldOnFocus", "onFocus", "onBlur", "leftSide", "rightSide", "endFieldInputRef", "startFieldInputRef", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
+    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 startFieldRef = useRef(null);
     var endFieldRef = useRef(null);
     var startFieldInputRef = useRef(null);
@@ -32,25 +32,19 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
     };
     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 startFieldOnBlurHandler = function (e) {
-        onBlur && onBlur(e);
-        startFieldOnBlur && startFieldOnBlur(e);
-    };
-    var endFieldOnBlurHandler = function (e) {
-        onBlur && onBlur(e);
-        endFieldOnBlur && endFieldOnBlur(e);
-    };
+    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) {
+        var _a;
         setFieldFocused('start');
         setCalendarVisible.on();
-        onFocus && onFocus(e);
-        startFieldOnFocus && startFieldOnFocus(e);
+        Array.isArray(onFocus) ? (_a = onFocus[0]) === null || _a === void 0 ? void 0 : _a.call(onFocus, e) : onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
     };
     var endFieldOnFocusHandler = function (e) {
+        var _a;
         setFieldFocused('end');
         setCalendarVisible.on();
-        onFocus && onFocus(e);
-        endFieldOnFocus && endFieldOnFocus(e);
+        Array.isArray(onFocus) ? (_a = onFocus[1]) === null || _a === void 0 ? void 0 : _a.call(onFocus, e) : onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     useEffect(function () {
@@ -106,6 +100,6 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeDateRange, __assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, startFieldInputRefProp]), endFieldInputRef: useForkRef([endFieldInputRef, endFieldInputRefProp]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldRightSide: startFieldRightSide, startFieldLeftSide: startFieldLeftSide || leftSide, endFieldRightSide: endFieldRightSide || rightSide, endFieldLeftSide: endFieldLeftSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused })),
+        React.createElement(DatePickerFieldTypeDateRange, __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: getFieldName(name, 0), endFieldName: getFieldName(name, 1) })),
         React.createElement(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 })));
 });

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

@@ -1,2 +1,2 @@
-import { DatePickerTypeComponent } from '../helpers';
+import { DatePickerTypeComponent } from '../types';
 export declare const DatePickerTypeDateTime: DatePickerTypeComponent<'date-time'>;

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

@@ -7,10 +7,10 @@ import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { setRef } from '../../../utils/setRef';
 import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDateTime } from '../DatePickerFieldTypeDateTime/DatePickerFieldTypeDateTime';
-import { datePickerPropFormatTypeDateTime, getMultiplicityTime, } from '../helpers';
+import { datePickerPropFormatTypeDateTime, getMultiplicityTime } from '../helpers';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeDateTime = 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, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls"]);
+    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 = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls", "style"]);
     var _a = __read(getMultiplicityTime(otherProps.format || datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _a[0], multiplicityMinutes = _a[1], multiplicitySeconds = _a[2];
     var fieldRef = useRef(null);
     var calendarRef = useRef(null);
@@ -51,6 +51,6 @@ export var DatePickerTypeDateTime = forwardRef(function (props, ref) {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeDateTime, __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: "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 })));
+        React.createElement(DatePickerFieldTypeDateTime, __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: "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 })));
 });

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

@@ -1,2 +1,2 @@
-import { DatePickerTypeComponent } from '../helpers';
+import { DatePickerTypeComponent } from '../types';
 export declare const DatePickerTypeDateTimeRange: DatePickerTypeComponent<'date-time-range'>;

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

@@ -6,11 +6,11 @@ import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDateTimeRange } from '../DatePickerFieldTypeDateTimeRange/DatePickerFieldTypeDateTimeRange';
-import { normalizeRangeValue } from '../helpers';
+import { getFieldName, normalizeRangeValue } from '../helpers';
 import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeDateTimeRange = forwardRef(function (props, ref) {
     var _a, _b, _c, _d;
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, startFieldRightSide = props.startFieldRightSide, startFieldLeftSide = props.startFieldLeftSide, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldRightSide = props.endFieldRightSide, endFieldLeftSide = props.endFieldLeftSide, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, endFieldInputRefProp = props.endFieldInputRef, startFieldInputRefProp = props.startFieldInputRef, style = props.style, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "startFieldRightSide", "startFieldLeftSide", "startFieldOnBlur", "startFieldOnFocus", "endFieldRightSide", "endFieldLeftSide", "endFieldOnBlur", "endFieldOnFocus", "onFocus", "onBlur", "leftSide", "rightSide", "endFieldInputRef", "startFieldInputRef", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
+    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 startFieldRef = useRef(null);
     var endFieldRef = useRef(null);
     var startFieldInputRef = useRef(null);
@@ -31,25 +31,19 @@ export var DatePickerTypeDateTimeRange = forwardRef(function (props, ref) {
     };
     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 startFieldOnBlurHandler = function (e) {
-        onBlur && onBlur(e);
-        startFieldOnBlur && startFieldOnBlur(e);
-    };
-    var endFieldOnBlurHandler = function (e) {
-        onBlur && onBlur(e);
-        endFieldOnBlur && endFieldOnBlur(e);
-    };
+    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) {
+        var _a;
         setFieldFocused('start');
         setCalendarVisible.on();
-        onFocus && onFocus(e);
-        startFieldOnFocus && startFieldOnFocus(e);
+        Array.isArray(onFocus) ? (_a = onFocus[0]) === null || _a === void 0 ? void 0 : _a.call(onFocus, e) : onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
     };
     var endFieldOnFocusHandler = function (e) {
+        var _a;
         setFieldFocused('end');
         setCalendarVisible.on();
-        onFocus && onFocus(e);
-        endFieldOnFocus && endFieldOnFocus(e);
+        Array.isArray(onFocus) ? (_a = onFocus[1]) === null || _a === void 0 ? void 0 : _a.call(onFocus, e) : onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     useEffect(function () {
@@ -87,6 +81,6 @@ export var DatePickerTypeDateTimeRange = forwardRef(function (props, ref) {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeDateTimeRange, __assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, startFieldInputRefProp]), endFieldInputRef: useForkRef([endFieldInputRef, endFieldInputRefProp]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldRightSide: startFieldRightSide, startFieldLeftSide: startFieldLeftSide || leftSide, endFieldRightSide: endFieldRightSide || rightSide, endFieldLeftSide: endFieldLeftSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused })),
+        React.createElement(DatePickerFieldTypeDateTimeRange, __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: getFieldName(name, 0), endFieldName: getFieldName(name, 1) })),
         React.createElement(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, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
 });

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

@@ -0,0 +1,2 @@
+import { DatePickerTypeComponent } from '../types';
+export declare const DatePickerTypeTime: DatePickerTypeComponent<'time'>;

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

@@ -0,0 +1,32 @@
+import { __assign, __read, __rest } from "tslib";
+import React, { forwardRef, useEffect, useRef } from 'react';
+import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
+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';
+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 fieldRef = useRef(null);
+    var calendarRef = useRef(null);
+    var _b = __read(useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var onFocusHandler = function (e) {
+        onFocus && onFocus(e);
+        setCalendarVisible.on();
+    };
+    useEffect(function () {
+        if (ref) {
+            setRef(ref, fieldRef.current);
+        }
+    }, [ref, fieldRef]);
+    useClickOutside({
+        isActive: calendarVisible,
+        ignoreClicksInsideRefs: [fieldRef, calendarRef],
+        handler: function () { return 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 })));
+});

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

@@ -1,111 +1,11 @@
-/// <reference types="react" />
-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 { TextFieldPropForm, TextFieldPropSize, TextFieldPropStatus, TextFieldPropView, TextFieldPropWidth } from '../TextField/TextField';
-export declare const datePickerPropType: readonly ["date", "date-range", "date-time", "date-time-range"];
-export declare type DatePickerPropType = typeof datePickerPropType[number];
-export declare const datePickerPropTypeDefault: "date";
-export declare type DatePickerPropDateTimeView = DateTimePropView;
-declare type Range = 'date-range' | 'date-time-range';
-export declare const datePickerErrorTypes: readonly ["outOfRange", "invalidInputAttempt", "startDateIsGreaterThanEndDate"];
-export declare type DatePickerPropValue<TYPE extends DatePickerPropType> = (TYPE extends Range ? DateRange : Date) | null;
-export declare type DatePickerPropOnChange<TYPE extends DatePickerPropType> = (props: {
-    value: DatePickerPropValue<TYPE>;
-    e: React.MouseEvent<HTMLButtonElement, MouseEvent> | Event;
-}) => void;
-export declare const datePickerPropDropdownForm: readonly ["default", "brick", "round"];
-export declare type DatePickerPropDropdownForm = typeof datePickerPropDropdownForm[number];
-export declare const datePickerPropDropdownFormDefault: "default";
-declare type DatePickerPropCalendarWidth<TYPE> = TYPE extends Range ? TextFieldPropWidth : never;
-declare type DatePickerPropCalendarInputRef<TYPE> = TYPE extends Range ? never : React.Ref<HTMLInputElement>;
-declare type DatePickerPropCalendarStartInputRef<TYPE> = TYPE extends Range ? React.Ref<HTMLInputElement> : never;
-declare type DatePickerPropCalendarStartLeftSide<TYPE> = TYPE extends Range ? string | IconComponent : never;
-declare type DatePickerPropCalendarStartOnFocus<TYPE> = TYPE extends Range ? React.FocusEventHandler<HTMLElement> : never;
-export declare type DatePickerProps<TYPE extends DatePickerPropType = 'date'> = PropsWithHTMLAttributesAndRef<{
-    type?: TYPE;
-    value?: DatePickerPropValue<TYPE>;
-    onChange?: DatePickerPropOnChange<TYPE>;
-    minDate?: Date;
-    maxDate?: Date;
-    renderAdditionalControls?: DateTimeAdditionalControlRenderProp;
-    events?: Date[];
-    dateTimeView?: DatePickerPropDateTimeView;
-    locale?: Locale;
-    children?: never;
-    onError?: DatePickerPropOnError;
-    id?: string;
-    name?: string;
-    disabled?: boolean;
-    size?: TextFieldPropSize;
-    view?: TextFieldPropView;
-    form?: TextFieldPropForm;
-    status?: TextFieldPropStatus;
-    onFocus?: React.FocusEventHandler<HTMLElement>;
-    onBlur?: React.FocusEventHandler<HTMLElement>;
-    autoFocus?: boolean;
-    placeholder?: string;
-    readOnly?: boolean;
-    required?: boolean;
-    tabIndex?: number;
-    inputRef?: DatePickerPropCalendarInputRef<TYPE>;
-    ariaLabel?: string;
-    iconSize?: IconPropSize;
-    format?: string;
-    separator?: string;
-    dropdownForm?: DatePickerPropDropdownForm;
-    width?: DatePickerPropCalendarWidth<TYPE>;
-    leftSide?: string | IconComponent;
-    rightSide?: string | IconComponent;
-    startFieldInputRef?: DatePickerPropCalendarStartInputRef<TYPE>;
-    endFieldInputRef?: DatePickerPropCalendarStartInputRef<TYPE>;
-    startFieldLeftSide?: DatePickerPropCalendarStartLeftSide<TYPE>;
-    startFieldRightSide?: DatePickerPropCalendarStartLeftSide<TYPE>;
-    endFieldLeftSide?: DatePickerPropCalendarStartLeftSide<TYPE>;
-    endFieldRightSide?: DatePickerPropCalendarStartLeftSide<TYPE>;
-    startFieldOnFocus?: DatePickerPropCalendarStartOnFocus<TYPE>;
-    endFieldOnFocus?: DatePickerPropCalendarStartOnFocus<TYPE>;
-    startFieldOnBlur?: DatePickerPropCalendarStartOnFocus<TYPE>;
-    endFieldOnBlur?: DatePickerPropCalendarStartOnFocus<TYPE>;
-    label?: string;
-    caption?: string;
-    labelPosition?: 'top' | 'left';
-    onChangeCurrentVisibleDate?: (date: Date) => void;
-    currentVisibleDate?: Date;
-    multiplicitySeconds?: number;
-    multiplicityMinutes?: number;
-    multiplicityHours?: 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;
-export declare type DatePickerPropOnError = (props: {
-    type: typeof datePickerErrorTypes[0];
-    stringValue: string;
-    dd?: string;
-    MM?: string;
-    yyyy?: string;
-    ss?: string;
-    mm?: string;
-    HH?: string;
-    date: Date;
-} | {
-    type: typeof datePickerErrorTypes[1];
-    stringValue: string;
-    dd?: string;
-    MM?: string;
-    yyyy?: string;
-    ss?: string;
-    mm?: string;
-    HH?: string;
-} | {
-    type: typeof datePickerErrorTypes[2];
-    date: [Date, Date];
-}) => void;
+import { TextFieldPropForm } from '../TextField/TextField';
+import { DatePickerPropType } from './types';
 export declare const datePickerPropSeparatorDefault = ".";
 export declare const datePickerPropFormatTypeDate: string;
 export declare const datePickerPropPlaceholderTypeDate: string;
+export declare const datePickerPropFormatTypeTime = "HH:mm:ss";
+export declare const datePickerPropPlaceholderTypeTime = "\u0427\u0427:\u041C\u041C:\u0421\u0421";
 export declare const datePickerPropFormatTypeDateTime: string;
 export declare const datePickerPropPlaceholderTypeDateTime: string;
 export declare const normalizeRangeValue: (dateRange: DateRange) => DateRange;
@@ -113,4 +13,7 @@ export declare const getMultiplicityTime: (format: string, multiplicityHours: nu
 export declare const getTimeEnum: (length: number, multiplicity: number | undefined, startOfUnits: (date: Date) => Date, addUnits: (date: Date, amount: number) => Date, getItemLabel: (date: Date) => string) => string[];
 export declare const getFormForStart: (form: TextFieldPropForm) => "default" | "round" | "brick" | "brickRound" | "roundBrick" | "brickDefault" | "defaultBrick" | "clearRound" | "roundClear" | "clearDefault" | "defaultClear" | "brickClear" | "clearBrick" | "clearClear";
 export declare const getFormForEnd: (form: TextFieldPropForm) => "default" | "round" | "brick" | "brickRound" | "roundBrick" | "brickDefault" | "defaultBrick" | "clearRound" | "roundClear" | "clearDefault" | "defaultClear" | "brickClear" | "clearBrick" | "clearClear";
-export {};
+export declare const getParts: (format: string, separator: string, withTime?: boolean | undefined) => string[];
+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;

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

@@ -1,20 +1,14 @@
+import { __read, __spread } from "tslib";
 import { startOfToday } from 'date-fns';
 import { range } from '../../utils/array';
 import { getByMap } from '../../utils/getByMap';
-export var datePickerPropType = ['date', 'date-range', 'date-time', 'date-time-range'];
-export var datePickerPropTypeDefault = datePickerPropType[0];
-export var datePickerErrorTypes = [
-    'outOfRange',
-    'invalidInputAttempt',
-    'startDateIsGreaterThanEndDate',
-];
-export var datePickerPropDropdownForm = ['default', 'brick', 'round'];
-export var datePickerPropDropdownFormDefault = datePickerPropDropdownForm[0];
 export var datePickerPropSeparatorDefault = '.';
 export var datePickerPropFormatTypeDate = "dd" + datePickerPropSeparatorDefault + "MM" + datePickerPropSeparatorDefault + "yyyy";
 export var datePickerPropPlaceholderTypeDate = "\u0414\u0414" + datePickerPropSeparatorDefault + "\u041C\u041C" + datePickerPropSeparatorDefault + "\u0413\u0413\u0413\u0413";
-export var datePickerPropFormatTypeDateTime = datePickerPropFormatTypeDate + " HH:mm:ss";
-export var datePickerPropPlaceholderTypeDateTime = datePickerPropPlaceholderTypeDate + " \u0427\u0427:\u041C\u041C:\u0421\u0421";
+export var datePickerPropFormatTypeTime = "HH:mm:ss";
+export var datePickerPropPlaceholderTypeTime = "\u0427\u0427:\u041C\u041C:\u0421\u0421";
+export var datePickerPropFormatTypeDateTime = datePickerPropFormatTypeDate + " " + datePickerPropFormatTypeTime;
+export var datePickerPropPlaceholderTypeDateTime = datePickerPropPlaceholderTypeDate + " " + datePickerPropPlaceholderTypeTime;
 export var normalizeRangeValue = function (dateRange) {
     var _a, _b;
     if (dateRange[0] && dateRange[1] && ((_a = dateRange[0]) === null || _a === void 0 ? void 0 : _a.getTime()) > ((_b = dateRange[1]) === null || _b === void 0 ? void 0 : _b.getTime())) {
@@ -78,3 +72,33 @@ var mapFormForEnd = {
 };
 export var getFormForStart = function (form) { return getByMap(mapFormForStart, form); };
 export var getFormForEnd = function (form) { return getByMap(mapFormForEnd, form); };
+var getPartDate = function (formatArray, stringArray, marker) {
+    var index = formatArray.indexOf(marker);
+    if (index >= 0 && stringArray[index] && stringArray[index].length === marker.length) {
+        return stringArray[index];
+    }
+    return undefined;
+};
+export var getParts = function (format, separator, withTime) {
+    if (withTime) {
+        var _a = __read(format.split(' '), 2), date = _a[0], time = _a[1];
+        return __spread((date ? date.split(separator) : []), (time ? time.split(':') : []));
+    }
+    return format.split(separator);
+};
+export var getPartsDate = function (value, format, separator, withTime, markers) {
+    var formatArray = getParts(format, separator, withTime);
+    var stringArray = getParts(value, separator, withTime);
+    return markers.map(function (marker) { return getPartDate(formatArray, stringArray, marker); });
+};
+export var isTypeWithTime = function (type) { return type.indexOf('time') !== -1; };
+var fieldPrefixs = ['start', 'end'];
+export var getFieldName = function (name, rangeIndex) {
+    if (!name) {
+        return undefined;
+    }
+    if (Array.isArray(name)) {
+        return name[rangeIndex];
+    }
+    return name + "_" + fieldPrefixs[rangeIndex];
+};

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

@@ -0,0 +1,96 @@
+/// <reference types="react" />
+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 { TextFieldPropForm, TextFieldPropSize, TextFieldPropStatus, TextFieldPropView, TextFieldPropWidth } from '../TextField/TextField';
+export declare const datePickerPropType: readonly ["date", "date-range", "date-time", "date-time-range", "time"];
+export declare type DatePickerPropType = typeof datePickerPropType[number];
+export declare const datePickerPropTypeDefault: "date";
+export declare type DatePickerPropDateTimeView = DateTimePropView;
+declare type Range = 'date-range' | 'date-time-range';
+export declare const datePickerErrorTypes: readonly ["outOfRange", "invalidInputAttempt", "startDateIsGreaterThanEndDate"];
+export declare type DatePickerPropValue<TYPE extends DatePickerPropType> = (TYPE extends Range ? DateRange : Date) | null;
+export declare type DatePickerPropOnChange<TYPE extends DatePickerPropType> = (props: {
+    value: DatePickerPropValue<TYPE>;
+    e: React.MouseEvent<HTMLButtonElement, MouseEvent> | Event;
+}) => void;
+export declare const datePickerPropDropdownForm: readonly ["default", "brick", "round"];
+export declare type DatePickerPropDropdownForm = typeof datePickerPropDropdownForm[number];
+export declare const datePickerPropDropdownFormDefault: "default";
+declare type DatePickerPropWidth<TYPE> = TYPE extends Range ? TextFieldPropWidth : never;
+declare type DatePickerPropInputRef<TYPE> = TYPE extends Range ? [React.Ref<HTMLInputElement>?, React.Ref<HTMLInputElement>?] : React.Ref<HTMLInputElement>;
+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 DatePickerProps<TYPE extends DatePickerPropType = 'date'> = PropsWithHTMLAttributesAndRef<{
+    type?: TYPE;
+    value?: DatePickerPropValue<TYPE>;
+    onChange?: DatePickerPropOnChange<TYPE>;
+    minDate?: Date;
+    maxDate?: Date;
+    renderAdditionalControls?: DateTimeAdditionalControlRenderProp;
+    events?: Date[];
+    dateTimeView?: DatePickerPropDateTimeView;
+    locale?: Locale;
+    children?: never;
+    onError?: DatePickerPropOnError;
+    id?: string;
+    name?: DatePickerPropName<TYPE>;
+    disabled?: boolean;
+    size?: TextFieldPropSize;
+    view?: TextFieldPropView;
+    form?: TextFieldPropForm;
+    status?: TextFieldPropStatus;
+    onFocus?: DatePickerPropOnFocus<TYPE>;
+    onBlur?: DatePickerPropOnFocus<TYPE>;
+    autoFocus?: boolean;
+    placeholder?: string;
+    readOnly?: boolean;
+    required?: boolean;
+    tabIndex?: number;
+    inputRef?: DatePickerPropInputRef<TYPE>;
+    ariaLabel?: string;
+    iconSize?: IconPropSize;
+    format?: string;
+    separator?: string;
+    dropdownForm?: DatePickerPropDropdownForm;
+    width?: DatePickerPropWidth<TYPE>;
+    leftSide?: DatePickerPropSide<TYPE>;
+    rightSide?: DatePickerPropSide<TYPE>;
+    label?: string;
+    caption?: string;
+    labelPosition?: 'top' | 'left';
+    onChangeCurrentVisibleDate?: (date: Date) => void;
+    currentVisibleDate?: Date;
+    multiplicitySeconds?: number;
+    multiplicityMinutes?: number;
+    multiplicityHours?: 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;
+export declare type DatePickerPropOnError = (props: {
+    type: typeof datePickerErrorTypes[0];
+    stringValue: string;
+    dd?: string;
+    MM?: string;
+    yyyy?: string;
+    ss?: string;
+    mm?: string;
+    HH?: string;
+    date: Date;
+} | {
+    type: typeof datePickerErrorTypes[1];
+    stringValue: string;
+    dd?: string;
+    MM?: string;
+    yyyy?: string;
+    ss?: string;
+    mm?: string;
+    HH?: string;
+} | {
+    type: typeof datePickerErrorTypes[2];
+    date: [Date, Date];
+}) => void;
+export {};

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

@@ -0,0 +1,15 @@
+export var datePickerPropType = [
+    'date',
+    'date-range',
+    'date-time',
+    'date-time-range',
+    'time',
+];
+export var datePickerPropTypeDefault = datePickerPropType[0];
+export var datePickerErrorTypes = [
+    'outOfRange',
+    'invalidInputAttempt',
+    'startDateIsGreaterThanEndDate',
+];
+export var datePickerPropDropdownForm = ['default', 'brick', 'round'];
+export var datePickerPropDropdownFormDefault = datePickerPropDropdownForm[0];

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

@@ -1 +1 @@
-export declare type EventInterceptorComponentName = 'Attachment' | 'Avatar' | 'Badge' | 'Breadcrumbs' | 'Button' | 'Calendar' | 'Card' | 'Checkbox' | 'CheckboxGroup' | 'ChoiceGroup' | 'Collapse' | 'CollapseGroup' | 'Combobox' | 'ContextMenu' | 'DatePicker' | 'DateTime' | 'DragNDropField' | 'File' | 'FileField' | 'Grid' | 'Header' | 'Informer' | 'Layout' | 'Loader' | 'Modal' | 'Pagination' | 'Popover' | 'ProgressSpin' | 'ProgressStepBar' | 'Radio' | 'RadioGroup' | 'Select' | 'Sidebar' | 'Skeleton' | 'Slider' | 'SnackBar' | 'Steps' | 'Switch' | 'SwitchGroup' | 'Table' | 'Tabs' | 'Tag' | 'TagBase' | 'Text' | 'TextField' | 'ThemeToggler' | 'Timer' | 'Tooltip' | 'User' | 'UserSelect';
+export declare type EventInterceptorComponentName = 'Attachment' | 'Avatar' | 'Badge' | 'Breadcrumbs' | 'Button' | 'Calendar' | 'Card' | 'Checkbox' | 'CheckboxGroup' | 'ChoiceGroup' | 'Collapse' | 'CollapseGroup' | 'Combobox' | 'ContextMenu' | 'DatePicker' | 'DateTime' | 'DragNDropField' | 'File' | 'FileField' | 'Grid' | 'Header' | 'Informer' | 'Layout' | 'Loader' | 'Modal' | 'Popover' | 'ProgressSpin' | 'ProgressStepBar' | 'Radio' | 'RadioGroup' | 'Select' | 'Sidebar' | 'Skeleton' | 'Slider' | 'SnackBar' | 'Steps' | 'Switch' | 'SwitchGroup' | 'Table' | 'Tabs' | 'Tag' | 'TagBase' | 'Text' | 'TextField' | 'ThemeToggler' | 'Timer' | 'Tooltip' | 'User' | 'UserSelect';

package/__internal__/src/components/Modal/Modal.css

@@ -1,4 +1,5 @@
 .Modal {
+  --modal-window-animate-space: var(--space-xl);
   position: fixed;
   top: 0;
   right: 0;
@@ -18,7 +19,7 @@
   }
 
   .Modal-Window {
-    z-index: 100;
+    position: absolute;
     overflow: auto;
     min-width: 400px;
     max-width: 90%;
@@ -42,7 +43,7 @@
       }
 
   .Modal-Overlay {
-    position: fixed;
+    position: absolute;
     top: 0;
     left: 0;
     width: 100%;
@@ -52,30 +53,54 @@
     border: none;
   }
 
-  .Modal_animate_appear,
-    .Modal_animate_enter,
-    .Modal_animate_exit,
-    .Modal_animate_appearActive,
-    .Modal_animate_enterActive,
-    .Modal_animate_exitActive {
-      -webkit-transition: opacity 0.2s ease;
-      transition: opacity 0.2s ease;
-    }
+  .Modal_animate_appear .Modal-Overlay, .Modal_animate_enter .Modal-Overlay, .Modal_animate_exit .Modal-Overlay, .Modal_animate_appearActive .Modal-Overlay, .Modal_animate_enterActive .Modal-Overlay, .Modal_animate_exitActive .Modal-Overlay {
+        -webkit-transition: opacity 0.24s ease;
+        transition: opacity 0.24s ease;
+      }
+
+  .Modal_animate_appear .Modal-Window, .Modal_animate_enter .Modal-Window, .Modal_animate_exit .Modal-Window, .Modal_animate_appearActive .Modal-Window, .Modal_animate_enterActive .Modal-Window, .Modal_animate_exitActive .Modal-Window {
+        -webkit-transition: opacity 0.24s, -webkit-transform 0.24s;
+        transition: opacity 0.24s, -webkit-transform 0.24s;
+        transition: opacity 0.24s, transform 0.24s;
+        transition: opacity 0.24s, transform 0.24s, -webkit-transform 0.24s;
+      }
+
+  .Modal_animate_appear .Modal-Overlay, .Modal_animate_enter .Modal-Overlay {
+        opacity: 0;
+      }
 
-  .Modal_animate_appear,
-    .Modal_animate_enter {
-      opacity: 0;
-    }
+  .Modal_animate_appear .Modal-Window, .Modal_animate_enter .Modal-Window {
+        opacity: 0;
+        -webkit-transform: translate(0, calc(-1 * var(--modal-window-animate-space)));
+                transform: translate(0, calc(-1 * var(--modal-window-animate-space)));
+      }
 
-  .Modal_animate_appearActive,
-    .Modal_animate_enterActive {
-      opacity: 1;
-    }
+  .Modal_animate_appearActive .Modal-Overlay, .Modal_animate_enterActive .Modal-Overlay {
+        opacity: 1;
+      }
 
-  .Modal_animate_exit {
-      opacity: 1;
-    }
+  .Modal_animate_appearActive .Modal-Window, .Modal_animate_enterActive .Modal-Window {
+        opacity: 1;
+        -webkit-transform: translate(0, 0);
+                transform: translate(0, 0);
+      }
 
-  .Modal_animate_exitActive {
-      opacity: 0;
-    }
+  .Modal_animate_exit .Modal-Overlay {
+        opacity: 1;
+      }
+
+  .Modal_animate_exit .Modal-Window {
+        opacity: 1;
+        -webkit-transform: translate(0, 0);
+                transform: translate(0, 0);
+      }
+
+  .Modal_animate_exitActive .Modal-Overlay {
+        opacity: 0;
+      }
+
+  .Modal_animate_exitActive .Modal-Window {
+        opacity: 0;
+        -webkit-transform: translate(0, var(--modal-window-animate-space));
+                transform: translate(0, var(--modal-window-animate-space));
+      }

package/__internal__/src/components/Modal/Modal.js

@@ -24,7 +24,7 @@ var ContextConsumer = function (_a) {
     useClickOutside({
         isActive: !!onClickOutside,
         ignoreClicksInsideRefs: __spread((ignoreClicksInsideRefs || []), (refs || [])),
-        handler: function (event) { return onClickOutside === null || onClickOutside === void 0 ? void 0 : onClickOutside(event); }
+        handler: onClickOutside
     });
     return React.createElement(React.Fragment, null, children);
 };
@@ -44,9 +44,9 @@ export var Modal = function (props) {
     useGlobalKeys({
         Escape: function (e) { return isOpen && onEsc && onEsc(e); }
     });
-    return (React.createElement(CSSTransition, { "in": isOpen, unmountOnExit: true, appear: true, classNames: cnForCssTransition(cnModal), timeout: 200, nodeRef: portalRef },
+    return (React.createElement(CSSTransition, { "in": isOpen, unmountOnExit: true, appear: true, classNames: cnForCssTransition(cnModal), timeout: 240, nodeRef: portalRef },
         React.createElement(PortalWithTheme, { preset: theme, container: container, className: cnModal({ hasOverlay: hasOverlay }, [rootClassName]), ref: portalRef, style: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? { zIndex: style.zIndex } : undefined },
             hasOverlay && React.createElement("div", { className: cnModal('Overlay'), "aria-label": "Overlay" }),
-            React.createElement("div", __assign({}, otherProps, { style: __assign(__assign({}, style), (typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' && { zIndex: (style === null || style === void 0 ? void 0 : style.zIndex) + 1 })), className: cnModal('Window', { width: width, position: position }, [className]), ref: ref }),
+            React.createElement("div", __assign({}, otherProps, { style: __assign(__assign({}, style), { zIndex: undefined }), className: cnModal('Window', { width: width, position: position }, [className]), ref: ref }),
                 React.createElement(ContextConsumer, { onClickOutside: onClickOutside || onOverlayClick, ignoreClicksInsideRefs: __spread((refsForExcludeClickOutside || []), [ref]) }, children)))));
 };