@consta/uikit 3.18.0 → 3.18.3

package/__internal__/src/components/Collapse/Collapse.js

@@ -1,9 +1,11 @@
 import { __assign, __read, __rest, __spread } from "tslib";
 import './Collapse.css';
-import React from 'react';
+import React, { useRef } from 'react';
+import { useForkRef } from '../../hooks/useForkRef/useForkRef';
 import { IconArrowDown } from '../../icons/IconArrowDown/IconArrowDown';
 import { cn } from '../../utils/bem';
 import { getByMap } from '../../utils/getByMap';
+import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { Text } from '../Text/Text';
 import { CollapseIcon, collapseIconPropDirection, } from './CollapseIcon/CollapseIcon';
 export var collapsePropSize = ['m', 'l', 's', 'xs', '2xs'];
@@ -29,6 +31,7 @@ export var collapsePropIconPositionDefault = collapsePropIconPosition[0];
 export var collapsePropDirectionIcon = collapseIconPropDirection;
 export var collapsePropDirectionIconDefault = collapsePropDirectionIcon[0];
 export var collapsePropCloseDirectionIconDefault = collapsePropDirectionIcon[2];
+export var COMPONENT_NAME = 'Collapse';
 export var cnCollapse = cn('Collapse');
 export var sizeIconMap = {
     '2xs': 'xs',
@@ -42,8 +45,9 @@ function renderSide(side) {
     return sides.map(function (item, index) { return (React.createElement("div", { className: cnCollapse('Side'), key: index }, item)); });
 }
 export var Collapse = React.forwardRef(function (props, ref) {
-    var label = props.label, _a = props.size, size = _a === void 0 ? collapsePropSizeDefault : _a, _b = props.view, view = _b === void 0 ? collapsePropViewDefault : _b, className = props.className, isOpen = props.isOpen, children = props.children, hoverEffect = props.hoverEffect, divider = props.divider, _c = props.icon, icon = _c === void 0 ? IconArrowDown : _c, closeIcon = props.closeIcon, rightSide = props.rightSide, horizontalSpace = props.horizontalSpace, _d = props.iconPosition, iconPosition = _d === void 0 ? collapsePropIconPositionDefault : _d, _e = props.directionIcon, directionIcon = _e === void 0 ? collapsePropDirectionIconDefault : _e, _f = props.closeDirectionIcon, closeDirectionIcon = _f === void 0 ? collapsePropCloseDirectionIconDefault : _f, style = props.style, otherProps = __rest(props, ["label", "size", "view", "className", "isOpen", "children", "hoverEffect", "divider", "icon", "closeIcon", "rightSide", "horizontalSpace", "iconPosition", "directionIcon", "closeDirectionIcon", "style"]);
-    return (React.createElement("div", { ref: ref, className: cnCollapse({ size: size, view: view, horizontalSpace: horizontalSpace }, [className]), style: style },
+    var collapseRef = useRef(null);
+    var _a = usePropsHandler(COMPONENT_NAME, props, collapseRef), label = _a.label, _b = _a.size, size = _b === void 0 ? collapsePropSizeDefault : _b, _c = _a.view, view = _c === void 0 ? collapsePropViewDefault : _c, className = _a.className, isOpen = _a.isOpen, children = _a.children, hoverEffect = _a.hoverEffect, divider = _a.divider, _d = _a.icon, icon = _d === void 0 ? IconArrowDown : _d, closeIcon = _a.closeIcon, rightSide = _a.rightSide, horizontalSpace = _a.horizontalSpace, _e = _a.iconPosition, iconPosition = _e === void 0 ? collapsePropIconPositionDefault : _e, _f = _a.directionIcon, directionIcon = _f === void 0 ? collapsePropDirectionIconDefault : _f, _g = _a.closeDirectionIcon, closeDirectionIcon = _g === void 0 ? collapsePropCloseDirectionIconDefault : _g, style = _a.style, otherProps = __rest(_a, ["label", "size", "view", "className", "isOpen", "children", "hoverEffect", "divider", "icon", "closeIcon", "rightSide", "horizontalSpace", "iconPosition", "directionIcon", "closeDirectionIcon", "style"]);
+    return (React.createElement("div", { ref: useForkRef([ref, collapseRef]), className: cnCollapse({ size: size, view: view, horizontalSpace: horizontalSpace }, [className]), style: style },
         React.createElement("div", __assign({ className: cnCollapse('Label', {
                 hoverEffect: hoverEffect,
                 iconPosition: iconPosition

package/__internal__/src/components/Combobox/Combobox.d.ts

@@ -1,4 +1,5 @@
 import '../SelectComponents/Select.css';
 import { ComboboxComponent } from './helpers';
+export declare const COMPONENT_NAME: "Combobox";
 export declare const Combobox: ComboboxComponent;
 export * from './helpers';

package/__internal__/src/components/Combobox/Combobox.js

@@ -6,6 +6,7 @@ import { useSelect } from '../../hooks/useSelect/useSelect';
 import { IconClose } from '../../icons/IconClose/IconClose';
 import { IconSelect } from '../../icons/IconSelect/IconSelect';
 import { cnMixFocus } from '../../mixs/MixFocus/MixFocus';
+import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { cnSelect } from '../SelectComponents/cnSelect';
 import { defaultlabelForCreate, defaultLabelForEmptyItems, defaultlabelForNotFound, getInputWidth, getSelectDropdownForm, } from '../SelectComponents/helpers';
 import { SelectContainer } from '../SelectComponents/SelectContainer/SelectContainer';
@@ -14,12 +15,13 @@ import { SelectItem } from '../SelectComponents/SelectItem/SelectItem';
 import { SelectValueTag } from '../SelectComponents/SelectValueTag/SelectValueTag';
 import { defaultPropForm, defaultPropSize, defaultPropView } from '../SelectComponents/types';
 import { isMultipleParams, isNotMultipleParams, withDefaultGetters, } from './helpers';
+export var COMPONENT_NAME = 'Combobox';
 function ComboboxRender(props, ref) {
     var defaultDropdownRef = useRef(null);
     var controlInnerRef = useRef(null);
     var helperInputFakeElement = useRef(null);
     var controlRef = useRef(null);
-    var _a = withDefaultGetters(props), placeholder = _a.placeholder, onBlur = _a.onBlur, onFocus = _a.onFocus, items = _a.items, onChange = _a.onChange, value = _a.value, disabled = _a.disabled, ariaLabel = _a.ariaLabel, id = _a.id, required = _a.required, _b = _a.dropdownRef, dropdownRef = _b === void 0 ? defaultDropdownRef : _b, _c = _a.form, form = _c === void 0 ? defaultPropForm : _c, _d = _a.view, view = _d === void 0 ? defaultPropView : _d, _e = _a.size, size = _e === void 0 ? defaultPropSize : _e, dropdownClassName = _a.dropdownClassName, name = _a.name, _f = _a.groups, groups = _f === void 0 ? [] : _f, getItemLabel = _a.getItemLabel, getItemKey = _a.getItemKey, getItemGroupKey = _a.getItemGroupKey, getItemDisabled = _a.getItemDisabled, getGroupKey = _a.getGroupKey, getGroupLabel = _a.getGroupLabel, renderItem = _a.renderItem, renderValueProp = _a.renderValue, onCreate = _a.onCreate, inputRefProp = _a.inputRef, _g = _a.labelForNotFound, labelForNotFound = _g === void 0 ? defaultlabelForNotFound : _g, _h = _a.labelForCreate, labelForCreate = _h === void 0 ? defaultlabelForCreate : _h, _j = _a.labelForEmptyItems, labelForEmptyItems = _j === void 0 ? defaultLabelForEmptyItems : _j, searchFunction = _a.searchFunction, _k = _a.multiple, multiple = _k === void 0 ? false : _k, style = _a.style, otherProps = __rest(_a, ["placeholder", "onBlur", "onFocus", "items", "onChange", "value", "disabled", "ariaLabel", "id", "required", "dropdownRef", "form", "view", "size", "dropdownClassName", "name", "groups", "getItemLabel", "getItemKey", "getItemGroupKey", "getItemDisabled", "getGroupKey", "getGroupLabel", "renderItem", "renderValue", "onCreate", "inputRef", "labelForNotFound", "labelForCreate", "labelForEmptyItems", "searchFunction", "multiple", "style"]);
+    var _a = usePropsHandler(COMPONENT_NAME, withDefaultGetters(props), controlRef), placeholder = _a.placeholder, onBlur = _a.onBlur, onFocus = _a.onFocus, items = _a.items, onChange = _a.onChange, value = _a.value, disabled = _a.disabled, ariaLabel = _a.ariaLabel, id = _a.id, required = _a.required, _b = _a.dropdownRef, dropdownRef = _b === void 0 ? defaultDropdownRef : _b, _c = _a.form, form = _c === void 0 ? defaultPropForm : _c, _d = _a.view, view = _d === void 0 ? defaultPropView : _d, _e = _a.size, size = _e === void 0 ? defaultPropSize : _e, dropdownClassName = _a.dropdownClassName, name = _a.name, _f = _a.groups, groups = _f === void 0 ? [] : _f, getItemLabel = _a.getItemLabel, getItemKey = _a.getItemKey, getItemGroupKey = _a.getItemGroupKey, getItemDisabled = _a.getItemDisabled, getGroupKey = _a.getGroupKey, getGroupLabel = _a.getGroupLabel, renderItem = _a.renderItem, renderValueProp = _a.renderValue, onCreate = _a.onCreate, inputRefProp = _a.inputRef, _g = _a.labelForNotFound, labelForNotFound = _g === void 0 ? defaultlabelForNotFound : _g, _h = _a.labelForCreate, labelForCreate = _h === void 0 ? defaultlabelForCreate : _h, _j = _a.labelForEmptyItems, labelForEmptyItems = _j === void 0 ? defaultLabelForEmptyItems : _j, onInputChange = _a.onInputChange, searchFunction = _a.searchFunction, isLoading = _a.isLoading, _k = _a.multiple, multiple = _k === void 0 ? false : _k, style = _a.style, otherProps = __rest(_a, ["placeholder", "onBlur", "onFocus", "items", "onChange", "value", "disabled", "ariaLabel", "id", "required", "dropdownRef", "form", "view", "size", "dropdownClassName", "name", "groups", "getItemLabel", "getItemKey", "getItemGroupKey", "getItemDisabled", "getGroupKey", "getGroupLabel", "renderItem", "renderValue", "onCreate", "inputRef", "labelForNotFound", "labelForCreate", "labelForEmptyItems", "onInputChange", "searchFunction", "isLoading", "multiple", "style"]);
     var _l = useSelect({
         items: items,
         groups: groups,
@@ -54,6 +56,11 @@ function ComboboxRender(props, ref) {
     };
     var renderValue = renderValueProp || (multiple ? renderValueDefaultMultiple : renderValueDefaultNotMultiple);
     var inputRefForRender = useForkRef([inputRef, inputRefProp]);
+    var handleChangeValue = function (e) {
+        handleInputChange(e);
+        var value = e.target.value;
+        !disabled && (onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange({ e: e, id: id, name: name, value: value || null }));
+    };
     var renderControlValue = function () {
         var width = multiple ? getInputWidth(controlInnerRef, helperInputFakeElement) : undefined;
         return (React.createElement(React.Fragment, null,
@@ -64,7 +71,7 @@ function ComboboxRender(props, ref) {
                 }),
             isNotMultipleParams(props) && props.value && renderValue({ item: props.value }),
             (!value || (Array.isArray(value) && value.length === 0)) && !searchValue && placeholder && (React.createElement("span", { className: cnSelect('Placeholder'), title: "placeholder" }, placeholder)),
-            React.createElement("input", __assign({}, getKeyProps(), { type: "text", name: name, onFocus: handleInputFocus, onBlur: handleInputBlur, "aria-label": ariaLabel, onChange: handleInputChange, ref: inputRefForRender, className: cnSelect('Input', { size: size, hide: !multiple && !!value, multiple: multiple }), value: searchValue, style: { width: width } }))));
+            React.createElement("input", __assign({}, getKeyProps(), { type: "text", name: name, onFocus: handleInputFocus, onBlur: handleInputBlur, "aria-label": ariaLabel, onChange: handleChangeValue, ref: inputRefForRender, className: cnSelect('Input', { size: size, hide: !multiple && !!value, multiple: multiple }), value: searchValue, style: { width: width } }))));
     };
     return (React.createElement(SelectContainer, __assign({ focused: isFocused, disabled: disabled, size: size, view: view, required: required, form: form, multiple: multiple, ref: ref, style: style }, otherProps),
         React.createElement("div", { className: cnSelect('Control', { hasInput: true }), ref: controlRef, "aria-expanded": isOpen, "aria-haspopup": "listbox", id: id },
@@ -76,7 +83,7 @@ function ComboboxRender(props, ref) {
                 React.createElement("span", { className: cnSelect('Delimiter') }),
                 React.createElement("button", { type: "button", className: cnSelect('IndicatorsDropdown'), tabIndex: -1, onClick: handleToggleDropdown },
                     React.createElement(IconSelect, { size: "xs", className: cnSelect('DropdownIndicatorIcon') })))),
-        React.createElement(SelectDropdown, { isOpen: isOpen, size: size, controlRef: controlRef, getOptionProps: getOptionProps, dropdownRef: dropdownRef, form: dropdownForm, className: dropdownClassName, renderItem: renderItem || renderItemDefault, getGroupLabel: getGroupLabel, visibleItems: visibleItems, labelForNotFound: labelForNotFound, labelForCreate: labelForCreate, labelForEmptyItems: labelForEmptyItems, notFound: notFound, hasItems: hasItems, style: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? { zIndex: style.zIndex + 1 } : undefined }),
+        React.createElement(SelectDropdown, { isOpen: isOpen, size: size, controlRef: controlRef, getOptionProps: getOptionProps, dropdownRef: dropdownRef, form: dropdownForm, className: dropdownClassName, renderItem: renderItem || renderItemDefault, getGroupLabel: getGroupLabel, visibleItems: visibleItems, labelForNotFound: labelForNotFound, labelForCreate: labelForCreate, isLoading: isLoading, labelForEmptyItems: labelForEmptyItems, notFound: notFound, hasItems: hasItems, style: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? { zIndex: style.zIndex + 1 } : undefined }),
         React.createElement("div", { className: cnSelect('HelperInputFakeElement'), ref: helperInputFakeElement }, searchValue)));
 }
 export var Combobox = forwardRef(ComboboxRender);

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { PropsWithHTMLAttributesAndRef } from '../../utils/types/PropsWithHTMLAttributes';
 import { PropForm, PropSize, PropStatus, PropView, RenderItemProps } from '../SelectComponents/types';
+import { TextFieldPropOnChange } from '../TextField/helpers';
 export declare type DefaultItem = {
     label: string;
     id: string | number;
@@ -39,6 +40,7 @@ export declare type ComboboxProps<ITEM = DefaultItem, GROUP = DefaultGroup, MULT
     placeholder?: string;
     ariaLabel?: string;
     status?: PropStatus;
+    isLoading?: boolean;
     dropdownClassName?: string;
     dropdownRef?: React.RefObject<HTMLDivElement>;
     name?: string;
@@ -59,6 +61,7 @@ export declare type ComboboxProps<ITEM = DefaultItem, GROUP = DefaultGroup, MULT
     multiple?: MULTIPLE;
     value?: PropValue<ITEM, MULTIPLE>;
     groups?: GROUP[];
+    onInputChange?: TextFieldPropOnChange;
     getItemLabel?: PropGetItemLabel<ITEM>;
     getItemKey?: PropGetItemKey<ITEM>;
     getItemGroupKey?: PropGetItemGroupKey<ITEM>;
@@ -104,6 +107,7 @@ export declare function withDefaultGetters<ITEM = DefaultItem, GROUP = DefaultGr
     placeholder?: string | undefined;
     ariaLabel?: string | undefined;
     status?: "alert" | "success" | "warning" | undefined;
+    isLoading?: boolean | undefined;
     dropdownClassName?: string | undefined;
     dropdownRef?: React.RefObject<HTMLDivElement> | undefined;
     name?: string | undefined;
@@ -124,6 +128,7 @@ export declare function withDefaultGetters<ITEM = DefaultItem, GROUP = DefaultGr
     multiple?: MULTIPLE | undefined;
     value?: PropValue<ITEM, MULTIPLE>;
     groups?: GROUP[] | undefined;
+    onInputChange?: TextFieldPropOnChange | undefined;
     getItemLabel?: PropGetItemLabel<ITEM> | undefined;
     getItemKey?: PropGetItemKey<ITEM> | undefined;
     getItemGroupKey?: PropGetItemGroupKey<ITEM> | undefined;

package/__internal__/src/components/ContextMenuCanary/ContextMenuCanary.d.ts

@@ -1,4 +1,5 @@
 import './ContextMenu.css';
 import { ContextMenuComponent } from './types';
+export declare const COMPONENT_NAME: "ContextMenu";
 export declare const ContextMenu: ContextMenuComponent;
 export * from './types';

package/__internal__/src/components/ContextMenuCanary/ContextMenuCanary.js

@@ -6,14 +6,16 @@ import { useFlag } from '../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../hooks/useForkRef/useForkRef';
 import { animateTimeout, cnMixPopoverAnimate, } from '../../mixs/MixPopoverAnimate/MixPopoverAnimate';
 import { cn } from '../../utils/bem';
+import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { ContextMenuLevels } from './ContextMenuLevels/ContextMenuLevels';
 var cnContextMenu = cn('ContextMenuCanary');
+export var COMPONENT_NAME = 'ContextMenu';
 function ContextMenuRender(props, ref) {
-    var isOpen = props.isOpen, className = props.className, onSetDirection = props.onSetDirection, otherProps = __rest(props, ["isOpen", "className", "onSetDirection"]);
-    var _a = __read(useFlag(), 2), playAnimation = _a[0], setPlayAnimation = _a[1];
-    var _b = __read(useState(props.direction), 2), direction = _b[0], setDirection = _b[1];
     var nodeRef = useRef(null);
     var levelRef = useForkRef([ref, nodeRef]);
+    var _a = usePropsHandler(COMPONENT_NAME, props, levelRef), isOpen = _a.isOpen, className = _a.className, onSetDirection = _a.onSetDirection, otherProps = __rest(_a, ["isOpen", "className", "onSetDirection"]);
+    var _b = __read(useFlag(), 2), playAnimation = _b[0], setPlayAnimation = _b[1];
+    var _c = __read(useState(props.direction), 2), direction = _c[0], setDirection = _c[1];
     var handleSetDirection = function (d) {
         setDirection(d);
         onSetDirection === null || onSetDirection === void 0 ? void 0 : onSetDirection(d);

package/__internal__/src/components/ContextMenuCanary/ContextMenuLevel/ContextMenuLevel.d.ts

@@ -1,4 +1,5 @@
 import './ContextMenuLevel.css';
 import { ContextMenuLevelComponent } from '../types';
 export declare const cnContextMenuLevel: import("@bem-react/classname").ClassNameFormatter;
+export declare function clearTimers(): void;
 export declare const ContextMenuLevel: ContextMenuLevelComponent;

package/__internal__/src/components/ContextMenuCanary/ContextMenuLevel/ContextMenuLevel.js

@@ -21,6 +21,25 @@ var renderHeader = function (groupLabel, first, size) {
     }
     return (React.createElement(Text, { view: "secondary", transform: "uppercase", className: cnContextMenuLevel('Header', { size: size, first: first }), size: getByMap(sizeMapHeader, size) }, groupLabel));
 };
+var timers = [];
+export function clearTimers() {
+    var e_1, _a;
+    try {
+        for (var timers_1 = __values(timers), timers_1_1 = timers_1.next(); !timers_1_1.done; timers_1_1 = timers_1.next()) {
+            var timer = timers_1_1.value;
+            clearTimeout(timer);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (timers_1_1 && !timers_1_1.done && (_a = timers_1["return"])) _a.call(timers_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    timers = [];
+}
+var closeDelay = 300;
 function ContextMenuLevelRender(props, ref) {
     var _a = props.size, size = _a === void 0 ? contextMenuDefaultSize : _a, items = props.items, groupsProp = props.groups, className = props.className, 
     // Свойства относящиеся к меню
@@ -34,7 +53,7 @@ function ContextMenuLevelRender(props, ref) {
     var _b = __read(useFlag(false), 2), hovered = _b[0], setHovered = _b[1];
     var groups = getGroups(items, getItemGroupId, groupsProp, getGroupId, sortGroup && (function (a, b) { return sortGroup(a.key, b.key); }));
     var constructItemRefs = function () {
-        var e_1, _a;
+        var e_2, _a;
         var refs = {};
         try {
             for (var groups_1 = __values(groups), groups_1_1 = groups_1.next(); !groups_1_1.done; groups_1_1 = groups_1.next()) {
@@ -44,20 +63,22 @@ function ContextMenuLevelRender(props, ref) {
                 }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
                 if (groups_1_1 && !groups_1_1.done && (_a = groups_1["return"])) _a.call(groups_1);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return refs;
     };
     var itemsRefs = useMemo(constructItemRefs, [items, groupsProp]);
     useEffect(function () {
         if (levelDepth !== 0 && !hovered && hoveredParenLevel < levelDepth) {
-            setTimeout(function () { return deleteLevel(levelDepth); }, 300);
+            clearTimeout(timers[levelDepth]);
+            timers[levelDepth] = setTimeout(function () { return deleteLevel(levelDepth); }, closeDelay);
         }
+        return function () { return clearTimeout(timers[levelDepth]); };
     }, [hovered, hoveredParenLevel]);
     var onMouseEnter = function (item, itemIndex) {
         var subMenu = getItemSubMenu(item);

package/__internal__/src/components/ContextMenuCanary/ContextMenuLevels/ContextMenuLevels.js

@@ -4,7 +4,7 @@ import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside'
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { useRefs } from '../../../hooks/useRefs/useRefs';
 import { directions } from '../../Popover/Popover';
-import { ContextMenuLevel } from '../ContextMenuLevel/ContextMenuLevel';
+import { clearTimers, ContextMenuLevel } from '../ContextMenuLevel/ContextMenuLevel';
 import { getLevels, withDefaultGetters } from '../helper';
 import { contextMenuPropDefaultSubMenuDirection, contextMenuPropSubMenuDirections, } from '../types';
 function ContextMenuLevelsRender(propsComponent, ref) {
@@ -54,6 +54,7 @@ function ContextMenuLevelsRender(propsComponent, ref) {
         handler: function (e) { return onClickOutside === null || onClickOutside === void 0 ? void 0 : onClickOutside(e); }
     });
     useEffect(function () {
+        clearTimers();
         setLevels(getLevels({
             levels: levels,
             items: items,
@@ -61,11 +62,11 @@ function ContextMenuLevelsRender(propsComponent, ref) {
             getItemKey: getItemKey,
             getItemSubMenu: getItemSubMenu
         }));
+        return function () { return clearTimers(); };
     }, [items]);
     var firstLevelRef = useForkRef([levelsRefs[0], ref]);
-    return (React.createElement(React.Fragment, null, levels.map(function (level, index) {
-        var _a;
-        return (React.createElement(ContextMenuLevel, __assign({}, otherProps, level, { key: "ContextMenu-" + index, style: __assign(__assign({}, style), { zIndex: Number((_a = style === null || style === void 0 ? void 0 : style.zIndex) !== null && _a !== void 0 ? _a : 0) + index }), levelDepth: index, getItemLabel: getItemLabel, addLevel: addLevel, deleteLevel: deleteLevel, onSetDirection: index > 0 ? setSubMenuDirection : props.onSetDirection, hoveredParenLevel: hoveredParenLevel, setHoveredParenLevel: setHoveredParenLevel, getItemSubMenu: getItemSubMenu, getItemKey: getItemKey, ref: index === 0 ? firstLevelRef : levelsRefs[index], spareDirection: index === 0 ? spareDirection : 'rightStartUp' })));
-    })));
+    return (React.createElement(React.Fragment, null, levels.map(function (level, index) { return (React.createElement(ContextMenuLevel, __assign({}, otherProps, level, { key: "ContextMenu-" + index, style: __assign(__assign({}, style), {
+            zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined
+        }), levelDepth: index, getItemLabel: getItemLabel, addLevel: addLevel, deleteLevel: deleteLevel, onSetDirection: index > 0 ? setSubMenuDirection : props.onSetDirection, hoveredParenLevel: hoveredParenLevel, setHoveredParenLevel: setHoveredParenLevel, getItemSubMenu: getItemSubMenu, getItemKey: getItemKey, ref: index === 0 ? firstLevelRef : levelsRefs[index], spareDirection: index === 0 ? spareDirection : 'rightStartUp' }))); })));
 }
 export var ContextMenuLevels = React.forwardRef(ContextMenuLevelsRender);

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

@@ -1,3 +1,4 @@
 import { DatePickerComponent } from './helpers';
+export declare const COMPONENT_NAME: "DatePicker";
 export declare const DatePicker: DatePickerComponent;
 export * from './helpers';

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

@@ -1,28 +1,36 @@
 import { __assign, __rest } from "tslib";
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useMemo, useRef } from 'react';
+import { useForkRef } from '../../hooks/useForkRef/useForkRef';
 import { maxDateDefault, minDateDefault } from '../../utils/date';
 import { getByMap } from '../../utils/getByMap';
+import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { DatePickerTypeDate } from './DatePickerTypeDate/DatePickerTypeDate';
 import { DatePickerTypeDateRange } from './DatePickerTypeDateRange/DatePickerTypeDateRange';
 import { DatePickerTypeDateTime } from './DatePickerTypeDateTime/DatePickerTypeDateTime';
 import { DatePickerTypeDateTimeRange } from './DatePickerTypeDateTimeRange/DatePickerTypeDateTimeRange';
-import { datePickerPropTypeDefault, } from './helpers';
+import { DatePickerTypeTime } from './DatePickerTypeTime/DatePickerTypeTime';
+import { datePickerPropTypeDefault, isTypeWithTime, } from './helpers';
 var typeMap = {
     'date': DatePickerTypeDate,
     'date-range': DatePickerTypeDateRange,
     'date-time': DatePickerTypeDateTime,
-    'date-time-range': DatePickerTypeDateTimeRange
+    'date-time-range': DatePickerTypeDateTimeRange,
+    'time': DatePickerTypeTime
 };
+export var COMPONENT_NAME = 'DatePicker';
 export var DatePicker = forwardRef(function (props, ref) {
-    var _a = props.type, type = _a === void 0 ? datePickerPropTypeDefault : _a, _b = props.minDate, minDate = _b === void 0 ? minDateDefault : _b, _c = props.maxDate, maxDate = _c === void 0 ? maxDateDefault : _c, multiplicityMinutes = props.multiplicityMinutes, multiplicitySeconds = props.multiplicitySeconds, multiplicityHours = props.multiplicityHours, otherProps = __rest(props, ["type", "minDate", "maxDate", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
-    var timeProps = type === 'date-time'
-        ? {
-            multiplicityMinutes: multiplicityMinutes,
-            multiplicitySeconds: multiplicitySeconds,
-            multiplicityHours: multiplicityHours
-        }
-        : undefined;
+    var datePickerRef = useRef(null);
+    var _a = usePropsHandler(COMPONENT_NAME, props, datePickerRef), _b = _a.type, type = _b === void 0 ? datePickerPropTypeDefault : _b, _c = _a.minDate, minDate = _c === void 0 ? minDateDefault : _c, _d = _a.maxDate, maxDate = _d === void 0 ? maxDateDefault : _d, multiplicityMinutes = _a.multiplicityMinutes, multiplicitySeconds = _a.multiplicitySeconds, multiplicityHours = _a.multiplicityHours, otherProps = __rest(_a, ["type", "minDate", "maxDate", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
+    var timeProps = useMemo(function () {
+        return isTypeWithTime(type)
+            ? {
+                multiplicityMinutes: multiplicityMinutes,
+                multiplicitySeconds: multiplicitySeconds,
+                multiplicityHours: multiplicityHours
+            }
+            : undefined;
+    }, [type, multiplicityMinutes, multiplicitySeconds, multiplicityHours]);
     var Component = getByMap(typeMap, type);
-    return React.createElement(Component, __assign({}, otherProps, timeProps, { minDate: minDate, maxDate: maxDate, ref: ref }));
+    return (React.createElement(Component, __assign({}, otherProps, timeProps, { minDate: minDate, maxDate: maxDate, ref: useForkRef([ref, datePickerRef]) })));
 });
 export * from './helpers';

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

@@ -1,17 +1,15 @@
 import { __assign, __read, __rest } from "tslib";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { format, isValid, isWithinInterval, parse } from 'date-fns';
-import IMask from 'imask';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { useMutableRef } from '../../../hooks/useMutableRef/useMutableRef';
-import { leapYear, maxDateDefault, minDateDefault } from '../../../utils/date';
+import { maxDateDefault, minDateDefault } from '../../../utils/date';
 import { TextField } from '../../TextField/TextField';
-import { datePickerErrorTypes, datePickerPropFormatTypeDate, datePickerPropPlaceholderTypeDate, datePickerPropSeparatorDefault, } from '../helpers';
-import { getPartsDate } from './helpers';
+import { datePickerErrorTypes, datePickerPropFormatTypeDate, datePickerPropPlaceholderTypeDate, datePickerPropSeparatorDefault, getPartsDate, } from '../helpers';
+import { useImask } from './helpers';
 export var DatePickerFieldTypeDate = React.forwardRef(function (props, ref) {
     var _a = props.format, formatProp = _a === void 0 ? datePickerPropFormatTypeDate : _a, _b = props.separator, separator = _b === void 0 ? datePickerPropSeparatorDefault : _b, _c = props.placeholder, placeholder = _c === void 0 ? datePickerPropPlaceholderTypeDate : _c, onChange = props.onChange, onError = props.onError, _d = props.minDate, minDate = _d === void 0 ? minDateDefault : _d, _e = props.maxDate, maxDate = _e === void 0 ? maxDateDefault : _e, value = props.value, inputRefProp = props.inputRef, otherProps = __rest(props, ["format", "separator", "placeholder", "onChange", "onError", "minDate", "maxDate", "value", "inputRef"]);
     var inputRef = useRef(null);
-    var imaskRef = useRef(null);
     var onChangeRef = useMutableRef(onChange);
     var _f = __read(useState(value && isValid(value) ? format(value, formatProp) : null), 2), stringValue = _f[0], setStringValue = _f[1];
     var handleChange = useCallback(function (e, stringValue) {
@@ -22,7 +20,11 @@ export var DatePickerFieldTypeDate = React.forwardRef(function (props, ref) {
                 onChange({ e: e, value: null });
                 return;
             }
-            var _a = __read(getPartsDate(stringValue, formatProp, separator), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
+            var _a = __read(getPartsDate(stringValue, formatProp, separator, false, [
+                'dd',
+                'MM',
+                'yyyy',
+            ]), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
             if (dd && MM && yyyy) {
                 var date = parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy, datePickerPropFormatTypeDate, new Date());
                 if (!isWithinInterval(date, { start: minDate, end: maxDate })) {
@@ -45,6 +47,7 @@ export var DatePickerFieldTypeDate = React.forwardRef(function (props, ref) {
             }
         }
     }, [minDate === null || minDate === void 0 ? void 0 : minDate.getTime(), maxDate === null || maxDate === void 0 ? void 0 : maxDate.getTime(), formatProp, separator]);
+    useImask(formatProp, separator, inputRef, stringValue, onError);
     // при изменении value, нужно обновить stringValue
     useEffect(function () {
         if (value && isValid(value)) {
@@ -60,66 +63,6 @@ export var DatePickerFieldTypeDate = React.forwardRef(function (props, ref) {
     }, [value === null || value === void 0 ? void 0 : value.getTime()]);
     // задаем маску и сохраняем обьект маски в ref
     // обнавляем при смене формата
-    useEffect(function () {
-        if (inputRef.current) {
-            imaskRef.current = IMask(inputRef.current, {
-                mask: Date,
-                pattern: formatProp,
-                blocks: {
-                    yyyy: {
-                        mask: IMask.MaskedRange,
-                        from: 1,
-                        to: 9999
-                    },
-                    MM: {
-                        mask: IMask.MaskedRange,
-                        from: 1,
-                        to: 12
-                    },
-                    dd: {
-                        mask: IMask.MaskedRange,
-                        from: 1,
-                        to: 31
-                    }
-                },
-                lazy: true,
-                autofix: true,
-                format: function (date) { return format(date, formatProp); },
-                parse: function (string) { return parse(string, formatProp, new Date()); },
-                validate: function (string) {
-                    var _a = __read(getPartsDate(string, formatProp, separator), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
-                    if (dd &&
-                        MM &&
-                        !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + leapYear, datePickerPropFormatTypeDate, new Date()))) {
-                        onError &&
-                            onError({
-                                type: datePickerErrorTypes[1],
-                                stringValue: string,
-                                dd: dd,
-                                MM: MM,
-                                yyyy: yyyy
-                            });
-                        return false;
-                    }
-                    if (dd &&
-                        MM &&
-                        yyyy &&
-                        !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy, datePickerPropFormatTypeDate, new Date()))) {
-                        onError &&
-                            onError({
-                                type: datePickerErrorTypes[1],
-                                stringValue: string,
-                                dd: dd,
-                                MM: MM,
-                                yyyy: yyyy
-                            });
-                        return false;
-                    }
-                    return true;
-                }
-            });
-        }
-    }, [formatProp, separator]);
     // задаем нативный oninput, так как с маской по другому не будет работать
     // обнавляем oninput при смене handleChange
     useEffect(function () {
@@ -130,12 +73,5 @@ export var DatePickerFieldTypeDate = React.forwardRef(function (props, ref) {
             };
         }
     }, [handleChange]);
-    // Нужно для синхранизации value c Imask,
-    // так как value мы можем задать через пропс без самого ввода,
-    // и Imask требует ручной синхронихации в этом случае
-    useEffect(function () {
-        var _a;
-        (_a = imaskRef.current) === null || _a === void 0 ? void 0 : _a.updateValue();
-    }, [stringValue]);
     return (React.createElement(TextField, __assign({}, otherProps, { type: "text", inputContainerRef: ref, inputRef: useForkRef([inputRef, inputRefProp]), value: stringValue, placeholder: placeholder })));
 });

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

@@ -42,5 +42,5 @@ export declare type DatePickerFieldTypeDateProps = PropsWithHTMLAttributes<{
     caption?: string;
     labelPosition?: 'top' | 'left';
 }, HTMLDivElement>;
-export declare const getPartsDate: (value: string, format: string, separator: string, markers?: string[]) => (string | undefined)[];
+export declare const useImask: (formatProp: string, separator: string, inputRef: React.RefObject<HTMLInputElement>, stringValue: string | null, onError: DatePickerPropOnError | undefined) => void;
 export {};

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

@@ -1,13 +1,82 @@
-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 getPartsDate = function (value, format, separator, markers) {
-    if (markers === void 0) { markers = ['dd', 'MM', 'yyyy']; }
-    var formatArray = format.split(separator);
-    var valueArray = value.split(separator);
-    return markers.map(function (marker) { return getPartDate(formatArray, valueArray, marker); });
+import { __read } from "tslib";
+import { useEffect, useRef } from 'react';
+import { format, isValid, parse } from 'date-fns';
+import IMask from 'imask';
+import { leapYear } from '../../../utils/date';
+import { datePickerErrorTypes, datePickerPropFormatTypeDate, datePickerPropSeparatorDefault, getPartsDate, } from '../helpers';
+export var useImask = function (formatProp, separator, inputRef, stringValue, onError) {
+    var imaskRef = useRef(null);
+    // задаем маску и сохраняем обьект маски в ref
+    // обнавляем при смене формата
+    useEffect(function () {
+        if (inputRef.current) {
+            imaskRef.current = IMask(inputRef.current, {
+                mask: Date,
+                pattern: formatProp,
+                blocks: {
+                    yyyy: {
+                        mask: IMask.MaskedRange,
+                        from: 1,
+                        to: 9999
+                    },
+                    MM: {
+                        mask: IMask.MaskedRange,
+                        from: 1,
+                        to: 12
+                    },
+                    dd: {
+                        mask: IMask.MaskedRange,
+                        from: 1,
+                        to: 31
+                    }
+                },
+                lazy: true,
+                autofix: true,
+                format: function (date) { return format(date, formatProp); },
+                parse: function (string) { return parse(string, formatProp, new Date()); },
+                validate: function (string) {
+                    var _a = __read(getPartsDate(string, formatProp, separator, false, [
+                        'dd',
+                        'MM',
+                        'yyyy',
+                    ]), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
+                    if (dd &&
+                        MM &&
+                        !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + leapYear, datePickerPropFormatTypeDate, new Date()))) {
+                        onError &&
+                            onError({
+                                type: datePickerErrorTypes[1],
+                                stringValue: string,
+                                dd: dd,
+                                MM: MM,
+                                yyyy: yyyy
+                            });
+                        return false;
+                    }
+                    if (dd &&
+                        MM &&
+                        yyyy &&
+                        !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy, datePickerPropFormatTypeDate, new Date()))) {
+                        onError &&
+                            onError({
+                                type: datePickerErrorTypes[1],
+                                stringValue: string,
+                                dd: dd,
+                                MM: MM,
+                                yyyy: yyyy
+                            });
+                        return false;
+                    }
+                    return true;
+                }
+            });
+        }
+    }, [formatProp, separator]);
+    // Нужно для синхранизации value c Imask,
+    // так как value мы можем задать через пропс без самого ввода,
+    // и Imask требует ручной синхронихации в этом случае
+    useEffect(function () {
+        var _a;
+        (_a = imaskRef.current) === null || _a === void 0 ? void 0 : _a.updateValue();
+    }, [stringValue]);
 };

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

@@ -5,14 +5,14 @@ import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { useMutableRef } from '../../../hooks/useMutableRef/useMutableRef';
 import { maxDateDefault, minDateDefault } from '../../../utils/date';
 import { TextField } from '../../TextField/TextField';
-import { datePickerErrorTypes, datePickerPropFormatTypeDateTime, datePickerPropPlaceholderTypeDateTime, datePickerPropSeparatorDefault, } from '../helpers';
-import { getParts, getPartsDate, useImask } from './helpers';
+import { datePickerErrorTypes, datePickerPropFormatTypeDateTime, datePickerPropPlaceholderTypeDateTime, datePickerPropSeparatorDefault, getParts, getPartsDate, } from '../helpers';
+import { useImask } from './helpers';
 export var DatePickerFieldTypeDateTime = React.forwardRef(function (props, ref) {
     var _a = props.format, formatProp = _a === void 0 ? datePickerPropFormatTypeDateTime : _a, _b = props.separator, separator = _b === void 0 ? datePickerPropSeparatorDefault : _b, _c = props.placeholder, placeholder = _c === void 0 ? datePickerPropPlaceholderTypeDateTime : _c, onChange = props.onChange, onError = props.onError, _d = props.minDate, minDate = _d === void 0 ? minDateDefault : _d, _e = props.maxDate, maxDate = _e === void 0 ? maxDateDefault : _e, value = props.value, inputRefProp = props.inputRef, multiplicityHours = props.multiplicityHours, multiplicitySeconds = props.multiplicitySeconds, multiplicityMinutes = props.multiplicityMinutes, otherProps = __rest(props, ["format", "separator", "placeholder", "onChange", "onError", "minDate", "maxDate", "value", "inputRef", "multiplicityHours", "multiplicitySeconds", "multiplicityMinutes"]);
     var inputRef = useRef(null);
     var onChangeRef = useMutableRef(onChange);
     var _f = __read(useState(value && isValid(value) ? format(value, formatProp) : null), 2), stringValue = _f[0], setStringValue = _f[1];
-    var formatParts = useMemo(function () { return getParts(formatProp, separator); }, [formatProp, separator]);
+    var formatParts = useMemo(function () { return getParts(formatProp, separator, true); }, [formatProp, separator]);
     var handleChange = useCallback(function (e, stringValue) {
         setStringValue(stringValue);
         var onChange = onChangeRef.current;
@@ -21,7 +21,14 @@ export var DatePickerFieldTypeDateTime = React.forwardRef(function (props, ref)
                 onChange({ e: e, value: null });
                 return;
             }
-            var partsDate = getPartsDate(stringValue, formatProp, separator);
+            var partsDate = getPartsDate(stringValue, formatProp, separator, true, [
+                'dd',
+                'MM',
+                'yyyy',
+                'HH',
+                'mm',
+                'ss',
+            ]);
             var _a = __read(partsDate, 6), dd = _a[0], MM = _a[1], yyyy = _a[2], HH = _a[3], mm = _a[4], ss = _a[5];
             if (partsDate.filter(function (item) { return !!item; }).length === formatParts.length) {
                 var date = parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy + " " + (HH ||

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

@@ -45,7 +45,5 @@ export declare type DatePickerFieldTypeDateTimeProps = PropsWithHTMLAttributes<{
     caption?: string;
     labelPosition?: 'top' | 'left';
 }, HTMLDivElement>;
-export declare const getParts: (format: string, separator: string) => string[];
-export declare const getPartsDate: (value: string, format: string, separator: string, markers?: string[]) => (string | undefined)[];
 export declare const useImask: (formatProp: string, separator: string, multiplicityHours: number | undefined, multiplicitySeconds: number | undefined, multiplicityMinutes: number | undefined, inputRef: React.RefObject<HTMLInputElement>, stringValue: string | null, onError: DatePickerPropOnError | undefined) => void;
 export {};