@consta/uikit 3.18.2 → 3.20.0

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

@@ -10,6 +10,7 @@ export declare const breadcrumbPropFitModeDefault: "dropdown";
 export declare type BreadcrumbsPropGetItemLabel<ITEM> = (item: ITEM) => string;
 export declare type BreadcrumbsPropGetItemHref<ITEM> = (item: ITEM) => string | undefined;
 export declare type BreadcrumbsPropGetItemIcon<ITEM> = (item: ITEM) => IconComponent | undefined;
+export declare type BreadcrumbsPropGetItemSubMenu<ITEM> = (item: ITEM) => ITEM[] | undefined;
 export declare type BreadcrumbsPropGetItemOnClick<ITEM> = (item: ITEM) => React.MouseEventHandler | undefined;
 export declare type BreadcrumbsPropOnItemClick<ITEM> = (props: {
     item: ITEM;
@@ -20,6 +21,7 @@ export declare type DefaultItem = {
     icon?: IconComponent;
     href?: string;
     onClick?: React.MouseEventHandler<HTMLAnchorElement>;
+    subMenu?: DefaultItem[];
 };
 export declare type RenderItem<ITEM> = (item: ITEM | undefined, index: number | string, isFirst?: boolean, isLast?: boolean, ref?: React.Ref<HTMLLIElement>, hidden?: boolean) => React.ReactElement | undefined;
 export declare type BreadcrumbsProps<ITEM = DefaultItem> = PropsWithHTMLAttributesAndRef<{
@@ -28,6 +30,7 @@ export declare type BreadcrumbsProps<ITEM = DefaultItem> = PropsWithHTMLAttribut
     getItemHref?: BreadcrumbsPropGetItemHref<ITEM>;
     getItemIcon?: BreadcrumbsPropGetItemIcon<ITEM>;
     getItemOnClick?: BreadcrumbsPropGetItemOnClick<ITEM>;
+    getItemSubMenu?: BreadcrumbsPropGetItemSubMenu<ITEM>;
     onItemClick?: BreadcrumbsPropOnItemClick<ITEM>;
     size?: BreadcrumbPropSize;
     onlyIconRoot?: boolean;
@@ -45,16 +48,31 @@ export declare type BreadcrumbsMoreProps<ITEM> = PropsWithHTMLAttributesAndRef<{
     getItemLabel: BreadcrumbsPropGetItemLabel<ITEM>;
     getItemHref: BreadcrumbsPropGetItemHref<ITEM>;
     getItemIcon: BreadcrumbsPropGetItemIcon<ITEM>;
+    getItemSubMenu: BreadcrumbsPropGetItemSubMenu<ITEM>;
     getItemOnClick: BreadcrumbsPropGetItemOnClick<ITEM>;
     onItemClick?: BreadcrumbsPropOnItemClick<ITEM>;
 }, HTMLLIElement>;
 export declare type BreadcrumbsMoreComponent = <ITEM>(props: BreadcrumbsMoreProps<ITEM>) => React.ReactElement | null;
+export declare type BreadcrumbsItemProps<ITEM> = PropsWithHTMLAttributesAndRef<{
+    size: 'm' | 'xs' | 's' | 'l';
+    item?: ITEM;
+    getItemLabel?: BreadcrumbsPropGetItemLabel<ITEM>;
+    getItemHref?: BreadcrumbsPropGetItemHref<ITEM>;
+    getItemIcon?: BreadcrumbsPropGetItemIcon<ITEM>;
+    getItemSubMenu?: BreadcrumbsPropGetItemSubMenu<ITEM>;
+    active?: boolean;
+    onlyIcon?: boolean;
+    delimiter?: boolean;
+    onItemClick?: BreadcrumbsPropOnItemClick<ITEM>;
+}, HTMLLIElement>;
+export declare type BreadcrumbsItemComponent = <ITEM>(props: BreadcrumbsItemProps<ITEM>) => React.ReactElement | null;
 export declare type BreadcrumbsFitModeDropdownProps<ITEM> = PropsWithHTMLAttributesAndRef<{
     items: ITEM[];
     getItemLabel: BreadcrumbsPropGetItemLabel<ITEM>;
     getItemHref: BreadcrumbsPropGetItemHref<ITEM>;
     getItemIcon: BreadcrumbsPropGetItemIcon<ITEM>;
     getItemOnClick: BreadcrumbsPropGetItemOnClick<ITEM>;
+    getItemSubMenu: BreadcrumbsPropGetItemSubMenu<ITEM>;
     onItemClick?: BreadcrumbsPropOnItemClick<ITEM>;
     renderItem: RenderItem<ITEM>;
     size: BreadcrumbPropSize;

package/__internal__/src/components/ChoiceGroup/ChoiceGroup.css

@@ -5,13 +5,16 @@
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
   display: inline-flex;
-  max-width: 100%;
   background-color: var(--choice-group-bg-color);
   border-radius: var(--choice-radius);
   -webkit-box-shadow: inset 0 0 0 var(--control-border-width) var(--choice-group-border-color);
           box-shadow: inset 0 0 0 var(--control-border-width) var(--choice-group-border-color);
 }
 
+  .ChoiceGroup_truncate {
+    max-width: 100%;
+  }
+
   .ChoiceGroup_view_primary {
       --choice-bg-color: var(--color-control-bg-primary);
       --choice-text-color: var(--color-control-typo-primary);

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

@@ -37,6 +37,7 @@ declare type Props<ITEM, MULTIPLE extends boolean = false> = PropsWithHTMLAttrib
     value?: ChoiceGroupPropValue<ITEM, MULTIPLE>;
     onChange?: ChoiceGroupPropOnChange<ITEM, MULTIPLE>;
     multiple?: MULTIPLE;
+    truncate?: boolean;
     children?: never;
 }, HTMLDivElement>;
 declare type ChoiceGroupComponent = <ITEM, MULTIPLE extends boolean = false>(props: Props<ITEM, MULTIPLE>) => React.ReactElement | null;

package/__internal__/src/components/ChoiceGroup/ChoiceGroup.js

@@ -21,7 +21,7 @@ var sizeMap = {
 };
 export var cnChoiceGroup = cn('ChoiceGroup');
 export var ChoiceGroup = React.forwardRef(function (props, ref) {
-    var _a = props.size, size = _a === void 0 ? choiceGroupDefaultSize : _a, _b = props.form, form = _b === void 0 ? choiceGroupDefaultForm : _b, _c = props.view, view = _c === void 0 ? choiceGroupDefaultView : _c, _d = props.width, width = _d === void 0 ? choiceGroupWidthDefault : _d, onlyIcon = props.onlyIcon, iconSizeProp = props.iconSize, _e = props.value, value = _e === void 0 ? null : _e, _f = props.multiple, multiple = _f === void 0 ? false : _f, items = props.items, getLabel = props.getLabel, onChange = props.onChange, getIcon = props.getIcon, name = props.name, className = props.className, _g = props.disabled, disabled = _g === void 0 ? false : _g, getDisabled = props.getDisabled, otherProps = __rest(props, ["size", "form", "view", "width", "onlyIcon", "iconSize", "value", "multiple", "items", "getLabel", "onChange", "getIcon", "name", "className", "disabled", "getDisabled"]);
+    var _a = props.size, size = _a === void 0 ? choiceGroupDefaultSize : _a, _b = props.form, form = _b === void 0 ? choiceGroupDefaultForm : _b, _c = props.view, view = _c === void 0 ? choiceGroupDefaultView : _c, _d = props.width, width = _d === void 0 ? choiceGroupWidthDefault : _d, onlyIcon = props.onlyIcon, iconSizeProp = props.iconSize, _e = props.value, value = _e === void 0 ? null : _e, _f = props.multiple, multiple = _f === void 0 ? false : _f, items = props.items, getLabel = props.getLabel, onChange = props.onChange, getIcon = props.getIcon, name = props.name, className = props.className, _g = props.disabled, disabled = _g === void 0 ? false : _g, getDisabled = props.getDisabled, truncate = props.truncate, otherProps = __rest(props, ["size", "form", "view", "width", "onlyIcon", "iconSize", "value", "multiple", "items", "getLabel", "onChange", "getIcon", "name", "className", "disabled", "getDisabled", "truncate"]);
     var _h = useChoiceGroup({
         value: value,
         getKey: getLabel,
@@ -29,7 +29,9 @@ export var ChoiceGroup = React.forwardRef(function (props, ref) {
         multiple: multiple
     }), getOnChange = _h.getOnChange, getChecked = _h.getChecked;
     var iconSize = getByMap(sizeMap, size, iconSizeProp);
-    return (React.createElement("div", __assign({}, otherProps, { ref: ref, className: cnChoiceGroup({ size: size, form: form, view: view, width: width, onlyIcon: onlyIcon, disabled: disabled }, [className]) }), items.map(function (item, idx) {
+    return (React.createElement("div", __assign({}, otherProps, { ref: ref, className: cnChoiceGroup({ size: size, form: form, view: view, width: width, onlyIcon: onlyIcon, disabled: disabled, truncate: truncate }, [
+            className,
+        ]) }), items.map(function (item, idx) {
         var itemChecked = getChecked(item);
         var itemDisabled = !!getDisabled && getDisabled(item);
         return (React.createElement(React.Fragment, { key: getLabel(item) },

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,6 +62,7 @@ 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) { return (React.createElement(ContextMenuLevel, __assign({}, otherProps, level, { key: "ContextMenu-" + index, style: __assign(__assign({}, style), {

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

@@ -6,7 +6,7 @@ export declare function withDefaultGetters<ITEM, GROUP>(props: ContextMenuProps<
     items: ITEM[];
     size?: "xs" | "s" | "m" | "l" | undefined;
     direction?: "downCenter" | "upCenter" | "downRight" | "downLeft" | "upRight" | "upLeft" | "leftUp" | "leftCenter" | "leftDown" | "rightUp" | "rightCenter" | "rightDown" | "downStartLeft" | "upStartLeft" | "downStartRight" | "upStartRight" | "leftStartUp" | "leftStartDown" | "rightStartUp" | "rightStartDown" | undefined;
-    offset?: number | undefined;
+    offset?: number | "xs" | "s" | "m" | "l" | "2xs" | "xl" | "2xl" | "3xl" | "4xl" | "5xl" | "6xl" | "3xs" | undefined;
     groups?: GROUP[] | undefined;
     sortGroup?: import("./types").ContextMenuPropSortGroup | undefined;
     onItemClick?: import("./types").ContextMenuPropOnClick<ITEM> | undefined;
@@ -47,7 +47,7 @@ export declare function withDefaultGetters<ITEM, GROUP>(props: ContextMenuProps<
     items: ITEM[];
     size?: "xs" | "s" | "m" | "l" | undefined;
     direction?: "downCenter" | "upCenter" | "downRight" | "downLeft" | "upRight" | "upLeft" | "leftUp" | "leftCenter" | "leftDown" | "rightUp" | "rightCenter" | "rightDown" | "downStartLeft" | "upStartLeft" | "downStartRight" | "upStartRight" | "leftStartUp" | "leftStartDown" | "rightStartUp" | "rightStartDown" | undefined;
-    offset?: number | undefined;
+    offset?: number | "xs" | "s" | "m" | "l" | "2xs" | "xl" | "2xl" | "3xl" | "4xl" | "5xl" | "6xl" | "3xs" | undefined;
     groups?: GROUP[] | undefined;
     sortGroup?: import("./types").ContextMenuPropSortGroup | undefined;
     onItemClick?: import("./types").ContextMenuPropOnClick<ITEM> | undefined;

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

@@ -3,7 +3,7 @@ import { ClickOutsideHandler } from '../../hooks/useClickOutside/useClickOutside
 import { IconComponent } from '../../icons/Icon/Icon';
 import { PropsWithAsAttributes } from '../../utils/types/PropsWithAsAttributes';
 import { PropsWithHTMLAttributesAndRef } from '../../utils/types/PropsWithHTMLAttributes';
-import { Direction, Position } from '../Popover/Popover';
+import { Direction, PopoverPropOffset, Position } from '../Popover/Popover';
 export declare const contextMenuSizes: readonly ["m", "xs", "s", "l"];
 export declare type ContextMenuPropSize = typeof contextMenuSizes[number];
 export declare const contextMenuDefaultSize: ContextMenuPropSize;
@@ -95,7 +95,7 @@ export declare type ContextMenuProps<ITEM = ContextMenuItemDefault, GROUP = Cont
     items: ITEM[];
     size?: ContextMenuPropSize;
     direction?: Direction;
-    offset?: number;
+    offset?: PopoverPropOffset;
     groups?: GROUP[];
     sortGroup?: ContextMenuPropSortGroup;
     onItemClick?: ContextMenuPropOnClick<ITEM>;

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

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

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

@@ -1,5 +1,5 @@
 import { __assign, __rest } from "tslib";
-import React, { forwardRef, useRef } 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';
@@ -8,25 +8,31 @@ 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 { isTypeWithTime } from './helpers';
+import { datePickerPropTypeDefault, } from './types';
 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 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 = type === 'date-time'
-        ? {
-            multiplicityMinutes: multiplicityMinutes,
-            multiplicitySeconds: multiplicitySeconds,
-            multiplicityHours: multiplicityHours
-        }
-        : undefined;
+    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: useForkRef([ref, datePickerRef]) })));
 });
 export * from './helpers';
+export * from './types';

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { DateRange } from '../../../utils/types/Date';
 import { PropsWithHTMLAttributesAndRef } from '../../../utils/types/PropsWithHTMLAttributes';
 import { DateTimeAdditionalControlRenderProp, DateTimePropOnChange, DateTimePropType } from '../../DateTimeCanary/DateTimeCanary';
-import { DatePickerPropDateTimeView, DatePickerPropDropdownForm } from '../helpers';
+import { DatePickerPropDateTimeView, DatePickerPropDropdownForm } from '../types';
 export declare type DatePickerDropdownPropOnChange = DateTimePropOnChange;
 export declare type DatePickerDropdownProps = PropsWithHTMLAttributesAndRef<{
     anchorRef: React.RefObject<HTMLElement>;

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

@@ -7,7 +7,7 @@ import { animateTimeout, cnMixPopoverAnimate, } from '../../../mixs/MixPopoverAn
 import { cn } from '../../../utils/bem';
 import { DateTime, } from '../../DateTimeCanary/DateTimeCanary';
 import { Popover } from '../../Popover/Popover';
-import { datePickerPropDropdownFormDefault, } from '../helpers';
+import { datePickerPropDropdownFormDefault, } from '../types';
 var cnDatePickerDropdown = cn('DatePickerDropdown');
 export var DatePickerDropdown = forwardRef(function (props, componentRef) {
     var _a = props.form, form = _a === void 0 ? datePickerPropDropdownFormDefault : _a, anchorRef = props.anchorRef, isOpen = props.isOpen, className = props.className, zIndex = props.zIndex, otherProps = __rest(props, ["form", "anchorRef", "isOpen", "className", "zIndex"]);

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

@@ -6,7 +6,7 @@ export declare const DatePickerFieldTypeDate: React.ForwardRefExoticComponent<{
         e: Event;
         value: Date | null;
     }) => void) | undefined;
-    onError?: import("../helpers").DatePickerPropOnError | undefined;
+    onError?: import("../types").DatePickerPropOnError | undefined;
     id?: string | undefined;
     name?: string | undefined;
     disabled?: boolean | undefined;

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

@@ -1,17 +1,16 @@
 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 { datePickerPropFormatTypeDate, datePickerPropPlaceholderTypeDate, datePickerPropSeparatorDefault, getPartsDate, } from '../helpers';
+import { datePickerErrorTypes } from '../types';
+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 +21,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 +48,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 +64,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 +74,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

@@ -2,7 +2,7 @@
 import { IconComponent, IconPropSize } from '../../../icons/Icon/Icon';
 import { PropsWithHTMLAttributes } from '../../../utils/types/PropsWithHTMLAttributes';
 import { TextFieldPropForm, TextFieldPropSize, TextFieldPropStatus, TextFieldPropView, TextFieldPropWidth } from '../../TextField/TextField';
-import { DatePickerPropOnError } from '../helpers';
+import { DatePickerPropOnError } from '../types';
 declare type DatePickerFieldTypeDatePropOnChange = (props: {
     e: Event;
     value: Date | null;
@@ -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,83 @@
-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 { datePickerPropFormatTypeDate, datePickerPropSeparatorDefault, getPartsDate, } from '../helpers';
+import { datePickerErrorTypes } from '../types';
+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/DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange.d.ts

@@ -6,7 +6,7 @@ export declare const DatePickerFieldTypeDateRange: React.ForwardRefExoticCompone
         e: Event;
         value: Date | null;
     }) => void) | undefined;
-    onError?: import("../helpers").DatePickerPropOnError | undefined;
+    onError?: import("../types").DatePickerPropOnError | undefined;
     id?: string | undefined;
     name?: string | undefined;
     disabled?: boolean | undefined;
@@ -42,7 +42,7 @@ export declare const DatePickerFieldTypeDateRange: React.ForwardRefExoticCompone
     label?: string | undefined;
     caption?: string | undefined;
     labelPosition?: "left" | "top" | undefined;
-}, HTMLDivElement>, "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "lang" | "placeholder" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "disabled" | "view" | "size" | "caption" | "form" | "label" | "name" | "width" | "format" | "autoFocus" | "readOnly" | "required" | "status" | "focused" | "ariaLabel" | "labelPosition" | "iconSize" | "separator" | "minDate" | "maxDate"> & {
+}, HTMLDivElement>, "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "lang" | "placeholder" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "disabled" | "view" | "size" | "caption" | "form" | "label" | "width" | "format" | "autoFocus" | "readOnly" | "required" | "status" | "focused" | "ariaLabel" | "labelPosition" | "iconSize" | "separator" | "minDate" | "maxDate"> & {
     onChange?: ((props: {
         e: Event;
         value: import("../../../utils/types/Date").DateRange | null;
@@ -77,4 +77,6 @@ export declare const DatePickerFieldTypeDateRange: React.ForwardRefExoticCompone
     id?: string | undefined;
     onChangeCurrentVisibleDate?: ((date: Date) => void) | undefined;
     currentVisibleDate?: Date | undefined;
+    startFieldName?: string | undefined;
+    endFieldName?: string | undefined;
 } & React.RefAttributes<HTMLDivElement>>;