@consta/uikit 3.15.1 → 3.16.0

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

@@ -1,19 +1,24 @@
-import { __assign, __rest } from "tslib";
+import { __assign, __read, __rest } from "tslib";
 import './DatePickerDropdown.css';
-import React, { forwardRef, useRef } from 'react';
-import { CSSTransition } from 'react-transition-group';
+import React, { forwardRef, useRef, useState } from 'react';
+import { Transition } from 'react-transition-group';
 import { useForkRef } from '../../../hooks/useForkRef/useForkRef';
+import { animateTimeout, cnMixPopoverAnimate, } from '../../../mixs/MixPopoverAnimate/MixPopoverAnimate';
 import { cn } from '../../../utils/bem';
-import { cnForCssTransition } from '../../../utils/cnForCssTransition';
 import { DateTime, } from '../../DateTimeCanary/DateTimeCanary';
 import { Popover } from '../../Popover/Popover';
 import { datePickerPropDropdownFormDefault, } from '../helpers';
 var cnDatePickerDropdown = cn('DatePickerDropdown');
-var cnDatePickerDropdownCssTransition = cnForCssTransition(cnDatePickerDropdown);
-export var DatePickerDropdown = forwardRef(function (props, ref) {
+export var DatePickerDropdown = forwardRef(function (props, componentRef) {
     var _a = props.form, form = _a === void 0 ? datePickerPropDropdownFormDefault : _a, anchorRef = props.anchorRef, isOpen = props.isOpen, className = props.className, zIndex = props.zIndex, otherProps = __rest(props, ["form", "anchorRef", "isOpen", "className", "zIndex"]);
     var rootRef = useRef(null);
-    return (React.createElement(CSSTransition, { "in": isOpen, unmountOnExit: true, appear: true, classNames: cnDatePickerDropdownCssTransition, timeout: 200, nodeRef: rootRef },
-        React.createElement(Popover, { ref: useForkRef([ref, rootRef]), anchorRef: anchorRef, className: cnDatePickerDropdown({ form: form }, [className]), direction: "downStartLeft", spareDirection: "downStartLeft", possibleDirections: ['downStartLeft', 'upStartLeft', 'downStartRight', 'upStartRight'], style: { zIndex: zIndex } },
-            React.createElement(DateTime, __assign({}, otherProps)))));
+    var _b = __read(useState(), 2), direction = _b[0], setDirection = _b[1];
+    var ref = useForkRef([componentRef, rootRef]);
+    return (React.createElement(Transition, { "in": isOpen, unmountOnExit: true, timeout: animateTimeout, nodeRef: rootRef }, function (animate) {
+        return (React.createElement(Popover, { ref: ref, anchorRef: anchorRef, className: cnDatePickerDropdown({ form: form }, [
+                className,
+                cnMixPopoverAnimate({ direction: direction, animate: animate }),
+            ]), direction: "downStartLeft", spareDirection: "downStartLeft", possibleDirections: ['downStartLeft', 'upStartLeft', 'downStartRight', 'upStartRight'], style: { zIndex: zIndex }, role: "listbox", onSetDirection: setDirection },
+            React.createElement(DateTime, __assign({}, otherProps))));
+    }));
 });

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

@@ -1,4 +1,3 @@
-import './DatePickerFieldTypeDateRange.css';
 import React from 'react';
 export declare const DatePickerFieldTypeDateRange: React.ForwardRefExoticComponent<Pick<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributes<{
     className?: string | undefined;

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

@@ -1,21 +1,17 @@
 import { __assign, __read, __rest } from "tslib";
-import './DatePickerFieldTypeDateRange.css';
 import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import isBefore from 'date-fns/isBefore';
 import isEqual from 'date-fns/isEqual';
-import { cn } from '../../../utils/bem';
-import { getByMap } from '../../../utils/getByMap';
 import { FieldCaption } from '../../FieldCaption/FieldCaption';
 import { FieldLabel } from '../../FieldLabel/FieldLabel';
 import { DatePickerFieldTypeDate } from '../DatePickerFieldTypeDate/DatePickerFieldTypeDate';
-import { datePickerErrorTypes } from '../helpers';
-import { mapFormForEnd, mapFormForStart } from './helpers';
-var cnDatePickerFieldTypeDateRange = cn('DatePickerFieldTypeDateRange');
+import { cnDatePickerMixRangeField } from '../DatePickerMixRangeField/DatePickerMixRangeField';
+import { datePickerErrorTypes, getFormForEnd, getFormForStart } from '../helpers';
 export var DatePickerFieldTypeDateRange = 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 = __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 commonProps = {
-        className: cnDatePickerFieldTypeDateRange('Field'),
+        className: cnDatePickerMixRangeField('Field'),
         disabled: disabled,
         name: name,
         onError: onError,
@@ -89,11 +85,11 @@ export var DatePickerFieldTypeDateRange = forwardRef(function (props, ref) {
     useEffect(function () {
         setEndDate(value === null || value === void 0 ? void 0 : value[1]);
     }, [(_b = value === null || value === void 0 ? void 0 : value[1]) === null || _b === void 0 ? void 0 : _b.getTime()]);
-    return (React.createElement("div", __assign({}, otherProps, { className: cnDatePickerFieldTypeDateRange({ view: view, labelPosition: labelPosition, width: width, size: size }, [className]), ref: ref }),
-        label && (React.createElement(FieldLabel, { required: required, className: cnDatePickerFieldTypeDateRange('Label', { labelPosition: labelPosition }), size: size }, label)),
-        React.createElement("div", { className: cnDatePickerFieldTypeDateRange('Body') },
-            React.createElement("div", { className: cnDatePickerFieldTypeDateRange('Fields') },
-                React.createElement(DatePickerFieldTypeDate, __assign({}, commonProps, { inputRef: startFieldInputRef, ref: startFieldRef, leftSide: startFieldLeftSide, rightSide: startFieldRightSide, form: getByMap(mapFormForStart, form), value: startDate, onChange: handleStartDateChange, onFocus: startFieldOnFocus, onBlur: startFieldOnBlur, focused: startFocused })),
-                React.createElement(DatePickerFieldTypeDate, __assign({}, commonProps, { inputRef: endFieldInputRef, ref: endFieldRef, leftSide: endFieldLeftSide, rightSide: endFieldRightSide, form: getByMap(mapFormForEnd, form), value: endDate, onChange: handleEndDateChange, onFocus: endFieldOnFocus, onBlur: endFieldOnBlur, focused: endFocused }))),
-            caption && (React.createElement(FieldCaption, { className: cnDatePickerFieldTypeDateRange('Caption'), status: status }, caption)))));
+    return (React.createElement("div", __assign({}, otherProps, { className: cnDatePickerMixRangeField({ view: view, labelPosition: labelPosition, width: width, size: size }, [className]), ref: ref }),
+        label && (React.createElement(FieldLabel, { required: required, className: cnDatePickerMixRangeField('Label', { labelPosition: labelPosition }), size: size }, label)),
+        React.createElement("div", { className: cnDatePickerMixRangeField('Body') },
+            React.createElement("div", { className: cnDatePickerMixRangeField('Fields') },
+                React.createElement(DatePickerFieldTypeDate, __assign({}, commonProps, { inputRef: startFieldInputRef, ref: startFieldRef, leftSide: startFieldLeftSide, rightSide: startFieldRightSide, form: getFormForStart(form), value: startDate, onChange: handleStartDateChange, onFocus: startFieldOnFocus, onBlur: startFieldOnBlur, focused: startFocused })),
+                React.createElement(DatePickerFieldTypeDate, __assign({}, commonProps, { inputRef: endFieldInputRef, ref: endFieldRef, leftSide: endFieldLeftSide, rightSide: endFieldRightSide, form: getFormForEnd(form), value: endDate, onChange: handleEndDateChange, onFocus: endFieldOnFocus, onBlur: endFieldOnBlur, focused: endFocused }))),
+            caption && (React.createElement(FieldCaption, { className: cnDatePickerMixRangeField('Caption'), status: status }, caption)))));
 });

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

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { IconComponent } from '../../../icons/Icon/Icon';
 import { DateRange } from '../../../utils/types/Date';
-import { TextFieldPropForm } from '../../TextField/TextField';
 import { DatePickerFieldTypeDateProps } from '../DatePickerFieldTypeDate/helpers';
 declare type DatePickerFieldTypeDateRangePropOnChange = (props: {
     e: Event;
@@ -28,6 +27,4 @@ export declare type DatePickerFieldTypeDateRangeProps = Omit<DatePickerFieldType
     onChangeCurrentVisibleDate?: (date: Date) => void;
     currentVisibleDate?: Date;
 };
-export declare const mapFormForStart: Record<TextFieldPropForm, TextFieldPropForm>;
-export declare const mapFormForEnd: Record<TextFieldPropForm, TextFieldPropForm>;
 export {};

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

@@ -1,32 +0,0 @@
-export var mapFormForStart = {
-    "default": 'defaultClear',
-    defaultClear: 'defaultClear',
-    defaultBrick: 'defaultClear',
-    brick: 'brickClear',
-    brickDefault: 'brickClear',
-    brickClear: 'brickClear',
-    brickRound: 'brickClear',
-    round: 'roundClear',
-    roundClear: 'roundClear',
-    roundBrick: 'roundClear',
-    clearRound: 'clearClear',
-    clearDefault: 'clearClear',
-    clearBrick: 'clearClear',
-    clearClear: 'clearClear'
-};
-export var mapFormForEnd = {
-    "default": 'brickDefault',
-    defaultClear: 'brickClear',
-    defaultBrick: 'brick',
-    brick: 'brick',
-    brickDefault: 'brickDefault',
-    brickClear: 'brickClear',
-    brickRound: 'brickRound',
-    round: 'brickRound',
-    roundClear: 'brickClear',
-    roundBrick: 'brick',
-    clearRound: 'brickRound',
-    clearDefault: 'brickDefault',
-    clearBrick: 'brick',
-    clearClear: 'brickClear'
-};

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

@@ -0,0 +1,83 @@
+import React from 'react';
+export declare const DatePickerFieldTypeDateTimeRange: React.ForwardRefExoticComponent<Pick<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributes<{
+    className?: string | undefined;
+    value?: Date | null | undefined;
+    onChange?: ((props: {
+        e: Event;
+        value: Date | null;
+    }) => void) | undefined;
+    onError?: import("../helpers").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;
+    width?: "default" | "full" | undefined;
+    onFocus?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    onBlur?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    autoFocus?: boolean | undefined;
+    placeholder?: string | undefined;
+    leftSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    rightSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    readOnly?: boolean | undefined;
+    required?: boolean | undefined;
+    tabIndex?: number | undefined;
+    inputRef?: ((instance: HTMLInputElement | HTMLTextAreaElement | null) => void) | React.RefObject<HTMLInputElement | HTMLTextAreaElement> | null | undefined;
+    ariaLabel?: string | undefined;
+    iconSize?: "xs" | "s" | "m" | undefined;
+    children?: undefined;
+    format?: string | undefined;
+    separator?: string | undefined;
+    minDate?: Date | undefined;
+    maxDate?: Date | undefined;
+    focused?: boolean | undefined;
+    multiplicitySeconds?: number | undefined;
+    multiplicityMinutes?: number | undefined;
+    multiplicityHours?: number | undefined;
+    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" | "multiplicitySeconds" | "multiplicityMinutes" | "multiplicityHours"> & {
+    onChange?: ((props: {
+        e: Event;
+        value: import("../../../utils/types/Date").DateRange | null;
+    }) => void) | undefined;
+    value?: import("../../../utils/types/Date").DateRange | null | undefined;
+    startFieldInputRef?: ((instance: HTMLInputElement | null) => void) | React.RefObject<HTMLInputElement> | null | undefined;
+    endFieldInputRef?: ((instance: HTMLInputElement | null) => void) | React.RefObject<HTMLInputElement> | null | undefined;
+    startFieldLeftSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    startFieldRightSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    endFieldLeftSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    endFieldRightSide?: string | React.FC<import("../../../utils/types/PropsWithHTMLAttributes").PropsWithHTMLAttributesAndRef<{
+        view?: "link" | "alert" | "brand" | "ghost" | "primary" | "secondary" | "success" | "warning" | "disabled" | undefined;
+        size?: "xs" | "s" | "m" | undefined;
+    }, HTMLSpanElement>> | undefined;
+    startFieldRef?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
+    endFieldRef?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
+    startFieldOnFocus?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    endFieldOnFocus?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    startFieldOnBlur?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    endFieldOnBlur?: ((event: React.FocusEvent<HTMLElement>) => void) | undefined;
+    startFocused?: boolean | undefined;
+    endFocused?: boolean | undefined;
+    id?: string | undefined;
+    onChangeCurrentVisibleDate?: ((date: Date) => void) | undefined;
+    currentVisibleDate?: Date | undefined;
+} & React.RefAttributes<HTMLDivElement>>;

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

@@ -0,0 +1,95 @@
+import { __assign, __read, __rest } from "tslib";
+import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import isBefore from 'date-fns/isBefore';
+import isEqual from 'date-fns/isEqual';
+import { FieldCaption } from '../../FieldCaption/FieldCaption';
+import { FieldLabel } from '../../FieldLabel/FieldLabel';
+import { DatePickerFieldTypeDateTime } from '../DatePickerFieldTypeDateTime/DatePickerFieldTypeDateTime';
+import { cnDatePickerMixRangeField } from '../DatePickerMixRangeField/DatePickerMixRangeField';
+import { datePickerErrorTypes, getFormForEnd, getFormForStart } from '../helpers';
+export var DatePickerFieldTypeDateTimeRange = 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 = __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 commonProps = {
+        className: cnDatePickerMixRangeField('Field'),
+        disabled: disabled,
+        name: name,
+        onError: onError,
+        size: size,
+        view: view,
+        status: status,
+        autoFocus: autoFocus,
+        placeholder: placeholder,
+        readOnly: readOnly,
+        required: required,
+        tabIndex: tabIndex,
+        ariaLabel: ariaLabel,
+        iconSize: iconSize,
+        format: format,
+        separator: separator,
+        minDate: minDate,
+        maxDate: maxDate
+    };
+    var _e = __read(useState(value === null || value === void 0 ? void 0 : value[0]), 2), startDate = _e[0], setStartDate = _e[1];
+    var _f = __read(useState(value === null || value === void 0 ? void 0 : value[1]), 2), endDate = _f[0], setEndDate = _f[1];
+    var eventRef = useRef();
+    var handleChange = function (e, ownStartDate, ownEndDate) {
+        var start = ownStartDate || startDate;
+        var end = ownEndDate || endDate;
+        if (!onChange) {
+            return;
+        }
+        if (start && end) {
+            if (isBefore(start, end) || isEqual(start, end)) {
+                onChange({ e: e, value: [start, end] });
+                return;
+            }
+            onChange({ e: e, value: [start, undefined] });
+            onError && onError({ type: datePickerErrorTypes[2], date: [start, end] });
+            return;
+        }
+        if (start) {
+            onChange({ e: e, value: [start, undefined] });
+            return;
+        }
+        if (end) {
+            onChange({ e: e, value: [undefined, end] });
+            return;
+        }
+        onChange({ e: e, value: null });
+    };
+    var handleStartDateChange = function (props) {
+        var _a;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a.getTime()) === (startDate === null || startDate === void 0 ? void 0 : startDate.getTime())) {
+            return;
+        }
+        eventRef.current = props.e;
+        setStartDate(props.value);
+    };
+    var handleEndDateChange = function (props) {
+        var _a;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a.getTime()) === (endDate === null || endDate === void 0 ? void 0 : endDate.getTime())) {
+            return;
+        }
+        eventRef.current = props.e;
+        setEndDate(props.value);
+    };
+    useEffect(function () {
+        if (eventRef.current) {
+            handleChange(eventRef.current, startDate, endDate);
+        }
+    }, [eventRef.current]);
+    useEffect(function () {
+        setStartDate(value === null || value === void 0 ? void 0 : value[0]);
+    }, [(_a = value === null || value === void 0 ? void 0 : value[0]) === null || _a === void 0 ? void 0 : _a.getTime()]);
+    useEffect(function () {
+        setEndDate(value === null || value === void 0 ? void 0 : value[1]);
+    }, [(_b = value === null || value === void 0 ? void 0 : value[1]) === null || _b === void 0 ? void 0 : _b.getTime()]);
+    return (React.createElement("div", __assign({}, otherProps, { className: cnDatePickerMixRangeField({ view: view, labelPosition: labelPosition, width: width, size: size }, [className]), ref: ref }),
+        label && (React.createElement(FieldLabel, { required: required, className: cnDatePickerMixRangeField('Label', { labelPosition: labelPosition }), size: size }, label)),
+        React.createElement("div", { className: cnDatePickerMixRangeField('Body') },
+            React.createElement("div", { className: cnDatePickerMixRangeField('Fields') },
+                React.createElement(DatePickerFieldTypeDateTime, __assign({}, commonProps, { inputRef: startFieldInputRef, ref: startFieldRef, leftSide: startFieldLeftSide, rightSide: startFieldRightSide, form: getFormForStart(form), value: startDate, onChange: handleStartDateChange, onFocus: startFieldOnFocus, onBlur: startFieldOnBlur, focused: startFocused })),
+                React.createElement(DatePickerFieldTypeDateTime, __assign({}, commonProps, { inputRef: endFieldInputRef, ref: endFieldRef, leftSide: endFieldLeftSide, rightSide: endFieldRightSide, form: getFormForEnd(form), value: endDate, onChange: handleEndDateChange, onFocus: endFieldOnFocus, onBlur: endFieldOnBlur, focused: endFocused }))),
+            caption && (React.createElement(FieldCaption, { className: cnDatePickerMixRangeField('Caption'), status: status }, caption)))));
+});

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

@@ -0,0 +1,30 @@
+/// <reference types="react" />
+import { IconComponent } from '../../../icons/Icon/Icon';
+import { DateRange } from '../../../utils/types/Date';
+import { DatePickerFieldTypeDateTimeProps } from '../DatePickerFieldTypeDateTime/helpers';
+declare type DatePickerFieldTypeDateTimeRangePropOnChange = (props: {
+    e: Event;
+    value: DateRange | null;
+}) => void;
+export declare type DatePickerFieldTypeDateTimeRangeProps = Omit<DatePickerFieldTypeDateTimeProps, 'onChange' | 'value' | 'inputRef' | 'leftSide' | 'rightSide' | 'id' | 'onFocus' | 'onBlur'> & {
+    onChange?: DatePickerFieldTypeDateTimeRangePropOnChange;
+    value?: DateRange | null;
+    startFieldInputRef?: React.Ref<HTMLInputElement>;
+    endFieldInputRef?: React.Ref<HTMLInputElement>;
+    startFieldLeftSide?: string | IconComponent;
+    startFieldRightSide?: string | IconComponent;
+    endFieldLeftSide?: string | IconComponent;
+    endFieldRightSide?: string | IconComponent;
+    startFieldRef?: React.Ref<HTMLDivElement>;
+    endFieldRef?: React.Ref<HTMLDivElement>;
+    startFieldOnFocus?: React.FocusEventHandler<HTMLElement>;
+    endFieldOnFocus?: React.FocusEventHandler<HTMLElement>;
+    startFieldOnBlur?: React.FocusEventHandler<HTMLElement>;
+    endFieldOnBlur?: React.FocusEventHandler<HTMLElement>;
+    startFocused?: boolean;
+    endFocused?: boolean;
+    id?: string;
+    onChangeCurrentVisibleDate?: (date: Date) => void;
+    currentVisibleDate?: Date;
+};
+export {};

package/__internal__/src/components/DatePickerCanary/{DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange.css → DatePickerMixRangeField/DatePickerMixRangeField.css}

@@ -1,69 +1,69 @@
-.DatePickerFieldTypeDateRange {
+.DatePickerMixRangeField {
   --caption-margin-left: calc(var(--input-space) + var(--control-border-width));
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
 }
 
-  .DatePickerFieldTypeDateRange_size_xs {
+  .DatePickerMixRangeField_size_xs {
       --input-height: var(--control-height-xs);
       --input-space: calc(var(--control-space-xs) * 0.5);
     }
 
-  .DatePickerFieldTypeDateRange_size_s {
+  .DatePickerMixRangeField_size_s {
       --input-height: var(--control-height-s);
       --input-space: calc(var(--control-space-s) * 0.5);
     }
 
-  .DatePickerFieldTypeDateRange_size_m {
+  .DatePickerMixRangeField_size_m {
       --input-height: var(--control-height-m);
       --input-space: calc(var(--control-space-m) * 0.5);
     }
 
-  .DatePickerFieldTypeDateRange_size_l {
+  .DatePickerMixRangeField_size_l {
       --input-height: var(--control-height-l);
       --input-space: calc(var(--control-space-l) * 0.5);
     }
 
-  .DatePickerFieldTypeDateRange_view_clear {
+  .DatePickerMixRangeField_view_clear {
       --caption-margin-left: 0;
     }
 
-  .DatePickerFieldTypeDateRange_width_full {
+  .DatePickerMixRangeField_width_full {
     width: 100%;
   }
 
-  .DatePickerFieldTypeDateRange-Field {
+  .DatePickerMixRangeField-Field {
     -webkit-box-flex: 1;
         -ms-flex: 1;
             flex: 1;
   }
 
-  .DatePickerFieldTypeDateRange-Fields {
+  .DatePickerMixRangeField-Fields {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
   }
 
-  .DatePickerFieldTypeDateRange_labelPosition_top {
+  .DatePickerMixRangeField_labelPosition_top {
       -webkit-box-orient: vertical;
       -webkit-box-direction: normal;
           -ms-flex-direction: column;
               flex-direction: column;
     }
 
-  .DatePickerFieldTypeDateRange_labelPosition_top > *:not(:last-child) {
+  .DatePickerMixRangeField_labelPosition_top > *:not(:last-child) {
         margin-bottom: var(--space-xs);
       }
 
-  .DatePickerFieldTypeDateRange_labelPosition_left {
+  .DatePickerMixRangeField_labelPosition_left {
       -webkit-box-orient: horizontal;
       -webkit-box-direction: normal;
           -ms-flex-direction: row;
               flex-direction: row;
     }
 
-  .DatePickerFieldTypeDateRange_labelPosition_left .DatePickerFieldTypeDateRange-Label {
+  .DatePickerMixRangeField_labelPosition_left .DatePickerFieldTypeDateRange-Label {
         display: -webkit-inline-box;
         display: -ms-inline-flexbox;
         display: inline-flex;
@@ -73,11 +73,11 @@
         height: var(--input-height);
       }
 
-  .DatePickerFieldTypeDateRange_labelPosition_left > *:not(:last-child) {
+  .DatePickerMixRangeField_labelPosition_left > *:not(:last-child) {
         margin-right: var(--space-s);
       }
 
-  .DatePickerFieldTypeDateRange-Body {
+  .DatePickerMixRangeField-Body {
     display: -webkit-inline-box;
     display: -ms-inline-flexbox;
     display: inline-flex;
@@ -88,7 +88,7 @@
     width: 100%;
   }
 
-  .DatePickerFieldTypeDateRange-Caption {
+  .DatePickerMixRangeField-Caption {
     margin-top: var(--space-2xs);
     margin-left: var(--caption-margin-left);
   }

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

@@ -0,0 +1,2 @@
+import './DatePickerMixRangeField.css';
+export declare const cnDatePickerMixRangeField: import("@bem-react/classname").ClassNameFormatter;

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

@@ -0,0 +1,3 @@
+import './DatePickerMixRangeField.css';
+import { cn } from '../../../utils/bem';
+export var cnDatePickerMixRangeField = cn('DatePickerMixRangeField');

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

@@ -42,7 +42,7 @@ export var DatePickerTypeDate = forwardRef(function (props, ref) {
     }, [props.value]);
     var handleClose = function () {
         setCalendarVisible.off();
-        setCurrentVisibleDate(undefined);
+        setCurrentVisibleDate(props.value ? undefined : currentVisibleDateProp);
     };
     useClickOutside({
         isActive: calendarVisible,

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

@@ -3,6 +3,7 @@ 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 { useForkRef } from '../../../hooks/useForkRef/useForkRef';
 import { DatePickerDropdown, } from '../DatePickerDropdown/DatePickerDropdown';
 import { DatePickerFieldTypeDateRange } from '../DatePickerFieldTypeDateRange/DatePickerFieldTypeDateRange';
@@ -20,18 +21,16 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
     var startFocused = fieldFocused === 'start';
     var endFocused = fieldFocused === 'end';
     var hadleChange = function (_a) {
-        var _b, _c, _d, _e, _f, _g;
+        var _b, _c, _d, _e;
         var e = _a.e, value = _a.value;
         if (startFocused) {
             (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, { e: e, value: normalizeRangeValue([value, (_c = props === null || props === void 0 ? void 0 : props.value) === null || _c === void 0 ? void 0 : _c[1]]) });
-            (_d = endFieldInputRef.current) === null || _d === void 0 ? void 0 : _d.focus();
         }
         if (endFocused) {
-            (_e = props.onChange) === null || _e === void 0 ? void 0 : _e.call(props, { e: e, value: normalizeRangeValue([(_f = props === null || props === void 0 ? void 0 : props.value) === null || _f === void 0 ? void 0 : _f[0], value]) });
-            (_g = startFieldInputRef.current) === null || _g === void 0 ? void 0 : _g.focus();
+            (_d = props.onChange) === null || _d === void 0 ? void 0 : _d.call(props, { e: e, value: normalizeRangeValue([(_e = props === null || props === void 0 ? void 0 : props.value) === null || _e === void 0 ? void 0 : _e[0], value]) });
         }
     };
-    var _f = __read(useState(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
+    var _f = __read(useFlag(false), 2), calendarVisible = _f[0], setCalendarVisible = _f[1];
     var _g = __read(useCurrentVisibleDate(currentVisibleDateProp, onChangeCurrentVisibleDateProp), 2), currentVisibleDate = _g[0], setCurrentVisibleDate = _g[1];
     var startFieldOnBlurHandler = function (e) {
         onBlur && onBlur(e);
@@ -43,69 +42,67 @@ export var DatePickerTypeDateRange = forwardRef(function (props, ref) {
     };
     var startFieldOnFocusHandler = function (e) {
         setFieldFocused('start');
-        setCalendarVisible(true);
+        setCalendarVisible.on();
         onFocus && onFocus(e);
         startFieldOnFocus && startFieldOnFocus(e);
     };
     var endFieldOnFocusHandler = function (e) {
         setFieldFocused('end');
-        setCalendarVisible(true);
+        setCalendarVisible.on();
         onFocus && onFocus(e);
         endFieldOnFocus && endFieldOnFocus(e);
     };
     // эфект для того чтобы календарь переключался при вводе с клавиатуры
     useEffect(function () {
-        var _a, _b;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) &&
-            props.dateTimeView === 'classic' &&
-            currentVisibleDate &&
-            startFocused) {
+        var _a, _b, _c;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) && props.dateTimeView === 'classic' && startFocused) {
             var newVisibleDate = startOfMonth(props.value[0]);
-            if (newVisibleDate.getTime() !== currentVisibleDate.getTime()) {
+            if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) &&
-            props.dateTimeView !== 'classic' &&
-            currentVisibleDate &&
-            startFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[0]) && props.dateTimeView !== 'classic' && startFocused) {
             var newVisibleDate = startOfMonth(props.value[0]);
-            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== addMonths(currentVisibleDate, 1).getTime()) {
+            if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
+                newVisibleDate.getTime() !==
+                    (currentVisibleDate && addMonths(currentVisibleDate, 1).getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
+            return;
+        }
+        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[0]) && startFocused) {
+            setCurrentVisibleDate(currentVisibleDateProp);
         }
-    }, [(_b = (_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.getTime(), calendarVisible]);
+    }, [(_b = (_a = props.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.getTime(), calendarVisible, startFocused]);
     useEffect(function () {
-        var _a, _b;
-        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) &&
-            props.dateTimeView === 'classic' &&
-            currentVisibleDate &&
-            endFocused) {
+        var _a, _b, _c;
+        if (((_a = props.value) === null || _a === void 0 ? void 0 : _a[1]) && props.dateTimeView === 'classic' && endFocused) {
             var newVisibleDate = startOfMonth(props.value[1]);
-            if (newVisibleDate.getTime() !== currentVisibleDate.getTime()) {
+            if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime())) {
                 setCurrentVisibleDate(newVisibleDate);
             }
             return;
         }
-        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) &&
-            props.dateTimeView !== 'classic' &&
-            currentVisibleDate &&
-            endFocused) {
+        if (((_b = props.value) === null || _b === void 0 ? void 0 : _b[1]) && props.dateTimeView !== 'classic' && endFocused) {
             var newVisibleDate = startOfMonth(props.value[1]);
-            if (newVisibleDate.getTime() !== currentVisibleDate.getTime() &&
-                newVisibleDate.getTime() !== addMonths(currentVisibleDate, 1).getTime()) {
+            if (newVisibleDate.getTime() !== (currentVisibleDate === null || currentVisibleDate === void 0 ? void 0 : currentVisibleDate.getTime()) &&
+                newVisibleDate.getTime() !==
+                    (currentVisibleDate && addMonths(currentVisibleDate, 1).getTime())) {
                 setCurrentVisibleDate(addMonths(newVisibleDate, -1));
             }
+            return;
+        }
+        if (!((_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) && endFocused) {
+            setCurrentVisibleDate(currentVisibleDateProp);
         }
-    }, [(_d = (_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.getTime(), calendarVisible]);
+    }, [(_d = (_c = props.value) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.getTime(), calendarVisible, endFocused]);
     useClickOutside({
         isActive: calendarVisible,
         ignoreClicksInsideRefs: [startFieldRef, endFieldRef, calendarRef],
         handler: function () {
             setFieldFocused(false);
-            setCalendarVisible(false);
+            setCalendarVisible.off();
         }
     });
     return (React.createElement(React.Fragment, null,