@consta/uikit 3.24.2 → 3.24.3

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { PropsWithHTMLAttributes } from '../../utils/types/PropsWithHTMLAttributes';
 import { Locale } from './locale';
 export declare type DragNDropFieldPropLocale = Locale;
 export declare type FileError = {
@@ -13,16 +14,17 @@ export declare type DragNDropFieldPropErrorMessages = Partial<Record<FileError['
 export declare type DragNDropFieldChildrenRenderProp = (props: {
     openFileDialog: () => void;
     locale: Required<DragNDropFieldPropLocale>;
-} & Pick<DragNDropFieldProps, 'accept' | 'maxSize' | 'multiple'>) => React.ReactNode;
+} & Pick<DragNDropFieldProps, 'accept' | 'maxSize' | 'multiple' | 'disabled'>) => React.ReactNode;
 export declare type FileSizes = {
     minSize?: number;
     maxSize?: number;
 };
-export declare type DragNDropFieldProps = {
+export declare type DragNDropFieldProps = PropsWithHTMLAttributes<{
     accept?: string | string[];
     maxSize?: number;
     multiple?: boolean;
     onDropFiles: (files: File[]) => void;
     children?: React.ReactNode | DragNDropFieldChildrenRenderProp;
     locale?: DragNDropFieldPropLocale;
-};
+    disabled?: boolean;
+}, HTMLDivElement>;

package/__internal__/src/components/Popover/Popover.css

@@ -1,42 +1,8 @@
 .Popover {
   position: absolute;
+  top: var(--popover-top);
+  left: var(--popover-left);
   visibility: var(--popover-visibility);
   width: var(--popover-width);
   pointer-events: var(--popover-pointer-events);
 }
-
-  .Popover_direction_downCenter,
-    .Popover_direction_downRight,
-    .Popover_direction_downLeft,
-    .Popover_direction_downStartLeft,
-    .Popover_direction_downStartRight {
-      top: calc(var(--popover-top) + var(--popover-offset));
-      left: var(--popover-left);
-    }
-
-  .Popover_direction_upCenter,
-    .Popover_direction_upRight,
-    .Popover_direction_upLeft,
-    .Popover_direction_upStartLeft,
-    .Popover_direction_upStartRight {
-      top: calc(var(--popover-top) - var(--popover-offset));
-      left: var(--popover-left);
-    }
-
-  .Popover_direction_leftUp,
-    .Popover_direction_leftCenter,
-    .Popover_direction_leftDown,
-    .Popover_direction_leftStartUp,
-    .Popover_direction_leftStartDown {
-      top: var(--popover-top);
-      left: calc(var(--popover-left) - var(--popover-offset));
-    }
-
-  .Popover_direction_rightUp,
-    .Popover_direction_rightCenter,
-    .Popover_direction_rightDown,
-    .Popover_direction_rightStartUp,
-    .Popover_direction_rightStartDown {
-      top: var(--popover-top);
-      left: calc(var(--popover-left) + var(--popover-offset));
-    }

package/__internal__/src/components/Popover/Popover.js

@@ -1,10 +1,11 @@
 import { __assign, __read, __rest, __spread } from "tslib";
 import './Popover.css';
-import React, { forwardRef, useEffect, useLayoutEffect } from 'react';
+import React, { forwardRef, useEffect, useLayoutEffect, useMemo } from 'react';
 import { useClickOutside } from '../../hooks/useClickOutside/useClickOutside';
 import { useComponentSize } from '../../hooks/useComponentSize/useComponentSize';
 import { useForkRef } from '../../hooks/useForkRef/useForkRef';
 import { cn } from '../../utils/bem';
+import { isNumber, isString } from '../../utils/type-guards';
 import { PortalWithTheme, usePortalContext } from '../PortalWithTheme/PortalWithTheme';
 import { useTheme } from '../Theme/Theme';
 import { getComputedPositionAndDirection } from './helpers';
@@ -53,6 +54,29 @@ export var popoverPropOffset = [
     '6xl',
 ];
 export var directions = __spread(directionsStartCenter, directionsStartEdge);
+var getOffset = function (ref, propOffset) {
+    if (isNumber(propOffset)) {
+        return propOffset;
+    }
+    if (isString(propOffset) && ref.current) {
+        var cssVar = getComputedStyle(ref.current).getPropertyValue("--space-" + propOffset);
+        if (cssVar && /px$/.test(cssVar)) {
+            return Number(cssVar.slice(0, cssVar.length - 2));
+        }
+        if (cssVar && /rem$/.test(cssVar)) {
+            var fontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
+            var rem = Number(cssVar.slice(0, cssVar.length - 3));
+            return fontSize * rem;
+        }
+        if (cssVar && /em$/.test(cssVar)) {
+            var fontSize = parseFloat(getComputedStyle(ref.current).fontSize);
+            var em = Number(cssVar.slice(0, cssVar.length - 2));
+            return fontSize * em;
+        }
+        return 0;
+    }
+    return 0;
+};
 var isRenderProp = function (children) { return typeof children === 'function'; };
 /**
  * Подписчик на PortalWithThemeProvider
@@ -72,7 +96,7 @@ var ContextConsumer = function (_a) {
 var cnPopover = cn('Popover');
 export var Popover = forwardRef(function (props, componentRef) {
     var _a;
-    var children = props.children, _b = props.direction, passedDirection = _b === void 0 ? 'upCenter' : _b, _c = props.offset, offset = _c === void 0 ? 0 : _c, arrowOffset = props.arrowOffset, _d = props.possibleDirections, possibleDirections = _d === void 0 ? directions : _d, _e = props.isInteractive, isInteractive = _e === void 0 ? true : _e, onClickOutside = props.onClickOutside, _f = props.spareDirection, spareDirection = _f === void 0 ? 'downStartLeft' : _f, style = props.style, className = props.className, passedPosition = props.position, anchorRef = props.anchorRef, equalAnchorWidth = props.equalAnchorWidth, onSetDirection = props.onSetDirection, otherProps = __rest(props, ["children", "direction", "offset", "arrowOffset", "possibleDirections", "isInteractive", "onClickOutside", "spareDirection", "style", "className", "position", "anchorRef", "equalAnchorWidth", "onSetDirection"]);
+    var children = props.children, _b = props.direction, passedDirection = _b === void 0 ? 'upCenter' : _b, _c = props.offset, propOffset = _c === void 0 ? 0 : _c, arrowOffset = props.arrowOffset, _d = props.possibleDirections, possibleDirections = _d === void 0 ? directions : _d, _e = props.isInteractive, isInteractive = _e === void 0 ? true : _e, onClickOutside = props.onClickOutside, _f = props.spareDirection, spareDirection = _f === void 0 ? 'downStartLeft' : _f, style = props.style, className = props.className, passedPosition = props.position, anchorRef = props.anchorRef, equalAnchorWidth = props.equalAnchorWidth, onSetDirection = props.onSetDirection, otherProps = __rest(props, ["children", "direction", "offset", "arrowOffset", "possibleDirections", "isInteractive", "onClickOutside", "spareDirection", "style", "className", "position", "anchorRef", "equalAnchorWidth", "onSetDirection"]);
     var ref = React.useRef(null);
     var theme = useTheme().theme;
     var _g = __read(React.useState(), 2), anchorClientRect = _g[0], setAnchorClientRect = _g[1];
@@ -85,6 +109,7 @@ export var Popover = forwardRef(function (props, componentRef) {
         previousDirectionRef.current = null;
     };
     var updateAnchorClientRect = function () { var _a; return setAnchorClientRect((_a = anchorRef === null || anchorRef === void 0 ? void 0 : anchorRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect()); };
+    var offset = useMemo(function () { return getOffset(ref, propOffset); }, [propOffset, Boolean(ref.current)]);
     var _k = getComputedPositionAndDirection({
         contentSize: { width: width, height: height },
         viewportSize: {
@@ -93,6 +118,7 @@ export var Popover = forwardRef(function (props, componentRef) {
             height: document.documentElement.clientHeight
         },
         arrowOffset: arrowOffset,
+        offset: offset,
         direction: passedDirection,
         possibleDirections: possibleDirections,
         bannedDirections: bannedDirections,
@@ -102,11 +128,10 @@ export var Popover = forwardRef(function (props, componentRef) {
         anchorSize: anchorSize,
         spareDirection: spareDirection
     }), position = _k.position, direction = _k.direction;
-    var content = isRenderProp(children) ? children(direction) : children;
     useLayoutEffect(function () { return onSetDirection === null || onSetDirection === void 0 ? void 0 : onSetDirection(direction); }, [direction]);
-    useLayoutEffect(resetBannedDirections, [props]);
     useEffect(updateAnchorClientRect, [anchorSize]);
     usePopoverReposition({
+        isActive: true,
         scrollAnchorRef: anchorRef || { current: null },
         onRequestReposition: function () {
             resetBannedDirections();
@@ -119,16 +144,20 @@ export var Popover = forwardRef(function (props, componentRef) {
      * которые не подошли, чтобы не возвращаться к ним и предотвратить бесконечный ререндер.
      * См. PopoverBannedPositionsStory
      */
-    if (previousDirectionRef.current !== direction) {
-        if (previousDirectionRef.current && !bannedDirections.includes(previousDirectionRef.current)) {
-            setBannedDirections(function (state) {
-                return previousDirectionRef.current ? __spread(state, [previousDirectionRef.current]) : state;
-            });
+    useLayoutEffect(function () {
+        if (previousDirectionRef.current !== direction) {
+            if (previousDirectionRef.current &&
+                !bannedDirections.includes(previousDirectionRef.current)) {
+                setBannedDirections(function (state) {
+                    return previousDirectionRef.current ? __spread(state, [previousDirectionRef.current]) : state;
+                });
+            }
+            previousDirectionRef.current = direction;
         }
-        previousDirectionRef.current = direction;
-    }
+    }, [direction]);
     // Сбрасываем при любом изменении пропсов, чтобы заново начать перебор направлений
     // Главное не сбрасывать при изменении размеров поповера, т.к. именно оно может вызвать бесконечный перебор
-    return (React.createElement(PortalWithTheme, __assign({}, otherProps, { preset: theme, className: cnPopover({ direction: direction }, [className]), container: window.document.body, ref: useForkRef([ref, componentRef]), style: __assign(__assign({}, style), (_a = {}, _a['--popover-top'] = ((position === null || position === void 0 ? void 0 : position.y) || 0) + window.scrollY + "px", _a['--popover-left'] = ((position === null || position === void 0 ? void 0 : position.x) || 0) + window.scrollX + "px", _a["--popover-width"] = equalAnchorWidth ? anchorSize.width + "px" : undefined, _a["--popover-pointer-events"] = isInteractive ? undefined : 'none', _a["--popover-visibility"] = position ? undefined : 'hidden', _a["--popover-offset"] = typeof offset === 'string' ? "var(--space-" + offset + ")" : offset + "px", _a)) }),
-        React.createElement(ContextConsumer, { onClickOutside: onClickOutside, ignoreClicksInsideRefs: [ref, anchorRef || { current: null }] }, content)));
+    useLayoutEffect(resetBannedDirections, [props]);
+    return (React.createElement(PortalWithTheme, __assign({}, otherProps, { preset: theme, className: cnPopover({ direction: direction }, [className]), container: window.document.body, ref: useForkRef([ref, componentRef]), style: __assign(__assign({}, style), (_a = {}, _a['--popover-top'] = ((position === null || position === void 0 ? void 0 : position.y) || 0) + window.scrollY + "px", _a['--popover-left'] = ((position === null || position === void 0 ? void 0 : position.x) || 0) + window.scrollX + "px", _a["--popover-width"] = equalAnchorWidth ? anchorSize.width + "px" : undefined, _a["--popover-pointer-events"] = isInteractive ? undefined : 'none', _a["--popover-visibility"] = position ? undefined : 'hidden', _a)) }),
+        React.createElement(ContextConsumer, { onClickOutside: onClickOutside, ignoreClicksInsideRefs: [ref, anchorRef || { current: null }] }, isRenderProp(children) ? children(direction) : children)));
 });

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

@@ -1,26 +1,26 @@
 import { Direction, Position } from './Popover';
 declare type Size = Pick<ClientRect, 'width' | 'height'>;
 declare type PositionsByDirection = Record<Direction, NonNullable<Position>>;
-export declare const convertPixelsToNumber: (pixels: string) => number;
-export declare const getPositionsByDirection: ({ contentSize, anchorSize, position: { x, y }, arrowOffset, }: {
+export declare const getPositionsByDirection: ({ contentSize, anchorSize, position: { x, y }, arrowOffset, offset, }: {
     contentSize: Size;
     anchorSize: Size;
     position: NonNullable<Position>;
     arrowOffset?: number | undefined;
+    offset?: number | undefined;
 }) => PositionsByDirection;
 declare type ComputedPositionAndDirectionParams = {
     position: Position;
     contentSize: Size;
     viewportSize: Size;
     anchorSize?: Size;
-    offset?: number | string;
+    offset?: number;
     arrowOffset?: number;
     direction: Direction;
     spareDirection: Direction;
     possibleDirections: readonly Direction[];
     bannedDirections: readonly Direction[];
 };
-export declare const getComputedPositionAndDirection: ({ position: initialPosition, contentSize, viewportSize, anchorSize, arrowOffset, direction: initialDirection, possibleDirections, bannedDirections, spareDirection, }: ComputedPositionAndDirectionParams) => {
+export declare const getComputedPositionAndDirection: ({ position: initialPosition, contentSize, viewportSize, anchorSize, arrowOffset, direction: initialDirection, possibleDirections, bannedDirections, spareDirection, offset, }: ComputedPositionAndDirectionParams) => {
     direction: Direction;
     position: Position;
 };

package/__internal__/src/components/Popover/helpers.js

@@ -3,26 +3,23 @@ var getPosition = function (x, y) { return ({
     x: Math.round(x),
     y: Math.round(y)
 }); };
-export var convertPixelsToNumber = function (pixels) {
-    return Number(pixels.slice(0, pixels.length - 2));
-};
 export var getPositionsByDirection = function (_a) {
-    var contentSize = _a.contentSize, anchorSize = _a.anchorSize, _b = _a.position, x = _b.x, y = _b.y, _c = _a.arrowOffset, arrowOffset = _c === void 0 ? 0 : _c;
+    var contentSize = _a.contentSize, anchorSize = _a.anchorSize, _b = _a.position, x = _b.x, y = _b.y, _c = _a.arrowOffset, arrowOffset = _c === void 0 ? 0 : _c, _d = _a.offset, offset = _d === void 0 ? 0 : _d;
     var contentWidth = contentSize.width, contentHeight = contentSize.height;
     var anchorWidth = anchorSize.width, anchorHeight = anchorSize.height;
     var anchorCenter = {
         x: x + anchorWidth / 2,
         y: y + anchorHeight / 2
     };
-    var xForRightDirections = x + anchorWidth;
-    var xForLeftDirections = x - contentWidth;
+    var xForRightDirections = x + anchorWidth + offset;
+    var xForLeftDirections = x - contentWidth - offset;
     var xForVerticalDirections = {
         right: anchorCenter.x - arrowOffset,
         center: anchorCenter.x - contentWidth / 2,
         left: anchorCenter.x - contentWidth + arrowOffset
     };
-    var yForDownDirections = y + anchorHeight;
-    var yForUpDirections = y - contentHeight;
+    var yForDownDirections = y + anchorHeight + offset;
+    var yForUpDirections = y - contentHeight - offset;
     var yForHorizontalDirections = {
         up: anchorCenter.y - contentHeight + arrowOffset,
         center: anchorCenter.y - contentHeight / 2,
@@ -56,7 +53,7 @@ export var getPositionsByDirection = function (_a) {
     };
 };
 export var getComputedPositionAndDirection = function (_a) {
-    var initialPosition = _a.position, contentSize = _a.contentSize, viewportSize = _a.viewportSize, _b = _a.anchorSize, anchorSize = _b === void 0 ? { width: 0, height: 0 } : _b, arrowOffset = _a.arrowOffset, initialDirection = _a.direction, possibleDirections = _a.possibleDirections, bannedDirections = _a.bannedDirections, spareDirection = _a.spareDirection;
+    var initialPosition = _a.position, contentSize = _a.contentSize, viewportSize = _a.viewportSize, _b = _a.anchorSize, anchorSize = _b === void 0 ? { width: 0, height: 0 } : _b, arrowOffset = _a.arrowOffset, initialDirection = _a.direction, possibleDirections = _a.possibleDirections, bannedDirections = _a.bannedDirections, spareDirection = _a.spareDirection, _c = _a.offset, offset = _c === void 0 ? 0 : _c;
     if (!initialPosition) {
         return { position: initialPosition, direction: initialDirection };
     }
@@ -64,7 +61,8 @@ export var getComputedPositionAndDirection = function (_a) {
         contentSize: contentSize,
         anchorSize: anchorSize,
         position: initialPosition,
-        arrowOffset: arrowOffset
+        arrowOffset: arrowOffset,
+        offset: offset
     });
     var direction = __spread([initialDirection], possibleDirections).filter(function (dir) { return !bannedDirections.includes(dir); })
         .find(function (dir) {

package/__internal__/src/components/Popover/usePopoverReposition.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 /** Запрос репозиции поповера при ресайзе окна и скролле */
-export declare const usePopoverReposition: ({ scrollAnchorRef, onRequestReposition, }: {
+export declare const usePopoverReposition: ({ isActive, scrollAnchorRef, onRequestReposition, }: {
+    isActive: boolean;
     /** При скролле родителей этого элемента будет запрашиваться репозиция поповера */
     scrollAnchorRef: React.RefObject<HTMLElement | null>;
     onRequestReposition: () => void;

package/__internal__/src/components/Popover/usePopoverReposition.js

@@ -11,19 +11,19 @@ var getAllParents = function (element) {
 };
 /** Запрос репозиции поповера при ресайзе окна и скролле */
 export var usePopoverReposition = function (_a) {
-    var scrollAnchorRef = _a.scrollAnchorRef, onRequestReposition = _a.onRequestReposition;
+    var isActive = _a.isActive, scrollAnchorRef = _a.scrollAnchorRef, onRequestReposition = _a.onRequestReposition;
     var onRequestRepositionRef = useMutableRef(onRequestReposition);
     useEffect(function () {
-        window.addEventListener('resize', onRequestRepositionRef.current);
-        var allParents = (scrollAnchorRef === null || scrollAnchorRef === void 0 ? void 0 : scrollAnchorRef.current) ? getAllParents(scrollAnchorRef.current) : [];
-        allParents.forEach(function (parentEl) {
-            return parentEl.addEventListener('scroll', onRequestRepositionRef.current);
-        });
-        return function () {
-            window.removeEventListener('resize', onRequestRepositionRef.current);
-            allParents.forEach(function (parentEl) {
-                return parentEl.removeEventListener('scroll', onRequestRepositionRef.current);
-            });
-        };
+        var fn = function () { return onRequestRepositionRef.current(); };
+        if (isActive) {
+            window.addEventListener('resize', fn);
+            var allParents_1 = (scrollAnchorRef === null || scrollAnchorRef === void 0 ? void 0 : scrollAnchorRef.current) ? getAllParents(scrollAnchorRef.current) : [];
+            allParents_1.forEach(function (parentEl) { return parentEl.addEventListener('scroll', fn); });
+            return function () {
+                window.removeEventListener('resize', fn);
+                allParents_1.forEach(function (parentEl) { return parentEl.removeEventListener('scroll', fn); });
+            };
+        }
+        return undefined;
     }, [scrollAnchorRef]);
 };

package/__internal__/src/components/SelectComponents/SelectDropdown/SelectDropdown.js

@@ -1,6 +1,6 @@
-import { __assign, __read, __rest } from "tslib";
+import { __assign, __rest } from "tslib";
 import './SelectDropdown.css';
-import React, { Fragment, useMemo, useRef, useState } from 'react';
+import React, { Fragment, useMemo, useRef } from 'react';
 import { Transition } from 'react-transition-group';
 import { isOptionForCreate, } from '../../../hooks/useSelect/useSelect';
 import { animateTimeout, cnMixPopoverAnimate, } from '../../../mixs/MixPopoverAnimate/MixPopoverAnimate';
@@ -16,7 +16,6 @@ export var defaultSelectDropdownPropForm = selectDropdownform[0];
 var cnSelectDropdown = cn('SelectDropdown');
 export var SelectDropdown = function (props) {
     var controlRef = props.controlRef, size = props.size, getOptionProps = props.getOptionProps, dropdownRef = props.dropdownRef, labelForCreate = props.labelForCreate, className = props.className, labelForNotFound = props.labelForNotFound, labelForEmptyItems = props.labelForEmptyItems, _a = props.hasItems, hasItems = _a === void 0 ? true : _a, form = props.form, isOpen = props.isOpen, renderItem = props.renderItem, visibleItems = props.visibleItems, isLoading = props.isLoading, getGroupLabel = props.getGroupLabel, notFound = props.notFound, otherProps = __rest(props, ["controlRef", "size", "getOptionProps", "dropdownRef", "labelForCreate", "className", "labelForNotFound", "labelForEmptyItems", "hasItems", "form", "isOpen", "renderItem", "visibleItems", "isLoading", "getGroupLabel", "notFound"]);
-    var _b = __read(useState('downStartLeft'), 2), direction = _b[0], setDirection = _b[1];
     var indent = form === 'round' ? 'increased' : 'normal';
     var popoverRef = useRef(null);
     var isListShowed = useMemo(function () {
@@ -26,9 +25,9 @@ export var SelectDropdown = function (props) {
     }, [visibleItems]);
     return (React.createElement(Transition, { "in": isOpen, unmountOnExit: true, nodeRef: popoverRef, timeout: animateTimeout }, function (animate) {
         var getIndex = fabricIndex(-1);
-        return (React.createElement(Popover, __assign({}, otherProps, { anchorRef: controlRef, direction: "downStartLeft", possibleDirections: ['downStartLeft', 'upStartLeft', 'downStartRight', 'upStartRight'], offset: "2xs", ref: popoverRef, role: "listbox", onSetDirection: setDirection, className: cnSelectDropdown({ form: form, size: size }, [
+        return (React.createElement(Popover, __assign({}, otherProps, { anchorRef: controlRef, direction: "downStartLeft", possibleDirections: ['downStartLeft', 'upStartLeft', 'downStartRight', 'upStartRight'], offset: "2xs", ref: popoverRef, role: "listbox", className: cnSelectDropdown({ form: form, size: size }, [
                 className,
-                cnMixPopoverAnimate({ direction: direction, animate: animate }),
+                cnMixPopoverAnimate({ animate: animate }),
             ]), equalAnchorWidth: true }),
             React.createElement("div", { className: cnSelectDropdown('List', { size: size, form: form }), ref: dropdownRef },
                 isLoading && React.createElement(SelectLoader, { mode: isListShowed ? 'blur' : 'empty' }),

package/__internal__/src/components/SliderCanary/SliderInput/SliderInput.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TextFieldProps } from '../../TextField/helpers';
+import { TextFieldProps } from '../../TextField/TextField';
 declare type Props = Omit<TextFieldProps<'number'>, 'value' | 'onChange' | 'min' | 'max' | 'step'> & {
     value: number;
     step?: number | number[];

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

@@ -80,6 +80,10 @@ declare type GroupColumnAddition<T extends TableRow> = {
 export interface TableControl<T extends TableRow> {
     column: Header<T> & ColumnMetaData;
 }
+export declare type SortByProps<T extends TableRow> = {
+    sortingBy: keyof T;
+    sortOrder: 'asc' | 'desc';
+};
 export declare type TableColumn<T extends TableRow> = {
     title: React.ReactNode;
     align?: HorizontalAlign;

package/__internal__/src/components/Table/filtering.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TableColumn, TableRow, ValueOf } from './Table';
+import { SortByProps, TableColumn, TableRow, ValueOf } from './Table';
 export declare type FilterComponentProps = {
     onConfirm: (value: unknown) => void;
     onCancel: () => void;
@@ -20,10 +20,6 @@ export declare type Filters<T extends TableRow> = ValueOf<{
         };
     });
 }>[];
-export declare type SortByProps<T extends TableRow> = {
-    sortingBy: keyof T;
-    sortOrder: 'asc' | 'desc';
-};
 export declare type onSortBy<T extends TableRow> = (props: SortByProps<T> | null) => void;
 export declare type FieldSelectedValues = string[];
 declare type SelectedFilter = {

package/__internal__/src/components/TextField/TextField.css

@@ -437,21 +437,43 @@
     transition: background-color 0.15s;
   }
 
-  .TextField-ClearButton {
+  .TextField-ClearButton,
+  .TextField-EyeButton {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+        -ms-flex-direction: column;
+            flex-direction: column;
+    -webkit-box-pack: center;
+        -ms-flex-pack: center;
+            justify-content: center;
     height: calc(var(--input-height) - (var(--control-border-width) * 2));
     margin: 0;
     margin-left: var(--input-space);
     padding: 0;
-    color: var(--clear-button-color);
     background-color: transparent;
     border: none;
     cursor: pointer;
   }
 
+  .TextField-ClearButton {
+    color: var(--clear-button-color);
+  }
+
   .TextField-ClearButton:hover {
       --clear-button-color: var(--color-control-typo-clear-hover);
     }
 
+  .TextField-EyeButton {
+    color: var(--color-control-typo-placeholder);
+  }
+
+  .TextField-EyeButton:hover {
+      color: var(--color-control-typo-clear-hover);
+    }
+
   .TextField-ClearButtonIcon {
     position: relative;
     top: 1px;

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

@@ -1,8 +1,8 @@
 import './TextField.css';
 import React from 'react';
-import { TextFieldComponent, TextFieldProps } from './helpers';
+import { TextFieldComponent, TextFieldProps } from './types';
 export declare const COMPONENT_NAME: "TextField";
 export declare const cnTextField: import("@bem-react/classname").ClassNameFormatter;
 export declare function TextFieldRender<TYPE extends string>(props: TextFieldProps<TYPE>, ref: React.Ref<HTMLDivElement>): JSX.Element;
 export declare const TextField: TextFieldComponent;
-export * from './helpers';
+export * from './types';

package/__internal__/src/components/TextField/TextField.js

@@ -1,42 +1,58 @@
 import { __assign, __read, __rest } from "tslib";
 import './TextField.css';
-import React, { forwardRef, useEffect, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect } from 'react';
 import TextAreaAutoSize from 'react-textarea-autosize';
+import { useFlag } from '../../hooks/useFlag/useFlag';
 import { useForkRef } from '../../hooks/useForkRef/useForkRef';
+import { useMutableRef } from '../../hooks/useMutableRef/useMutableRef';
 import { useSortSteps } from '../../hooks/useSortSteps/useSortSteps';
 import { IconClose } from '../../icons/IconClose/IconClose';
+import { IconEye } from '../../icons/IconEye/IconEye';
+import { IconEyeClose } from '../../icons/IconEyeClose/IconEyeClose';
 import { IconSelect } from '../../icons/IconSelect/IconSelect';
 import { IconSelectOpen } from '../../icons/IconSelectOpen/IconSelectOpen';
 import { cn } from '../../utils/bem';
 import { getByMap } from '../../utils/getByMap';
+import { isString } from '../../utils/type-guards';
 import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { FieldCaption } from '../FieldCaption/FieldCaption';
 import { FieldLabel } from '../FieldLabel/FieldLabel';
-import { getIncrementFlag, getValueByStepArray, getValueByStepNumber, sizeMap, textFieldPropFormDefault, textFieldPropSizeDefault, textFieldPropViewDefault, textFieldPropWidthDefault, } from './helpers';
+import { getIncrementFlag, getTypeForRender, getValueByStep, sizeMap } from './helpers';
+import { textFieldPropFormDefault, textFieldPropSizeDefault, textFieldPropViewDefault, textFieldPropWidthDefault, } from './types';
 export var COMPONENT_NAME = 'TextField';
 export var cnTextField = cn(COMPONENT_NAME);
 export function TextFieldRender(props, ref) {
     var textFieldRef = React.useRef(null);
     var inputRef = React.useRef(null);
     var _a = usePropsHandler(COMPONENT_NAME, props, textFieldRef), className = _a.className, _b = _a.type, type = _b === void 0 ? 'text' : _b, value = _a.value, onChange = _a.onChange, id = _a.id, name = _a.name, rows = _a.rows, cols = _a.cols, minRows = _a.minRows, maxRows = _a.maxRows, inputRefProp = _a.inputRef, maxLength = _a.maxLength, disabled = _a.disabled, _c = _a.size, size = _c === void 0 ? textFieldPropSizeDefault : _c, _d = _a.view, view = _d === void 0 ? textFieldPropViewDefault : _d, _e = _a.form, form = _e === void 0 ? textFieldPropFormDefault : _e, state = _a.state, status = _a.status, _f = _a.width, width = _f === void 0 ? textFieldPropWidthDefault : _f, onBlur = _a.onBlur, onFocus = _a.onFocus, _g = _a.autoFocus, autoFocus = _g === void 0 ? false : _g, placeholder = _a.placeholder, leftSide = _a.leftSide, rightSide = _a.rightSide, autoComplete = _a.autoComplete, withClearButton = _a.withClearButton, max = _a.max, min = _a.min, readOnly = _a.readOnly, required = _a.required, _h = _a.step, step = _h === void 0 ? 1 : _h, tabIndex = _a.tabIndex, ariaLabel = _a.ariaLabel, label = _a.label, inputContainerRef = _a.inputContainerRef, _j = _a.labelPosition, labelPosition = _j === void 0 ? 'top' : _j, caption = _a.caption, iconSizeProp = _a.iconSize, focused = _a.focused, onClick = _a.onClick, otherProps = __rest(_a, ["className", "type", "value", "onChange", "id", "name", "rows", "cols", "minRows", "maxRows", "inputRef", "maxLength", "disabled", "size", "view", "form", "state", "status", "width", "onBlur", "onFocus", "autoFocus", "placeholder", "leftSide", "rightSide", "autoComplete", "withClearButton", "max", "min", "readOnly", "required", "step", "tabIndex", "ariaLabel", "label", "inputContainerRef", "labelPosition", "caption", "iconSize", "focused", "onClick"]);
-    var _k = __read(useState(autoFocus), 2), focus = _k[0], setFocus = _k[1];
+    var _k = __read(useFlag(autoFocus), 2), focus = _k[0], setFocus = _k[1];
+    var _l = __read(useFlag(false), 2), passwordVisible = _l[0], setPasswordVisuble = _l[1];
+    var valueRef = useMutableRef(value);
+    var onClickRef = useMutableRef(onClick);
+    var onChangeRef = useMutableRef(onChange);
+    var handleEyeClick = useCallback(function (e) {
+        var _a;
+        e.stopPropagation();
+        setPasswordVisuble.toogle();
+        (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    }, []);
     var textarea = type === 'textarea';
     var LeftIcon = leftSide;
     var RightIcon = rightSide;
-    var leftSideIsString = typeof leftSide === 'string';
-    var rightSideIsString = typeof rightSide === 'string';
+    var leftSideIsString = isString(leftSide);
+    var rightSideIsString = isString(rightSide);
     var iconSize = getByMap(sizeMap, size, iconSizeProp);
     var sortedSteps = useSortSteps({ step: step, min: Number(min), max: Number(max) });
-    var handleChange = function (e) {
-        var value = e.target.value;
-        !disabled && (onChange === null || onChange === void 0 ? void 0 : onChange({ e: e, id: id, name: name, value: value || null }));
-    };
+    var handleChange = useCallback(function (e) {
+        var _a;
+        !disabled && ((_a = onChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onChangeRef, { e: e, id: id, name: name, value: e.target.value || null }));
+    }, [id, name]);
     var handleBlur = function (e) {
-        setFocus(false);
+        setFocus.off();
         onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
     };
     var handleFocus = function (e) {
-        setFocus(true);
+        setFocus.on();
         onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
     };
     var commonProps = {
@@ -51,27 +67,19 @@ export function TextFieldRender(props, ref) {
         placeholder: placeholder,
         autoComplete: autoComplete,
         readOnly: readOnly,
-        required: required,
         tabIndex: tabIndex,
         name: name,
         'id': id ? id.toString() : '',
         'aria-label': ariaLabel
     };
-    useEffect(function () {
-        if (autoFocus) {
-            setTimeout(function () {
-                var _a;
-                (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-            });
-        }
-    }, []);
+    var Eye = passwordVisible ? IconEyeClose : IconEye;
     var onKeyDown = function (e) {
         var flag = getIncrementFlag(e);
         if (type === 'number' && typeof flag === 'boolean' && !disabled) {
             e.preventDefault();
             onChange === null || onChange === void 0 ? void 0 : onChange({
                 e: e,
-                value: getValueByStep(flag).toString()
+                value: getValueByStep(sortedSteps, value, flag, min, max)
             });
         }
     };
@@ -80,48 +88,44 @@ export function TextFieldRender(props, ref) {
         cols: cols,
         minRows: minRows || rows,
         maxRows: maxRows || rows,
-        inputRef: useForkRef([inputRef, inputRefProp])
+        ref: useForkRef([inputRef, inputRefProp])
     };
     var inputProps = {
-        type: type,
+        type: getTypeForRender(type, passwordVisible),
         max: max,
         min: min,
         step: !Array.isArray(sortedSteps) ? sortedSteps : 0,
         onKeyDown: onKeyDown,
         ref: useForkRef([inputRef, inputRefProp])
     };
-    var handleClear = function (e) {
-        onChange === null || onChange === void 0 ? void 0 : onChange({
+    var handleClear = useCallback(function (e) {
+        var _a;
+        (_a = onChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onChangeRef, {
             e: e,
-            value: ''
+            value: null
         });
-    };
-    var getValueByStep = function (isIncrement) {
-        var _a;
-        return Array.isArray(sortedSteps)
-            ? (_a = getValueByStepArray({
-                min: min,
-                max: max,
-                value: value,
-                isIncrement: isIncrement,
-                steps: sortedSteps
-            })) !== null && _a !== void 0 ? _a : 0 : getValueByStepNumber({ value: value, step: sortedSteps, isIncrement: isIncrement, min: min, max: max });
-    };
+    }, []);
     var changeNumberValue = function (e, isIncrement) {
         if (isIncrement === void 0) { isIncrement = true; }
         onChange === null || onChange === void 0 ? void 0 : onChange({
             e: e,
-            value: getValueByStep(isIncrement).toString()
+            value: getValueByStep(sortedSteps, value, isIncrement, min, max)
         });
     };
     var rootProps = {
-        // для того чтобы любые клики во внутренним элементам фокусили инпут
-        onClick: function (e) {
-            var _a;
+        onClick: useCallback(function (e) {
+            var _a, _b;
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-            onClick === null || onClick === void 0 ? void 0 : onClick(e);
-        }
+            (_b = onClickRef.current) === null || _b === void 0 ? void 0 : _b.call(onClickRef, e);
+        }, [])
     };
+    // при смене passwordVible, перемещаем курсор в конец строки
+    useEffect(function () {
+        var _a;
+        if (type === 'password' && inputRef.current) {
+            inputRef.current.selectionStart = ((_a = valueRef.current) === null || _a === void 0 ? void 0 : _a.length) || 0;
+        }
+    }, [passwordVisible]);
     return (React.createElement("div", __assign({ className: cnTextField({ labelPosition: labelPosition, size: size, view: view, width: width }, [className]), ref: useForkRef([ref, textFieldRef]) }, rootProps, otherProps),
         label && (React.createElement(FieldLabel, { required: required, className: cnTextField('Label', { labelPosition: labelPosition }), size: size }, label)),
         React.createElement("div", { className: cnTextField('Body') },
@@ -146,11 +150,13 @@ export function TextFieldRender(props, ref) {
                         React.createElement(IconSelect, { size: "xs" })))),
                 value && withClearButton && type !== 'number' && (React.createElement("button", { type: "button", disabled: disabled, onClick: handleClear, className: cnTextField('ClearButton') },
                     React.createElement(IconClose, { size: "xs", className: cnTextField('ClearButtonIcon') }))),
-                RightIcon && type !== 'number' && (React.createElement("div", { className: cnTextField('Side', {
+                type === 'password' && value && (React.createElement("button", { className: cnTextField('ClearButton'), type: "button", onClick: handleEyeClick },
+                    React.createElement(Eye, { className: cnTextField('Icon'), size: iconSize }))),
+                RightIcon && type !== 'number' && type !== 'password' && (React.createElement("div", { className: cnTextField('Side', {
                         position: 'right',
                         type: rightSideIsString ? 'string' : 'icon'
                     }), title: typeof rightSide === 'string' ? rightSide : undefined }, rightSideIsString ? (rightSide) : (React.createElement(RightIcon, { className: cnTextField('Icon'), size: iconSize }))))),
             caption && (React.createElement(FieldCaption, { className: cnTextField('Caption'), status: status || state }, caption)))));
 }
 export var TextField = forwardRef(TextFieldRender);
-export * from './helpers';
+export * from './types';