@consta/uikit 3.18.2 → 3.20.0

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

@@ -24,7 +24,7 @@ var sizeMap = {
 };
 exports.cnChoiceGroup = bem_1.cn('ChoiceGroup');
 exports.ChoiceGroup = react_1["default"].forwardRef(function (props, ref) {
-    var _a = props.size, size = _a === void 0 ? exports.choiceGroupDefaultSize : _a, _b = props.form, form = _b === void 0 ? exports.choiceGroupDefaultForm : _b, _c = props.view, view = _c === void 0 ? exports.choiceGroupDefaultView : _c, _d = props.width, width = _d === void 0 ? exports.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 = tslib_1.__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 ? exports.choiceGroupDefaultSize : _a, _b = props.form, form = _b === void 0 ? exports.choiceGroupDefaultForm : _b, _c = props.view, view = _c === void 0 ? exports.choiceGroupDefaultView : _c, _d = props.width, width = _d === void 0 ? exports.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 = tslib_1.__rest(props, ["size", "form", "view", "width", "onlyIcon", "iconSize", "value", "multiple", "items", "getLabel", "onChange", "getIcon", "name", "className", "disabled", "getDisabled", "truncate"]);
     var _h = useChoiceGroup_1.useChoiceGroup({
         value: value,
         getKey: getLabel,
@@ -32,7 +32,9 @@ exports.ChoiceGroup = react_1["default"].forwardRef(function (props, ref) {
         multiple: multiple
     }), getOnChange = _h.getOnChange, getChecked = _h.getChecked;
     var iconSize = getByMap_1.getByMap(sizeMap, size, iconSizeProp);
-    return (react_1["default"].createElement("div", tslib_1.__assign({}, otherProps, { ref: ref, className: exports.cnChoiceGroup({ size: size, form: form, view: view, width: width, onlyIcon: onlyIcon, disabled: disabled }, [className]) }), items.map(function (item, idx) {
+    return (react_1["default"].createElement("div", tslib_1.__assign({}, otherProps, { ref: ref, className: exports.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_1["default"].createElement(react_1["default"].Fragment, { key: getLabel(item) },

package/__internal__/cjs-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__/cjs-src/components/ContextMenuCanary/ContextMenuLevel/ContextMenuLevel.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.ContextMenuLevel = exports.cnContextMenuLevel = void 0;
+exports.ContextMenuLevel = exports.clearTimers = exports.cnContextMenuLevel = void 0;
 var tslib_1 = require("tslib");
 require("./ContextMenuLevel.css");
 var react_1 = tslib_1.__importStar(require("react"));
@@ -24,6 +24,26 @@ var renderHeader = function (groupLabel, first, size) {
     }
     return (react_1["default"].createElement(Text_1.Text, { view: "secondary", transform: "uppercase", className: exports.cnContextMenuLevel('Header', { size: size, first: first }), size: getByMap_1.getByMap(helper_1.sizeMapHeader, size) }, groupLabel));
 };
+var timers = [];
+function clearTimers() {
+    var e_1, _a;
+    try {
+        for (var timers_1 = tslib_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 = [];
+}
+exports.clearTimers = clearTimers;
+var closeDelay = 300;
 function ContextMenuLevelRender(props, ref) {
     var _a = props.size, size = _a === void 0 ? types_1.contextMenuDefaultSize : _a, items = props.items, groupsProp = props.groups, className = props.className, 
     // Свойства относящиеся к меню
@@ -37,7 +57,7 @@ function ContextMenuLevelRender(props, ref) {
     var _b = tslib_1.__read(useFlag_1.useFlag(false), 2), hovered = _b[0], setHovered = _b[1];
     var groups = getGroups_1.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 = tslib_1.__values(groups), groups_1_1 = groups_1.next(); !groups_1_1.done; groups_1_1 = groups_1.next()) {
@@ -47,20 +67,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 = react_1.useMemo(constructItemRefs, [items, groupsProp]);
     react_1.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__/cjs-src/components/ContextMenuCanary/ContextMenuLevels/ContextMenuLevels.js

@@ -57,6 +57,7 @@ function ContextMenuLevelsRender(propsComponent, ref) {
         handler: function (e) { return onClickOutside === null || onClickOutside === void 0 ? void 0 : onClickOutside(e); }
     });
     react_1.useEffect(function () {
+        ContextMenuLevel_1.clearTimers();
         setLevels(helper_1.getLevels({
             levels: levels,
             items: items,
@@ -64,6 +65,7 @@ function ContextMenuLevelsRender(propsComponent, ref) {
             getItemKey: getItemKey,
             getItemSubMenu: getItemSubMenu
         }));
+        return function () { return ContextMenuLevel_1.clearTimers(); };
     }, [items]);
     var firstLevelRef = useForkRef_1.useForkRef([levelsRefs[0], ref]);
     return (react_1["default"].createElement(react_1["default"].Fragment, null, levels.map(function (level, index) { return (react_1["default"].createElement(ContextMenuLevel_1.ContextMenuLevel, tslib_1.__assign({}, otherProps, level, { key: "ContextMenu-" + index, style: tslib_1.__assign(tslib_1.__assign({}, style), {

package/__internal__/cjs-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__/cjs-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__/cjs-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__/cjs-src/components/DatePickerCanary/DatePickerCanary.js

@@ -11,25 +11,31 @@ var DatePickerTypeDate_1 = require("./DatePickerTypeDate/DatePickerTypeDate");
 var DatePickerTypeDateRange_1 = require("./DatePickerTypeDateRange/DatePickerTypeDateRange");
 var DatePickerTypeDateTime_1 = require("./DatePickerTypeDateTime/DatePickerTypeDateTime");
 var DatePickerTypeDateTimeRange_1 = require("./DatePickerTypeDateTimeRange/DatePickerTypeDateTimeRange");
+var DatePickerTypeTime_1 = require("./DatePickerTypeTime/DatePickerTypeTime");
 var helpers_1 = require("./helpers");
+var types_1 = require("./types");
 var typeMap = {
     'date': DatePickerTypeDate_1.DatePickerTypeDate,
     'date-range': DatePickerTypeDateRange_1.DatePickerTypeDateRange,
     'date-time': DatePickerTypeDateTime_1.DatePickerTypeDateTime,
-    'date-time-range': DatePickerTypeDateTimeRange_1.DatePickerTypeDateTimeRange
+    'date-time-range': DatePickerTypeDateTimeRange_1.DatePickerTypeDateTimeRange,
+    'time': DatePickerTypeTime_1.DatePickerTypeTime
 };
 exports.COMPONENT_NAME = 'DatePicker';
 exports.DatePicker = react_1.forwardRef(function (props, ref) {
     var datePickerRef = react_1.useRef(null);
-    var _a = usePropsHandler_1.usePropsHandler(exports.COMPONENT_NAME, props, datePickerRef), _b = _a.type, type = _b === void 0 ? helpers_1.datePickerPropTypeDefault : _b, _c = _a.minDate, minDate = _c === void 0 ? date_1.minDateDefault : _c, _d = _a.maxDate, maxDate = _d === void 0 ? date_1.maxDateDefault : _d, multiplicityMinutes = _a.multiplicityMinutes, multiplicitySeconds = _a.multiplicitySeconds, multiplicityHours = _a.multiplicityHours, otherProps = tslib_1.__rest(_a, ["type", "minDate", "maxDate", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
-    var timeProps = type === 'date-time'
-        ? {
-            multiplicityMinutes: multiplicityMinutes,
-            multiplicitySeconds: multiplicitySeconds,
-            multiplicityHours: multiplicityHours
-        }
-        : undefined;
+    var _a = usePropsHandler_1.usePropsHandler(exports.COMPONENT_NAME, props, datePickerRef), _b = _a.type, type = _b === void 0 ? types_1.datePickerPropTypeDefault : _b, _c = _a.minDate, minDate = _c === void 0 ? date_1.minDateDefault : _c, _d = _a.maxDate, maxDate = _d === void 0 ? date_1.maxDateDefault : _d, multiplicityMinutes = _a.multiplicityMinutes, multiplicitySeconds = _a.multiplicitySeconds, multiplicityHours = _a.multiplicityHours, otherProps = tslib_1.__rest(_a, ["type", "minDate", "maxDate", "multiplicityMinutes", "multiplicitySeconds", "multiplicityHours"]);
+    var timeProps = react_1.useMemo(function () {
+        return helpers_1.isTypeWithTime(type)
+            ? {
+                multiplicityMinutes: multiplicityMinutes,
+                multiplicitySeconds: multiplicitySeconds,
+                multiplicityHours: multiplicityHours
+            }
+            : undefined;
+    }, [type, multiplicityMinutes, multiplicitySeconds, multiplicityHours]);
     var Component = getByMap_1.getByMap(typeMap, type);
     return (react_1["default"].createElement(Component, tslib_1.__assign({}, otherProps, timeProps, { minDate: minDate, maxDate: maxDate, ref: useForkRef_1.useForkRef([ref, datePickerRef]) })));
 });
 tslib_1.__exportStar(require("./helpers"), exports);
+tslib_1.__exportStar(require("./types"), exports);

package/__internal__/cjs-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__/cjs-src/components/DatePickerCanary/DatePickerDropdown/DatePickerDropdown.js

@@ -10,10 +10,10 @@ var MixPopoverAnimate_1 = require("../../../mixs/MixPopoverAnimate/MixPopoverAni
 var bem_1 = require("../../../utils/bem");
 var DateTimeCanary_1 = require("../../DateTimeCanary/DateTimeCanary");
 var Popover_1 = require("../../Popover/Popover");
-var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var cnDatePickerDropdown = bem_1.cn('DatePickerDropdown');
 exports.DatePickerDropdown = react_1.forwardRef(function (props, componentRef) {
-    var _a = props.form, form = _a === void 0 ? helpers_1.datePickerPropDropdownFormDefault : _a, anchorRef = props.anchorRef, isOpen = props.isOpen, className = props.className, zIndex = props.zIndex, otherProps = tslib_1.__rest(props, ["form", "anchorRef", "isOpen", "className", "zIndex"]);
+    var _a = props.form, form = _a === void 0 ? types_1.datePickerPropDropdownFormDefault : _a, anchorRef = props.anchorRef, isOpen = props.isOpen, className = props.className, zIndex = props.zIndex, otherProps = tslib_1.__rest(props, ["form", "anchorRef", "isOpen", "className", "zIndex"]);
     var rootRef = react_1.useRef(null);
     var _b = tslib_1.__read(react_1.useState(), 2), direction = _b[0], setDirection = _b[1];
     var ref = useForkRef_1.useForkRef([componentRef, rootRef]);

package/__internal__/cjs-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__/cjs-src/components/DatePickerCanary/DatePickerFieldTypeDate/DatePickerFieldTypeDate.js

@@ -4,17 +4,16 @@ exports.DatePickerFieldTypeDate = void 0;
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
 var date_fns_1 = require("date-fns");
-var imask_1 = tslib_1.__importDefault(require("imask"));
 var useForkRef_1 = require("../../../hooks/useForkRef/useForkRef");
 var useMutableRef_1 = require("../../../hooks/useMutableRef/useMutableRef");
 var date_1 = require("../../../utils/date");
 var TextField_1 = require("../../TextField/TextField");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 var helpers_2 = require("./helpers");
 exports.DatePickerFieldTypeDate = react_1["default"].forwardRef(function (props, ref) {
     var _a = props.format, formatProp = _a === void 0 ? helpers_1.datePickerPropFormatTypeDate : _a, _b = props.separator, separator = _b === void 0 ? helpers_1.datePickerPropSeparatorDefault : _b, _c = props.placeholder, placeholder = _c === void 0 ? helpers_1.datePickerPropPlaceholderTypeDate : _c, onChange = props.onChange, onError = props.onError, _d = props.minDate, minDate = _d === void 0 ? date_1.minDateDefault : _d, _e = props.maxDate, maxDate = _e === void 0 ? date_1.maxDateDefault : _e, value = props.value, inputRefProp = props.inputRef, otherProps = tslib_1.__rest(props, ["format", "separator", "placeholder", "onChange", "onError", "minDate", "maxDate", "value", "inputRef"]);
     var inputRef = react_1.useRef(null);
-    var imaskRef = react_1.useRef(null);
     var onChangeRef = useMutableRef_1.useMutableRef(onChange);
     var _f = tslib_1.__read(react_1.useState(value && date_fns_1.isValid(value) ? date_fns_1.format(value, formatProp) : null), 2), stringValue = _f[0], setStringValue = _f[1];
     var handleChange = react_1.useCallback(function (e, stringValue) {
@@ -25,13 +24,17 @@ exports.DatePickerFieldTypeDate = react_1["default"].forwardRef(function (props,
                 onChange({ e: e, value: null });
                 return;
             }
-            var _a = tslib_1.__read(helpers_2.getPartsDate(stringValue, formatProp, separator), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
+            var _a = tslib_1.__read(helpers_1.getPartsDate(stringValue, formatProp, separator, false, [
+                'dd',
+                'MM',
+                'yyyy',
+            ]), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
             if (dd && MM && yyyy) {
                 var date = date_fns_1.parse("" + dd + helpers_1.datePickerPropSeparatorDefault + MM + helpers_1.datePickerPropSeparatorDefault + yyyy, helpers_1.datePickerPropFormatTypeDate, new Date());
                 if (!date_fns_1.isWithinInterval(date, { start: minDate, end: maxDate })) {
                     onError &&
                         onError({
-                            type: helpers_1.datePickerErrorTypes[0],
+                            type: types_1.datePickerErrorTypes[0],
                             stringValue: stringValue,
                             dd: dd,
                             MM: MM,
@@ -48,6 +51,7 @@ exports.DatePickerFieldTypeDate = react_1["default"].forwardRef(function (props,
             }
         }
     }, [minDate === null || minDate === void 0 ? void 0 : minDate.getTime(), maxDate === null || maxDate === void 0 ? void 0 : maxDate.getTime(), formatProp, separator]);
+    helpers_2.useImask(formatProp, separator, inputRef, stringValue, onError);
     // при изменении value, нужно обновить stringValue
     react_1.useEffect(function () {
         if (value && date_fns_1.isValid(value)) {
@@ -63,66 +67,6 @@ exports.DatePickerFieldTypeDate = react_1["default"].forwardRef(function (props,
     }, [value === null || value === void 0 ? void 0 : value.getTime()]);
     // задаем маску и сохраняем обьект маски в ref
     // обнавляем при смене формата
-    react_1.useEffect(function () {
-        if (inputRef.current) {
-            imaskRef.current = imask_1["default"](inputRef.current, {
-                mask: Date,
-                pattern: formatProp,
-                blocks: {
-                    yyyy: {
-                        mask: imask_1["default"].MaskedRange,
-                        from: 1,
-                        to: 9999
-                    },
-                    MM: {
-                        mask: imask_1["default"].MaskedRange,
-                        from: 1,
-                        to: 12
-                    },
-                    dd: {
-                        mask: imask_1["default"].MaskedRange,
-                        from: 1,
-                        to: 31
-                    }
-                },
-                lazy: true,
-                autofix: true,
-                format: function (date) { return date_fns_1.format(date, formatProp); },
-                parse: function (string) { return date_fns_1.parse(string, formatProp, new Date()); },
-                validate: function (string) {
-                    var _a = tslib_1.__read(helpers_2.getPartsDate(string, formatProp, separator), 3), dd = _a[0], MM = _a[1], yyyy = _a[2];
-                    if (dd &&
-                        MM &&
-                        !date_fns_1.isValid(date_fns_1.parse("" + dd + helpers_1.datePickerPropSeparatorDefault + MM + helpers_1.datePickerPropSeparatorDefault + date_1.leapYear, helpers_1.datePickerPropFormatTypeDate, new Date()))) {
-                        onError &&
-                            onError({
-                                type: helpers_1.datePickerErrorTypes[1],
-                                stringValue: string,
-                                dd: dd,
-                                MM: MM,
-                                yyyy: yyyy
-                            });
-                        return false;
-                    }
-                    if (dd &&
-                        MM &&
-                        yyyy &&
-                        !date_fns_1.isValid(date_fns_1.parse("" + dd + helpers_1.datePickerPropSeparatorDefault + MM + helpers_1.datePickerPropSeparatorDefault + yyyy, helpers_1.datePickerPropFormatTypeDate, new Date()))) {
-                        onError &&
-                            onError({
-                                type: helpers_1.datePickerErrorTypes[1],
-                                stringValue: string,
-                                dd: dd,
-                                MM: MM,
-                                yyyy: yyyy
-                            });
-                        return false;
-                    }
-                    return true;
-                }
-            });
-        }
-    }, [formatProp, separator]);
     // задаем нативный oninput, так как с маской по другому не будет работать
     // обнавляем oninput при смене handleChange
     react_1.useEffect(function () {
@@ -133,12 +77,5 @@ exports.DatePickerFieldTypeDate = react_1["default"].forwardRef(function (props,
             };
         }
     }, [handleChange]);
-    // Нужно для синхранизации value c Imask,
-    // так как value мы можем задать через пропс без самого ввода,
-    // и Imask требует ручной синхронихации в этом случае
-    react_1.useEffect(function () {
-        var _a;
-        (_a = imaskRef.current) === null || _a === void 0 ? void 0 : _a.updateValue();
-    }, [stringValue]);
     return (react_1["default"].createElement(TextField_1.TextField, tslib_1.__assign({}, otherProps, { type: "text", inputContainerRef: ref, inputRef: useForkRef_1.useForkRef([inputRef, inputRefProp]), value: stringValue, placeholder: placeholder })));
 });

package/__internal__/cjs-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__/cjs-src/components/DatePickerCanary/DatePickerFieldTypeDate/helpers.js

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

package/__internal__/cjs-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>>;

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

@@ -10,13 +10,13 @@ var FieldLabel_1 = require("../../FieldLabel/FieldLabel");
 var DatePickerFieldTypeDate_1 = require("../DatePickerFieldTypeDate/DatePickerFieldTypeDate");
 var DatePickerMixRangeField_1 = require("../DatePickerMixRangeField/DatePickerMixRangeField");
 var helpers_1 = require("../helpers");
+var types_1 = require("../types");
 exports.DatePickerFieldTypeDateRange = react_1.forwardRef(function (props, ref) {
     var _a, _b;
-    var className = props.className, _c = props.form, form = _c === void 0 ? 'default' : _c, startFieldInputRef = props.startFieldInputRef, startFieldLeftSide = props.startFieldLeftSide, startFieldRightSide = props.startFieldRightSide, endFieldInputRef = props.endFieldInputRef, endFieldLeftSide = props.endFieldLeftSide, endFieldRightSide = props.endFieldRightSide, _d = props.value, value = _d === void 0 ? [] : _d, onChange = props.onChange, onError = props.onError, name = props.name, disabled = props.disabled, size = props.size, view = props.view, status = props.status, autoFocus = props.autoFocus, placeholder = props.placeholder, readOnly = props.readOnly, required = props.required, tabIndex = props.tabIndex, ariaLabel = props.ariaLabel, iconSize = props.iconSize, format = props.format, separator = props.separator, minDate = props.minDate, maxDate = props.maxDate, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, startFieldRef = props.startFieldRef, endFieldRef = props.endFieldRef, startFocused = props.startFocused, endFocused = props.endFocused, label = props.label, labelPosition = props.labelPosition, caption = props.caption, width = props.width, otherProps = tslib_1.__rest(props, ["className", "form", "startFieldInputRef", "startFieldLeftSide", "startFieldRightSide", "endFieldInputRef", "endFieldLeftSide", "endFieldRightSide", "value", "onChange", "onError", "name", "disabled", "size", "view", "status", "autoFocus", "placeholder", "readOnly", "required", "tabIndex", "ariaLabel", "iconSize", "format", "separator", "minDate", "maxDate", "startFieldOnBlur", "startFieldOnFocus", "endFieldOnBlur", "endFieldOnFocus", "startFieldRef", "endFieldRef", "startFocused", "endFocused", "label", "labelPosition", "caption", "width"]);
+    var className = props.className, _c = props.form, form = _c === void 0 ? 'default' : _c, startFieldInputRef = props.startFieldInputRef, startFieldLeftSide = props.startFieldLeftSide, startFieldRightSide = props.startFieldRightSide, endFieldInputRef = props.endFieldInputRef, endFieldLeftSide = props.endFieldLeftSide, endFieldRightSide = props.endFieldRightSide, _d = props.value, value = _d === void 0 ? [] : _d, onChange = props.onChange, onError = props.onError, startFieldName = props.startFieldName, endFieldName = props.endFieldName, disabled = props.disabled, size = props.size, view = props.view, status = props.status, autoFocus = props.autoFocus, placeholder = props.placeholder, readOnly = props.readOnly, required = props.required, tabIndex = props.tabIndex, ariaLabel = props.ariaLabel, iconSize = props.iconSize, format = props.format, separator = props.separator, minDate = props.minDate, maxDate = props.maxDate, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, startFieldRef = props.startFieldRef, endFieldRef = props.endFieldRef, startFocused = props.startFocused, endFocused = props.endFocused, label = props.label, labelPosition = props.labelPosition, caption = props.caption, width = props.width, otherProps = tslib_1.__rest(props, ["className", "form", "startFieldInputRef", "startFieldLeftSide", "startFieldRightSide", "endFieldInputRef", "endFieldLeftSide", "endFieldRightSide", "value", "onChange", "onError", "startFieldName", "endFieldName", "disabled", "size", "view", "status", "autoFocus", "placeholder", "readOnly", "required", "tabIndex", "ariaLabel", "iconSize", "format", "separator", "minDate", "maxDate", "startFieldOnBlur", "startFieldOnFocus", "endFieldOnBlur", "endFieldOnFocus", "startFieldRef", "endFieldRef", "startFocused", "endFocused", "label", "labelPosition", "caption", "width"]);
     var commonProps = {
         className: DatePickerMixRangeField_1.cnDatePickerMixRangeField('Field'),
         disabled: disabled,
-        name: name,
         onError: onError,
         size: size,
         view: view,
@@ -48,7 +48,7 @@ exports.DatePickerFieldTypeDateRange = react_1.forwardRef(function (props, ref)
                 return;
             }
             onChange({ e: e, value: [start, undefined] });
-            onError && onError({ type: helpers_1.datePickerErrorTypes[2], date: [start, end] });
+            onError && onError({ type: types_1.datePickerErrorTypes[2], date: [start, end] });
             return;
         }
         if (start) {
@@ -92,7 +92,7 @@ exports.DatePickerFieldTypeDateRange = react_1.forwardRef(function (props, ref)
         label && (react_1["default"].createElement(FieldLabel_1.FieldLabel, { required: required, className: DatePickerMixRangeField_1.cnDatePickerMixRangeField('Label', { labelPosition: labelPosition }), size: size }, label)),
         react_1["default"].createElement("div", { className: DatePickerMixRangeField_1.cnDatePickerMixRangeField('Body') },
             react_1["default"].createElement("div", { className: DatePickerMixRangeField_1.cnDatePickerMixRangeField('Fields') },
-                react_1["default"].createElement(DatePickerFieldTypeDate_1.DatePickerFieldTypeDate, tslib_1.__assign({}, commonProps, { inputRef: startFieldInputRef, ref: startFieldRef, leftSide: startFieldLeftSide, rightSide: startFieldRightSide, form: helpers_1.getFormForStart(form), value: startDate, onChange: handleStartDateChange, onFocus: startFieldOnFocus, onBlur: startFieldOnBlur, focused: startFocused })),
-                react_1["default"].createElement(DatePickerFieldTypeDate_1.DatePickerFieldTypeDate, tslib_1.__assign({}, commonProps, { inputRef: endFieldInputRef, ref: endFieldRef, leftSide: endFieldLeftSide, rightSide: endFieldRightSide, form: helpers_1.getFormForEnd(form), value: endDate, onChange: handleEndDateChange, onFocus: endFieldOnFocus, onBlur: endFieldOnBlur, focused: endFocused }))),
+                react_1["default"].createElement(DatePickerFieldTypeDate_1.DatePickerFieldTypeDate, tslib_1.__assign({}, commonProps, { inputRef: startFieldInputRef, ref: startFieldRef, leftSide: startFieldLeftSide, rightSide: startFieldRightSide, form: helpers_1.getFormForStart(form), value: startDate, onChange: handleStartDateChange, onFocus: startFieldOnFocus, onBlur: startFieldOnBlur, focused: startFocused, name: startFieldName })),
+                react_1["default"].createElement(DatePickerFieldTypeDate_1.DatePickerFieldTypeDate, tslib_1.__assign({}, commonProps, { name: endFieldName, inputRef: endFieldInputRef, ref: endFieldRef, leftSide: endFieldLeftSide, rightSide: endFieldRightSide, form: helpers_1.getFormForEnd(form), value: endDate, onChange: handleEndDateChange, onFocus: endFieldOnFocus, onBlur: endFieldOnBlur, focused: endFocused }))),
             caption && (react_1["default"].createElement(FieldCaption_1.FieldCaption, { className: DatePickerMixRangeField_1.cnDatePickerMixRangeField('Caption'), status: status }, caption)))));
 });

package/__internal__/cjs-src/components/DatePickerCanary/DatePickerFieldTypeDateRange/helpers.d.ts

@@ -6,7 +6,7 @@ declare type DatePickerFieldTypeDateRangePropOnChange = (props: {
     e: Event;
     value: DateRange | null;
 }) => void;
-export declare type DatePickerFieldTypeDateRangeProps = Omit<DatePickerFieldTypeDateProps, 'onChange' | 'value' | 'inputRef' | 'leftSide' | 'rightSide' | 'id' | 'onFocus' | 'onBlur'> & {
+export declare type DatePickerFieldTypeDateRangeProps = Omit<DatePickerFieldTypeDateProps, 'onChange' | 'value' | 'inputRef' | 'leftSide' | 'rightSide' | 'id' | 'onFocus' | 'onBlur' | 'name'> & {
     onChange?: DatePickerFieldTypeDateRangePropOnChange;
     value?: DateRange | null;
     startFieldInputRef?: React.Ref<HTMLInputElement>;
@@ -26,5 +26,7 @@ export declare type DatePickerFieldTypeDateRangeProps = Omit<DatePickerFieldType
     id?: string;
     onChangeCurrentVisibleDate?: (date: Date) => void;
     currentVisibleDate?: Date;
+    startFieldName?: string;
+    endFieldName?: string;
 };
 export {};

package/__internal__/cjs-src/components/DatePickerCanary/DatePickerFieldTypeDateTime/DatePickerFieldTypeDateTime.d.ts

@@ -6,7 +6,7 @@ export declare const DatePickerFieldTypeDateTime: React.ForwardRefExoticComponen
         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;