@consta/uikit 3.12.4 → 3.15.1

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

@@ -0,0 +1,76 @@
+import { __assign, __read, __rest } from "tslib";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { format, isValid, isWithinInterval, parse } from 'date-fns';
+import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
+import { useMutableRef } from '../../../hooks/useMutableRef/useMutableRef';
+import { maxDateDefault, minDateDefault } from '../../../utils/date';
+import { TextField } from '../../TextField/TextField';
+import { datePickerErrorTypes, datePickerPropFormatTypeDateTime, datePickerPropPlaceholderTypeDateTime, datePickerPropSeparatorDefault, } from '../helpers';
+import { getParts, getPartsDate, useImask } from './helpers';
+export var DatePickerFieldTypeDateTime = React.forwardRef(function (props, ref) {
+    var _a = props.format, formatProp = _a === void 0 ? datePickerPropFormatTypeDateTime : _a, _b = props.separator, separator = _b === void 0 ? datePickerPropSeparatorDefault : _b, _c = props.placeholder, placeholder = _c === void 0 ? datePickerPropPlaceholderTypeDateTime : _c, onChange = props.onChange, onError = props.onError, _d = props.minDate, minDate = _d === void 0 ? minDateDefault : _d, _e = props.maxDate, maxDate = _e === void 0 ? maxDateDefault : _e, value = props.value, inputRefProp = props.inputRef, multiplicityHours = props.multiplicityHours, multiplicitySeconds = props.multiplicitySeconds, multiplicityMinutes = props.multiplicityMinutes, otherProps = __rest(props, ["format", "separator", "placeholder", "onChange", "onError", "minDate", "maxDate", "value", "inputRef", "multiplicityHours", "multiplicitySeconds", "multiplicityMinutes"]);
+    var inputRef = useRef(null);
+    var onChangeRef = useMutableRef(onChange);
+    var _f = __read(useState(value && isValid(value) ? format(value, formatProp) : null), 2), stringValue = _f[0], setStringValue = _f[1];
+    var formatParts = useMemo(function () { return getParts(formatProp, separator); }, [formatProp, separator]);
+    var handleChange = useCallback(function (e, stringValue) {
+        setStringValue(stringValue);
+        var onChange = onChangeRef.current;
+        if (onChange) {
+            if (!stringValue) {
+                onChange({ e: e, value: null });
+                return;
+            }
+            var partsDate = getPartsDate(stringValue, formatProp, separator);
+            var _a = __read(partsDate, 6), dd = _a[0], MM = _a[1], yyyy = _a[2], HH = _a[3], mm = _a[4], ss = _a[5];
+            if (partsDate.filter(function (item) { return !!item; }).length === formatParts.length) {
+                var date = parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy + " " + (HH ||
+                    '00') + ":" + (mm || '00') + ":" + (ss || '00'), datePickerPropFormatTypeDateTime, new Date());
+                if (!isWithinInterval(date, { start: minDate, end: maxDate })) {
+                    onError === null || onError === void 0 ? void 0 : onError({
+                        type: datePickerErrorTypes[0],
+                        stringValue: stringValue,
+                        dd: dd,
+                        MM: MM,
+                        yyyy: yyyy,
+                        date: date,
+                        HH: HH,
+                        mm: mm,
+                        ss: ss
+                    });
+                    onChange({ e: e, value: null });
+                    return;
+                }
+                onChange({ e: e, value: date });
+            }
+            else {
+                onChange({ e: e, value: null });
+            }
+        }
+    }, [minDate === null || minDate === void 0 ? void 0 : minDate.getTime(), maxDate === null || maxDate === void 0 ? void 0 : maxDate.getTime(), formatProp, separator]);
+    useImask(formatProp, separator, multiplicityHours, multiplicitySeconds, multiplicityMinutes, inputRef, stringValue, onError);
+    // при изменении value, нужно обновить stringValue
+    useEffect(function () {
+        if (value && isValid(value)) {
+            setStringValue(format(value, formatProp));
+        }
+        else if ((stringValue === null || stringValue === void 0 ? void 0 : stringValue.length) === formatProp.length) {
+            // если количество введенных символов меньше чем в формате маски
+            // то не нужно мешать вводу с клавиатуры
+            // если дата была введена полностью и value пришел null,
+            // то можно считать что поле нуждается в очистке
+            setStringValue('');
+        }
+    }, [value === null || value === void 0 ? void 0 : value.getTime()]);
+    // задаем нативный oninput, так как с маской по другому не будет работать
+    // обнавляем oninput при смене handleChange
+    useEffect(function () {
+        if (inputRef.current) {
+            inputRef.current.oninput = function (e) {
+                var _a;
+                handleChange(e, ((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.value) || '');
+            };
+        }
+    }, [handleChange]);
+    return (React.createElement(TextField, __assign({}, otherProps, { type: "text", inputContainerRef: ref, inputRef: useForkRef([inputRef, inputRefProp]), value: stringValue, placeholder: placeholder })));
+});

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

@@ -0,0 +1,51 @@
+import React from 'react';
+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';
+declare type DatePickerFieldTypeDateTimePropOnChange = (props: {
+    e: Event;
+    value: Date | null;
+}) => void;
+export declare type DatePickerFieldTypeDateTimeProps = PropsWithHTMLAttributes<{
+    className?: string;
+    value?: Date | null;
+    onChange?: DatePickerFieldTypeDateTimePropOnChange;
+    onError?: DatePickerPropOnError;
+    id?: string;
+    name?: string;
+    disabled?: boolean;
+    size?: TextFieldPropSize;
+    view?: TextFieldPropView;
+    form?: TextFieldPropForm;
+    status?: TextFieldPropStatus;
+    width?: TextFieldPropWidth;
+    onFocus?: React.FocusEventHandler<HTMLElement>;
+    onBlur?: React.FocusEventHandler<HTMLElement>;
+    autoFocus?: boolean;
+    placeholder?: string;
+    leftSide?: string | IconComponent;
+    rightSide?: string | IconComponent;
+    readOnly?: boolean;
+    required?: boolean;
+    tabIndex?: number;
+    inputRef?: React.Ref<HTMLTextAreaElement | HTMLInputElement>;
+    ariaLabel?: string;
+    iconSize?: IconPropSize;
+    children?: never;
+    format?: string;
+    separator?: string;
+    minDate?: Date;
+    maxDate?: Date;
+    focused?: boolean;
+    multiplicitySeconds?: number;
+    multiplicityMinutes?: number;
+    multiplicityHours?: number;
+    label?: string;
+    caption?: string;
+    labelPosition?: 'top' | 'left';
+}, HTMLDivElement>;
+export declare const getParts: (format: string, separator: string) => string[];
+export declare const getPartsDate: (value: string, format: string, separator: string, markers?: string[]) => (string | undefined)[];
+export declare const useImask: (formatProp: string, separator: string, multiplicityHours: number | undefined, multiplicitySeconds: number | undefined, multiplicityMinutes: number | undefined, inputRef: React.RefObject<HTMLInputElement>, stringValue: string | null, onError: DatePickerPropOnError | undefined) => void;
+export {};

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

@@ -0,0 +1,131 @@
+import { __read, __spread } from "tslib";
+import { useEffect, useRef } from 'react';
+import { addHours, addMinutes, addSeconds, format, isValid, parse, startOfDay, startOfHour, startOfMinute, } from 'date-fns';
+import IMask from 'imask';
+import { leapYear } from '../../../utils/date';
+import { getLabelHours, getLabelMinutes, getLabelSeconds } from '../../DateTimeCanary/helpers';
+import { datePickerErrorTypes, datePickerPropFormatTypeDate, datePickerPropSeparatorDefault, getTimeEnum, } from '../helpers';
+var getPartDate = function (formatArray, stringArray, marker) {
+    var index = formatArray.indexOf(marker);
+    if (index >= 0 && stringArray[index] && stringArray[index].length === marker.length) {
+        return stringArray[index];
+    }
+    return undefined;
+};
+export var getParts = function (format, separator) {
+    var _a = __read(format.split(' '), 2), date = _a[0], time = _a[1];
+    return __spread((date ? date.split(separator) : []), (time ? time.split(':') : []));
+};
+export var getPartsDate = function (value, format, separator, markers) {
+    if (markers === void 0) { markers = ['dd', 'MM', 'yyyy', 'HH', 'mm', 'ss']; }
+    var formatArray = getParts(format, separator);
+    var stringArray = getParts(value, separator);
+    return markers.map(function (marker) { return getPartDate(formatArray, stringArray, marker); });
+};
+export var useImask = function (formatProp, separator, multiplicityHours, multiplicitySeconds, multiplicityMinutes, inputRef, stringValue, onError) {
+    var imaskRef = useRef(null);
+    // задаем маску и сохраняем обьект маски в ref
+    // обнавляем при смене формата
+    useEffect(function () {
+        if (!inputRef.current) {
+            return;
+        }
+        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
+                },
+                HH: multiplicityHours && multiplicityHours > 0
+                    ? {
+                        mask: IMask.MaskedEnum,
+                        "enum": getTimeEnum(24, multiplicityHours, startOfDay, addHours, getLabelHours)
+                    }
+                    : {
+                        mask: IMask.MaskedRange,
+                        from: 0,
+                        to: 23
+                    },
+                mm: multiplicityMinutes && multiplicityMinutes > 0
+                    ? {
+                        mask: IMask.MaskedEnum,
+                        "enum": getTimeEnum(60, multiplicityMinutes, startOfHour, addMinutes, getLabelMinutes)
+                    }
+                    : {
+                        mask: IMask.MaskedRange,
+                        from: 0,
+                        to: 59
+                    },
+                ss: multiplicitySeconds && multiplicitySeconds > 0
+                    ? {
+                        mask: IMask.MaskedEnum,
+                        "enum": getTimeEnum(60, multiplicitySeconds, startOfMinute, addSeconds, getLabelSeconds)
+                    }
+                    : {
+                        mask: IMask.MaskedRange,
+                        from: 0,
+                        to: 59
+                    }
+            },
+            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), 6), dd = _a[0], MM = _a[1], yyyy = _a[2], HH = _a[3], mm = _a[4], ss = _a[5];
+                if (dd &&
+                    MM &&
+                    !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + leapYear, datePickerPropFormatTypeDate, new Date()))) {
+                    onError === null || onError === void 0 ? void 0 : onError({
+                        type: datePickerErrorTypes[1],
+                        stringValue: string,
+                        dd: dd,
+                        MM: MM,
+                        yyyy: yyyy,
+                        HH: HH,
+                        mm: mm,
+                        ss: ss
+                    });
+                    return false;
+                }
+                if (dd &&
+                    MM &&
+                    yyyy &&
+                    !isValid(parse("" + dd + datePickerPropSeparatorDefault + MM + datePickerPropSeparatorDefault + yyyy, datePickerPropFormatTypeDate, new Date()))) {
+                    onError === null || onError === void 0 ? void 0 : onError({
+                        type: datePickerErrorTypes[1],
+                        stringValue: string,
+                        dd: dd,
+                        MM: MM,
+                        yyyy: yyyy,
+                        HH: HH,
+                        mm: mm,
+                        ss: ss
+                    });
+                    return false;
+                }
+                return true;
+            }
+        });
+    }, [formatProp, separator, multiplicityHours, multiplicitySeconds, multiplicityMinutes]);
+    // Нужно для синхранизации 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/DatePickerTypeDate/DatePickerTypeDate.d.ts

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

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

@@ -3,19 +3,21 @@ import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import addMonths from 'date-fns/addMonths';
 import startOfMonth from 'date-fns/startOfMonth';
 import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
+import { useFlag } from '../../../hooks/useFlag/useFlag';
 import { setRef } from '../../../utils/setRef';
 import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDate } from '../DatePickerFieldTypeDate/DatePickerFieldTypeDate';
+import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeDate = forwardRef(function (props, ref) {
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus"]);
+    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, style = props.style, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls", "style"]);
     var fieldRef = useRef(null);
     var calendarRef = useRef(null);
-    var _a = __read(useState(false), 2), calendarVisible = _a[0], setCalendarVisible = _a[1];
-    var _b = __read(useState(), 2), currentVisibleDate = _b[0], setCurrentVisibleDate = _b[1];
+    var _a = __read(useFlag(false), 2), calendarVisible = _a[0], setCalendarVisible = _a[1];
+    var _b = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _b[0], setCurrentVisibleDate = _b[1];
     var _c = __read(useState(), 2), calendarVisibleDate = _c[0], setCalendarVisibleDate = _c[1];
     var onFocusHandler = function (e) {
         onFocus && onFocus(e);
-        setCalendarVisible(true);
+        setCalendarVisible.on();
     };
     useEffect(function () {
         if (ref) {
@@ -39,7 +41,7 @@ export var DatePickerTypeDate = forwardRef(function (props, ref) {
         }
     }, [props.value]);
     var handleClose = function () {
-        setCalendarVisible(false);
+        setCalendarVisible.off();
         setCurrentVisibleDate(undefined);
     };
     useClickOutside({
@@ -48,10 +50,10 @@ export var DatePickerTypeDate = forwardRef(function (props, ref) {
         handler: handleClose
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeDate, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler })),
-        React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: props.type, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: function (params) {
+        React.createElement(DatePickerFieldTypeDate, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, style: style })),
+        React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "date", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: function (params) {
                 var _a;
                 (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, params);
                 handleClose();
-            }, onChangeCurrentVisibleDate: function (date) { return setCalendarVisibleDate(date); } })));
+            }, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined, onChangeCurrentVisibleDate: setCalendarVisibleDate })));
 });

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

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

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

@@ -7,9 +7,10 @@ import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDateRange } from '../DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange';
 import { normalizeRangeValue } from '../helpers';
+import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
 export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
     var _a, _b, _c, _d;
-    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, startFieldRightSide = props.startFieldRightSide, startFieldLeftSide = props.startFieldLeftSide, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldRightSide = props.endFieldRightSide, endFieldLeftSide = props.endFieldLeftSide, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, endFieldInputRefProp = props.endFieldInputRef, startFieldInputRefProp = props.startFieldInputRef, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "startFieldRightSide", "startFieldLeftSide", "startFieldOnBlur", "startFieldOnFocus", "endFieldRightSide", "endFieldLeftSide", "endFieldOnBlur", "endFieldOnFocus", "onFocus", "onBlur", "leftSide", "rightSide", "endFieldInputRef", "startFieldInputRef"]);
+    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, startFieldRightSide = props.startFieldRightSide, startFieldLeftSide = props.startFieldLeftSide, startFieldOnBlur = props.startFieldOnBlur, startFieldOnFocus = props.startFieldOnFocus, endFieldRightSide = props.endFieldRightSide, endFieldLeftSide = props.endFieldLeftSide, endFieldOnBlur = props.endFieldOnBlur, endFieldOnFocus = props.endFieldOnFocus, onFocus = props.onFocus, onBlur = props.onBlur, leftSide = props.leftSide, rightSide = props.rightSide, endFieldInputRefProp = props.endFieldInputRef, startFieldInputRefProp = props.startFieldInputRef, style = props.style, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, renderAdditionalControls = props.renderAdditionalControls, fieldProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "startFieldRightSide", "startFieldLeftSide", "startFieldOnBlur", "startFieldOnFocus", "endFieldRightSide", "endFieldLeftSide", "endFieldOnBlur", "endFieldOnFocus", "onFocus", "onBlur", "leftSide", "rightSide", "endFieldInputRef", "startFieldInputRef", "style", "currentVisibleDate", "onChangeCurrentVisibleDate", "renderAdditionalControls"]);
     var startFieldRef = useRef(null);
     var endFieldRef = useRef(null);
     var startFieldInputRef = useRef(null);
@@ -31,17 +32,7 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
         }
     };
     var _f = __read(useState(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
-    var _g = __read(useState(), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
-    var commonProps = {
-        value: props.value || undefined,
-        view: dateTimeView,
-        events: events,
-        locale: locale,
-        minDate: props.minDate,
-        maxDate: props.maxDate,
-        form: dropdownForm,
-        onChange: hadleChange
-    };
+    var _g = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
     var startFieldOnBlurHandler = function (e) {
         onBlur && onBlur(e);
         startFieldOnBlur && startFieldOnBlur(e);
@@ -118,6 +109,6 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
         }
     });
     return (React.createElement(React.Fragment, null,
-        React.createElement(DatePickerFieldTypeDateRange, __assign({}, fieldProps, { ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, startFieldInputRefProp]), endFieldInputRef: useForkRef([endFieldInputRef, endFieldInputRefProp]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldRightSide: startFieldRightSide, startFieldLeftSide: startFieldLeftSide || leftSide, endFieldRightSide: endFieldRightSide || rightSide, endFieldLeftSide: endFieldLeftSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused })),
-        React.createElement(DatePickerDropdown, __assign({}, commonProps, { ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: function (date) { return setCurrentVisibleDate(date); }, currentVisibleDate: currentVisibleDate }))));
+        React.createElement(DatePickerFieldTypeDateRange, __assign({}, fieldProps, { style: style, ref: ref, startFieldRef: startFieldRef, endFieldRef: endFieldRef, startFieldInputRef: useForkRef([startFieldInputRef, startFieldInputRefProp]), endFieldInputRef: useForkRef([endFieldInputRef, endFieldInputRefProp]), startFieldOnFocus: startFieldOnFocusHandler, endFieldOnFocus: endFieldOnFocusHandler, startFieldRightSide: startFieldRightSide, startFieldLeftSide: startFieldLeftSide || leftSide, endFieldRightSide: endFieldRightSide || rightSide, endFieldLeftSide: endFieldLeftSide, startFieldOnBlur: startFieldOnBlurHandler, endFieldOnBlur: endFieldOnBlurHandler, startFocused: startFocused, endFocused: endFocused })),
+        React.createElement(DatePickerDropdown, { type: "date", ref: calendarRef, anchorRef: startFieldRef, isOpen: calendarVisible, onChangeCurrentVisibleDate: setCurrentVisibleDate, currentVisibleDate: currentVisibleDate, value: props.value || undefined, view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, form: dropdownForm, onChange: hadleChange, renderAdditionalControls: renderAdditionalControls, zIndex: typeof (style === null || style === void 0 ? void 0 : style.zIndex) === 'number' ? style.zIndex + 1 : undefined })));
 });

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

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

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

@@ -0,0 +1,57 @@
+import { __assign, __read, __rest } from "tslib";
+import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import addMonths from 'date-fns/addMonths';
+import startOfMonth from 'date-fns/startOfMonth';
+import { useClickOutside } from '../../../hooks/useClickOutside/useClickOutside';
+import { useFlag } from '../../../hooks/useFlag/useFlag';
+import { setRef } from '../../../utils/setRef';
+import { DatePickerDropdown } from '../DatePickerDropdown/DatePickerDropdown';
+import { DatePickerFieldTypeDateTime } from '../DatePickerFieldTypeDateTime/DatePickerFieldTypeDateTime';
+import { datePickerPropFormatTypeDateTime, getMultiplicityTime, } from '../helpers';
+import { useCurrentVisibleDate } from '../useCurrentVisibleDate';
+export var DatePickerTypeDateTime = forwardRef(function (props, ref) {
+    var events = props.events, dateTimeView = props.dateTimeView, locale = props.locale, dropdownForm = props.dropdownForm, onFocus = props.onFocus, currentVisibleDateProp = props.currentVisibleDate, onChangeCurrentVisibleDateProp = props.onChangeCurrentVisibleDate, multiplicityHoursProp = props.multiplicityHours, multiplicityMinutesProp = props.multiplicityMinutes, multiplicitySecondsProp = props.multiplicitySeconds, renderAdditionalControls = props.renderAdditionalControls, otherProps = __rest(props, ["events", "dateTimeView", "locale", "dropdownForm", "onFocus", "currentVisibleDate", "onChangeCurrentVisibleDate", "multiplicityHours", "multiplicityMinutes", "multiplicitySeconds", "renderAdditionalControls"]);
+    var _a = __read(getMultiplicityTime(otherProps.format || datePickerPropFormatTypeDateTime, multiplicityHoursProp, multiplicityMinutesProp, multiplicitySecondsProp), 3), multiplicityHours = _a[0], multiplicityMinutes = _a[1], multiplicitySeconds = _a[2];
+    var fieldRef = useRef(null);
+    var calendarRef = useRef(null);
+    var _b = __read(useFlag(false), 2), calendarVisible = _b[0], setCalendarVisible = _b[1];
+    var _c = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _c[0], setCurrentVisibleDate = _c[1];
+    var _d = __read(useState(), 2), calendarVisibleDate = _d[0], setCalendarVisibleDate = _d[1];
+    var onFocusHandler = function (e) {
+        onFocus && onFocus(e);
+        setCalendarVisible.on();
+    };
+    useEffect(function () {
+        if (ref) {
+            setRef(ref, fieldRef.current);
+        }
+    }, [ref, fieldRef]);
+    useEffect(function () {
+        if (props.value && props.dateTimeView === 'classic' && calendarVisibleDate) {
+            var newVisibleDate = startOfMonth(props.value);
+            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime()) {
+                setCurrentVisibleDate(newVisibleDate);
+            }
+            return;
+        }
+        if (props.value && props.dateTimeView !== 'classic' && calendarVisibleDate) {
+            var newVisibleDate = startOfMonth(props.value);
+            if (newVisibleDate.getTime() !== calendarVisibleDate.getTime() &&
+                newVisibleDate.getTime() !== addMonths(calendarVisibleDate, 1).getTime()) {
+                setCurrentVisibleDate(newVisibleDate);
+            }
+        }
+    }, [props.value]);
+    var handleClose = function () {
+        setCalendarVisible.off();
+        setCurrentVisibleDate(undefined);
+    };
+    useClickOutside({
+        isActive: calendarVisible,
+        ignoreClicksInsideRefs: [fieldRef, calendarRef],
+        handler: handleClose
+    });
+    return (React.createElement(React.Fragment, null,
+        React.createElement(DatePickerFieldTypeDateTime, __assign({}, otherProps, { ref: fieldRef, onFocus: onFocusHandler, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes })),
+        React.createElement(DatePickerDropdown, { ref: calendarRef, anchorRef: fieldRef, isOpen: calendarVisible, value: props.value || undefined, type: "date-time", view: dateTimeView, events: events, locale: locale, minDate: props.minDate, maxDate: props.maxDate, currentVisibleDate: currentVisibleDate, form: dropdownForm, onChange: props.onChange, renderAdditionalControls: renderAdditionalControls, onChangeCurrentVisibleDate: setCalendarVisibleDate, multiplicityHours: multiplicityHours, multiplicitySeconds: multiplicitySeconds, multiplicityMinutes: multiplicityMinutes })));
+});

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

@@ -3,14 +3,14 @@ import { Locale } from 'date-fns';
 import { IconComponent, IconPropSize } from '../../icons/Icon/Icon';
 import { DateRange } from '../../utils/types/Date';
 import { PropsWithHTMLAttributesAndRef } from '../../utils/types/PropsWithHTMLAttributes';
-import { DateTimePropView } from '../DateTimeCanary/helpers';
+import { DateTimeAdditionalControlRenderProp, DateTimePropView } from '../DateTimeCanary/helpers';
 import { TextFieldPropForm, TextFieldPropSize, TextFieldPropStatus, TextFieldPropView, TextFieldPropWidth } from '../TextField/TextField';
-export declare const datePickerPropType: readonly ["date", "date-range"];
+export declare const datePickerPropType: readonly ["date", "date-range", "date-time"];
 export declare type DatePickerPropType = typeof datePickerPropType[number];
 export declare const datePickerPropTypeDefault: "date";
 export declare type DatePickerPropDateTimeView = DateTimePropView;
 export declare const datePickerErrorTypes: readonly ["outOfRange", "invalidInputAttempt", "startDateIsGreaterThanEndDate"];
-export declare type DatePickerPropValue<TYPE extends DatePickerPropType> = (TYPE extends 'date' ? Date : DateRange) | null;
+export declare type DatePickerPropValue<TYPE extends DatePickerPropType> = (TYPE extends 'date' | 'date-time' ? Date : DateRange) | null;
 export declare type DatePickerPropOnChange<TYPE extends DatePickerPropType> = (props: {
     value: DatePickerPropValue<TYPE>;
     e: React.MouseEvent<HTMLButtonElement, MouseEvent> | Event;
@@ -18,8 +18,8 @@ export declare type DatePickerPropOnChange<TYPE extends DatePickerPropType> = (p
 export declare const datePickerPropDropdownForm: readonly ["default", "brick", "round"];
 export declare type DatePickerPropDropdownForm = typeof datePickerPropDropdownForm[number];
 export declare const datePickerPropDropdownFormDefault: "default";
-declare type DatePickerPropCalendarWidth<TYPE> = TYPE extends 'date' ? TextFieldPropWidth : never;
-declare type DatePickerPropCalendarInputRef<TYPE> = TYPE extends 'date' ? React.Ref<HTMLInputElement> : never;
+declare type DatePickerPropCalendarWidth<TYPE> = TYPE extends 'date' | 'date-time' ? TextFieldPropWidth : never;
+declare type DatePickerPropCalendarInputRef<TYPE> = TYPE extends 'date' | 'date-time' ? React.Ref<HTMLInputElement> : never;
 declare type DatePickerPropCalendarStartInputRef<TYPE> = TYPE extends 'date-range' ? React.Ref<HTMLInputElement> : never;
 declare type DatePickerPropCalendarStartLeftSide<TYPE> = TYPE extends 'date-range' ? string | IconComponent : never;
 declare type DatePickerPropCalendarStartOnFocus<TYPE> = TYPE extends 'date-range' ? React.FocusEventHandler<HTMLElement> : never;
@@ -29,6 +29,7 @@ export declare type DatePickerProps<TYPE extends DatePickerPropType = 'date'> =
     onChange?: DatePickerPropOnChange<TYPE>;
     minDate?: Date;
     maxDate?: Date;
+    renderAdditionalControls?: DateTimeAdditionalControlRenderProp;
     events?: Date[];
     dateTimeView?: DatePickerPropDateTimeView;
     locale?: Locale;
@@ -70,16 +71,23 @@ export declare type DatePickerProps<TYPE extends DatePickerPropType = 'date'> =
     label?: string;
     caption?: string;
     labelPosition?: 'top' | 'left';
+    onChangeCurrentVisibleDate?: (date: Date) => void;
+    currentVisibleDate?: Date;
+    multiplicitySeconds?: number;
+    multiplicityMinutes?: number;
+    multiplicityHours?: number;
 }, HTMLDivElement>;
 export declare type DatePickerComponent = <TYPE extends DatePickerPropType = 'date'>(props: DatePickerProps<TYPE>) => React.ReactElement | null;
-export declare type DatePickerTypeDateComponent = (props: DatePickerProps<'date'>) => React.ReactElement | null;
-export declare type DatePickerTypeDateRangeComponent = (props: DatePickerProps<'date-range'>) => React.ReactElement | null;
+export declare type DatePickerTypeComponent<TYPE extends DatePickerPropType> = (props: Omit<DatePickerProps<TYPE>, 'type'>) => React.ReactElement | null;
 export declare type DatePickerPropOnError = (props: {
     type: typeof datePickerErrorTypes[0];
     stringValue: string;
     dd?: string;
     MM?: string;
     yyyy?: string;
+    ss?: string;
+    mm?: string;
+    HH?: string;
     date: Date;
 } | {
     type: typeof datePickerErrorTypes[1];
@@ -87,132 +95,19 @@ export declare type DatePickerPropOnError = (props: {
     dd?: string;
     MM?: string;
     yyyy?: string;
+    ss?: string;
+    mm?: string;
+    HH?: string;
 } | {
     type: typeof datePickerErrorTypes[2];
     date: [Date, Date];
 }) => void;
-export declare const isDateRangeParams: (params: DatePickerProps<DatePickerPropType>) => params is PropsWithHTMLAttributesAndRef<{
-    type?: "date-range" | undefined;
-    value?: DateRange | null | undefined;
-    onChange?: DatePickerPropOnChange<"date-range"> | undefined;
-    minDate?: Date | undefined;
-    maxDate?: Date | undefined;
-    events?: Date[] | undefined;
-    dateTimeView?: "slider" | "classic" | "book" | undefined;
-    locale?: globalThis.Locale | undefined;
-    children?: undefined;
-    onError?: DatePickerPropOnError | undefined;
-    id?: string | undefined;
-    name?: string | undefined;
-    disabled?: boolean | undefined;
-    size?: "xs" | "s" | "m" | "l" | undefined;
-    view?: "default" | "clear" | undefined;
-    form?: "default" | "round" | "brick" | "brickRound" | "roundBrick" | "brickDefault" | "defaultBrick" | "clearRound" | "roundClear" | "clearDefault" | "defaultClear" | "brickClear" | "clearBrick" | "clearClear" | undefined;
-    status?: "alert" | "success" | "warning" | undefined;
-    onFocus?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    onBlur?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    autoFocus?: boolean | undefined;
-    placeholder?: string | undefined;
-    readOnly?: boolean | undefined;
-    required?: boolean | undefined;
-    tabIndex?: number | undefined;
-    inputRef?: undefined;
-    ariaLabel?: string | undefined;
-    iconSize?: "xs" | "s" | "m" | undefined;
-    format?: string | undefined;
-    separator?: string | undefined;
-    dropdownForm?: "default" | "round" | "brick" | undefined;
-    width?: undefined;
-    leftSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    rightSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    startFieldInputRef?: ((instance: HTMLInputElement | null) => void) | import("react").RefObject<HTMLInputElement> | null | undefined;
-    endFieldInputRef?: ((instance: HTMLInputElement | null) => void) | import("react").RefObject<HTMLInputElement> | null | undefined;
-    startFieldLeftSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    startFieldRightSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    endFieldLeftSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    endFieldRightSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    startFieldOnFocus?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    endFieldOnFocus?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    startFieldOnBlur?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    endFieldOnBlur?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    label?: string | undefined;
-    caption?: string | undefined;
-    labelPosition?: "left" | "top" | undefined;
-}, HTMLDivElement>;
-export declare const isNotDateRangeParams: (params: DatePickerProps<DatePickerPropType>) => params is PropsWithHTMLAttributesAndRef<{
-    type?: "date" | undefined;
-    value?: Date | null | undefined;
-    onChange?: DatePickerPropOnChange<"date"> | undefined;
-    minDate?: Date | undefined;
-    maxDate?: Date | undefined;
-    events?: Date[] | undefined;
-    dateTimeView?: "slider" | "classic" | "book" | undefined;
-    locale?: globalThis.Locale | undefined;
-    children?: undefined;
-    onError?: DatePickerPropOnError | undefined;
-    id?: string | undefined;
-    name?: string | undefined;
-    disabled?: boolean | undefined;
-    size?: "xs" | "s" | "m" | "l" | undefined;
-    view?: "default" | "clear" | undefined;
-    form?: "default" | "round" | "brick" | "brickRound" | "roundBrick" | "brickDefault" | "defaultBrick" | "clearRound" | "roundClear" | "clearDefault" | "defaultClear" | "brickClear" | "clearBrick" | "clearClear" | undefined;
-    status?: "alert" | "success" | "warning" | undefined;
-    onFocus?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    onBlur?: ((event: import("react").FocusEvent<HTMLElement>) => void) | undefined;
-    autoFocus?: boolean | undefined;
-    placeholder?: string | undefined;
-    readOnly?: boolean | undefined;
-    required?: boolean | undefined;
-    tabIndex?: number | undefined;
-    inputRef?: ((instance: HTMLInputElement | null) => void) | import("react").RefObject<HTMLInputElement> | null | undefined;
-    ariaLabel?: string | undefined;
-    iconSize?: "xs" | "s" | "m" | undefined;
-    format?: string | undefined;
-    separator?: string | undefined;
-    dropdownForm?: "default" | "round" | "brick" | undefined;
-    width?: "default" | "full" | undefined;
-    leftSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    rightSide?: string | import("react").FC<PropsWithHTMLAttributesAndRef<{
-        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
-        size?: "xs" | "s" | "m" | undefined;
-    }, HTMLSpanElement>> | undefined;
-    startFieldInputRef?: undefined;
-    endFieldInputRef?: undefined;
-    startFieldLeftSide?: undefined;
-    startFieldRightSide?: undefined;
-    endFieldLeftSide?: undefined;
-    endFieldRightSide?: undefined;
-    startFieldOnFocus?: undefined;
-    endFieldOnFocus?: undefined;
-    startFieldOnBlur?: undefined;
-    endFieldOnBlur?: undefined;
-    label?: string | undefined;
-    caption?: string | undefined;
-    labelPosition?: "left" | "top" | undefined;
-}, HTMLDivElement>;
 export declare const datePickerPropSeparatorDefault = ".";
-export declare const datePickerPropFormatDefault: string;
-export declare const datePickerPropPlaceholderDefault: string;
+export declare const datePickerPropFormatTypeDate: string;
+export declare const datePickerPropPlaceholderTypeDate: string;
+export declare const datePickerPropFormatTypeDateTime: string;
+export declare const datePickerPropPlaceholderTypeDateTime: string;
 export declare const normalizeRangeValue: (dateRange: DateRange) => DateRange;
+export declare const getMultiplicityTime: (format: string, multiplicityHours: number | undefined, multiplicityMinutes: number | undefined, multiplicitySeconds: number | undefined) => (number | undefined)[];
+export declare const getTimeEnum: (length: number, multiplicity: number | undefined, startOfUnits: (date: Date) => Date, addUnits: (date: Date, amount: number) => Date, getItemLabel: (date: Date) => string) => string[];
 export {};