@ozen-ui/kit 0.18.0 → 0.20.0

package/__inner__/cjs/components/FieldIcon/FieldIcon.js

@@ -4,31 +4,12 @@ exports.FieldIcon = exports.cnFieldIcon = exports.FIELD_ICON_DEFAULT_TAG = void
 var tslib_1 = require("tslib");
 require("./FieldIcon.css");
 var react_1 = tslib_1.__importStar(require("react"));
-var react_is_1 = require("react-is");
 var classname_1 = require("../../utils/classname");
 var getIconSizeToFormElement_1 = require("../../utils/getIconSizeToFormElement");
+var renderContent_1 = require("../../utils/renderContent");
 var FieldControl_1 = require("../FieldControl");
 exports.FIELD_ICON_DEFAULT_TAG = 'div';
 exports.cnFieldIcon = (0, classname_1.cn)('FieldIcon');
-// TODO: взять за основу для всех рендер-функций
-var resolveChildren = function (content, size) {
-    if (typeof content === 'string') {
-        return content;
-    }
-    if ((0, react_is_1.isElement)(content)) {
-        return react_1.default.cloneElement(content, {
-            size: content.props.size || (size && (0, getIconSizeToFormElement_1.getIconSizeToFormElement)(size)),
-        });
-    }
-    if (typeof content === 'function' && !react_1.default.isValidElement(content)) {
-        return content({ size: size && (0, getIconSizeToFormElement_1.getIconSizeToFormElement)(size) });
-    }
-    if ((0, react_is_1.isValidElementType)(content)) {
-        var Content = content;
-        return react_1.default.createElement(Content, { size: size && (0, getIconSizeToFormElement_1.getIconSizeToFormElement)(size) });
-    }
-    return null;
-};
 exports.FieldIcon = (0, react_1.forwardRef)(function (_a, ref) {
     var icon = _a.icon, className = _a.className, sizeProp = _a.size, other = tslib_1.__rest(_a, ["icon", "className", "size"]);
     var context = (0, react_1.useContext)(FieldControl_1.FieldControlContext);
@@ -43,6 +24,9 @@ exports.FieldIcon = (0, react_1.forwardRef)(function (_a, ref) {
             size = fieldControl.size;
         }
     }
-    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, exports.cnFieldIcon)({ size: size }, [className]) }, other, { ref: ref }), resolveChildren(icon, size)));
+    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, exports.cnFieldIcon)({ size: size }, [className]) }, other, { ref: ref }), (0, renderContent_1.renderContent)({
+        content: icon,
+        props: { size: size && (0, getIconSizeToFormElement_1.getIconSizeToFormElement)(size) },
+    })));
 });
 exports.FieldIcon.displayName = 'FieldIcon';

package/__inner__/cjs/components/Grid/Grid.css

@@ -158,6 +158,24 @@
 .Grid_rowGap_8xl {
     grid-row-gap: var(--space-8xl);
   }
+.Grid_align_start {
+      align-items: start;
+    }
+.Grid_align_end {
+      align-items: end;
+    }
+.Grid_align_center {
+      align-items: center;
+    }
+.Grid_justify_start {
+      justify-items: start;
+    }
+.Grid_justify_end {
+      justify-items: end;
+    }
+.Grid_justify_center {
+      justify-items: center;
+    }
 @media (min-width: 0) {
       .Grid_gap_xs_0 {
     grid-gap: 0;

package/__inner__/cjs/components/Grid/Grid.d.ts

@@ -5,6 +5,10 @@ export declare const gridColsVariant: readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1
 export type GridColsVariant = (typeof gridColsVariant)[number];
 export declare const gridGapVariant: readonly ["0", "xs", "s", "m", "l", "xl", "2xl", "3xl", "4xl", "5xl", "6xl", "7xl", "8xl"];
 export type GridGapVariant = (typeof gridGapVariant)[number];
+export declare const gridAlignVariant: readonly ["start", "end", "center"];
+export declare const gridJustifyVariant: readonly ["start", "end", "center"];
+export type GridAlignVariant = (typeof gridAlignVariant)[number];
+export type GridJustifyVariant = (typeof gridJustifyVariant)[number];
 export declare const cnGrid: import("@bem-react/classname").ClassNameFormatter;
 export type GridProps = {
     /** Количество колонок в сетке */
@@ -15,6 +19,10 @@ export type GridProps = {
     colGap?: ResponsiveValue<GridGapVariant>;
     /** Отступы вокруг строки */
     rowGap?: ResponsiveValue<GridGapVariant>;
+    /** Выравнивание */
+    align?: GridAlignVariant;
+    /** Пространство между элементами */
+    justify?: GridJustifyVariant;
     /** Содержимое компонента */
     children?: ReactNode;
     /** Дополнительные СSS-классы */

package/__inner__/cjs/components/Grid/Grid.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Grid = exports.cnGrid = exports.gridGapVariant = exports.gridColsVariant = void 0;
+exports.Grid = exports.cnGrid = exports.gridJustifyVariant = exports.gridAlignVariant = exports.gridGapVariant = exports.gridColsVariant = void 0;
 var tslib_1 = require("tslib");
 require("./Grid.css");
 var react_1 = tslib_1.__importDefault(require("react"));
@@ -26,13 +26,22 @@ exports.gridGapVariant = [
     '7xl',
     '8xl',
 ];
+exports.gridAlignVariant = ['start', 'end', 'center'];
+exports.gridJustifyVariant = ['start', 'end', 'center'];
 exports.cnGrid = (0, classname_1.cn)('Grid');
 exports.Grid = (0, polymorphicComponentWithRef_1.polymorphicComponentWithRef)(function (inProps, ref) {
     var props = (0, useThemeProps_1.useThemeProps)({
         props: inProps,
         name: 'Grid',
     });
-    var _a = props.cols, cols = _a === void 0 ? constants_1.GRID_DEFAULT_COLS : _a, _b = props.gap, gap = _b === void 0 ? constants_1.GRID_DEFAULT_GAP : _b, _c = props.as, Tag = _c === void 0 ? constants_1.GRID_DEFAULT_TAG : _c, colGap = props.colGap, rowGap = props.rowGap, children = props.children, className = props.className, other = tslib_1.__rest(props, ["cols", "gap", "as", "colGap", "rowGap", "children", "className"]);
-    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, classnames_1.classnames)((0, exports.cnGrid)({}), (0, useGrid_1.useGenerateGridModsCn)(exports.cnGrid, { cols: cols, gap: gap, colGap: colGap, rowGap: rowGap }), className) }, other, { ref: ref }), children));
+    var _a = props.cols, cols = _a === void 0 ? constants_1.GRID_DEFAULT_COLS : _a, _b = props.gap, gap = _b === void 0 ? constants_1.GRID_DEFAULT_GAP : _b, _c = props.as, Tag = _c === void 0 ? constants_1.GRID_DEFAULT_TAG : _c, colGap = props.colGap, rowGap = props.rowGap, align = props.align, justify = props.justify, children = props.children, className = props.className, other = tslib_1.__rest(props, ["cols", "gap", "as", "colGap", "rowGap", "align", "justify", "children", "className"]);
+    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, classnames_1.classnames)((0, exports.cnGrid)({}), (0, useGrid_1.useGenerateGridModsCn)(exports.cnGrid, {
+            cols: cols,
+            gap: gap,
+            colGap: colGap,
+            rowGap: rowGap,
+            align: align,
+            justify: justify,
+        }), className) }, other, { ref: ref }), children));
 });
 exports.Grid.displayName = 'Grid';

package/__inner__/cjs/components/Modal/Modal.js

@@ -22,7 +22,6 @@ exports.Modal = (0, react_1.forwardRef)(function (_a, ref) {
     var hasBackdrop = !hideBackdrop;
     var modalInnerRef = (0, react_1.useRef)(null);
     var focusedElement = (0, react_1.useRef)(null);
-    var isClickOutSide = (0, react_1.useRef)(null);
     var _h = tslib_1.__read((0, react_1.useState)(false), 2), openState = _h[0], setOpenState = _h[1];
     var _j = tslib_1.__read((0, react_1.useState)(false), 2), opened = _j[0], setOpened = _j[1];
     var _k = (0, index_1.useModalManager)(modalInnerRef, 1000, openState), isTop = _k.isTop, refsClickOutside = _k.refsClickOutside;
@@ -31,7 +30,6 @@ exports.Modal = (0, react_1.forwardRef)(function (_a, ref) {
             modalInnerRef
         ], tslib_1.__read(refsClickOutside), false), tslib_1.__read((ignoreClickOutsideRefs || [])), false),
         handler: function () {
-            isClickOutSide.current = true;
             onClose === null || onClose === void 0 ? void 0 : onClose();
         },
         active: !disableClickOutside,
@@ -43,7 +41,6 @@ exports.Modal = (0, react_1.forwardRef)(function (_a, ref) {
         // Сохраняем фокус активного элемента до момента открытия всплывающего окна
         if (open) {
             setOpened(true);
-            isClickOutSide.current = null;
             focusedElement.current =
                 document.activeElement;
             (_a = focusedElement.current) === null || _a === void 0 ? void 0 : _a.blur();
@@ -57,10 +54,9 @@ exports.Modal = (0, react_1.forwardRef)(function (_a, ref) {
     var onExited = (0, react_1.useCallback)(function () {
         var _a, _b;
         // Возвращаем фокус активного элемента
-        if (!isClickOutSide.current &&
-            (((_a = modalInnerRef.current) === null || _a === void 0 ? void 0 : _a.contains(document.activeElement)) ||
-                document.activeElement === document.body)) {
-            (_b = focusedElement.current) === null || _b === void 0 ? void 0 : _b.focus();
+        if (((_a = modalInnerRef.current) === null || _a === void 0 ? void 0 : _a.contains(document.activeElement)) ||
+            document.activeElement === document.body) {
+            (_b = focusedElement.current) === null || _b === void 0 ? void 0 : _b.focus({ preventScroll: true });
         }
         setOpened(false);
         onExitedProp === null || onExitedProp === void 0 ? void 0 : onExitedProp();

package/__inner__/cjs/components/Popover/Popover.js

@@ -23,7 +23,6 @@ exports.cnPopover = (0, classname_1.cn)('Popover');
 exports.Popover = (0, polymorphicComponentWithRef_1.polymorphicComponentWithRef)(function (inProps, ref) {
     var props = (0, useThemeProps_1.useThemeProps)({ props: inProps, name: 'Popover' });
     var _a = props.arrow, arrow = _a === void 0 ? constants_1.POPOVER_DEFAULT_ARROW : _a, _b = props.open, open = _b === void 0 ? constants_1.POPOVER_DEFAULT_OPEN : _b, _c = props.disableInteractive, disableInteractive = _c === void 0 ? constants_1.POPOVER_DEFAULT_DISABLE_INTERACTIVE : _c, _d = props.disableEnforceFocus, disableEnforceFocus = _d === void 0 ? constants_1.POPOVER_DEFAULT_DISABLE_ENFORCE_FOCUS : _d, _e = props.disableReturnFocus, disableReturnFocus = _e === void 0 ? constants_1.POPOVER_DEFAULT_DISABLE_RETURN_FOCUS : _e, _f = props.disableClickOutside, disableClickOutside = _f === void 0 ? constants_1.POPOVER_DEFAULT_DISABLE_CLICK_OUTSIDE : _f, _g = props.placement, placement = _g === void 0 ? constants_1.POPOVER_DEFAULT_PLACEMENT : _g, ignoreClickOutsideRefs = props.ignoreClickOutsideRefs, arrowProps = props.arrowProps, anchorRef = props.anchorRef, equalAnchorWidth = props.equalAnchorWidth, offset = props.offset, children = props.children, transitionProps = props.transitionProps, onClose = props.onClose, onEnter = props.onEnter, onEntered = props.onEntered, onExit = props.onExit, onExitedProp = props.onExited, className = props.className, position = props.position, style = props.style, setUpdate = props.setUpdate, _h = props.as, as = _h === void 0 ? constants_1.POPOVER_DEFAULT_TAG : _h, other = tslib_1.__rest(props, ["arrow", "open", "disableInteractive", "disableEnforceFocus", "disableReturnFocus", "disableClickOutside", "placement", "ignoreClickOutsideRefs", "arrowProps", "anchorRef", "equalAnchorWidth", "offset", "children", "transitionProps", "onClose", "onEnter", "onEntered", "onExit", "onExited", "className", "position", "style", "setUpdate", "as"]);
-    var isClickOutSide = (0, react_1.useRef)(null);
     var _j = tslib_1.__read((0, react_1.useState)(false), 2), openState = _j[0], setOpenState = _j[1];
     var focusedElement = (0, react_1.useRef)(null);
     var popoverRef = (0, react_1.useRef)(null);
@@ -49,7 +48,6 @@ exports.Popover = (0, polymorphicComponentWithRef_1.polymorphicComponentWithRef)
             popoverRef
         ], tslib_1.__read(refsClickOutside), false), tslib_1.__read((anchorRef ? [anchorRef] : [])), false), tslib_1.__read((ignoreClickOutsideRefs || [])), false),
         handler: function () {
-            isClickOutSide.current = true;
             onClose === null || onClose === void 0 ? void 0 : onClose();
         },
         active: openState && !disableClickOutside,
@@ -58,10 +56,9 @@ exports.Popover = (0, polymorphicComponentWithRef_1.polymorphicComponentWithRef)
         var _a, _b;
         // Возвращаем фокус активного элемента
         if (!disableReturnFocus &&
-            !isClickOutSide.current &&
             (((_a = popoverRef.current) === null || _a === void 0 ? void 0 : _a.contains(document.activeElement)) ||
                 document.activeElement === document.body)) {
-            (_b = focusedElement.current) === null || _b === void 0 ? void 0 : _b.focus();
+            (_b = focusedElement.current) === null || _b === void 0 ? void 0 : _b.focus({ preventScroll: true });
         }
         onExitedProp === null || onExitedProp === void 0 ? void 0 : onExitedProp();
     }, [onExitedProp]);
@@ -136,7 +133,6 @@ exports.Popover = (0, polymorphicComponentWithRef_1.polymorphicComponentWithRef)
         var _a;
         // Сохраняем фокус активного элемента до момента открытия всплывающего окна
         if (open && !disableReturnFocus) {
-            isClickOutSide.current = null;
             focusedElement.current =
                 document.activeElement;
             (_a = focusedElement.current) === null || _a === void 0 ? void 0 : _a.blur();

package/__inner__/cjs/components/Table/components/TableRow/TableRow.css

@@ -1,7 +1,12 @@
-.TableRow_hover:hover {
+.TableRow {
+  transition: background-color var(--transition-slow);
+}
+
+  .TableRow_hover:hover {
     outline: none;
     background-color: var(--color-background-primary-hover);
   }
+
   .TableRow_hover:active,
   .TableRow_selected {
     outline: none;

package/__inner__/cjs/components/ThemeProvider/_color/Theme_color_bBusinessDefault.css

@@ -29,7 +29,7 @@
   --color-content-primary-inverse: #fff;
   --color-content-accent-main: #a0a0a0;
   --color-accent-main: #181818;
-  --color-content-accent-primary: #fff;
+  --color-content-accent-primary: #dcdcdc;
   --color-accent-primary: #282828;
   --color-content-accent-disabled: #606060;
   --color-background-main: #fff;
@@ -124,7 +124,7 @@
   --color-accent-tertiary-pressed: #686868;
   --color-accent-disabled: #484848;
   --color-accent-secondary-inverse: #808080;
-  --color-accent-main-inverse: #fff;
+  --color-accent-main-inverse: #dcdcdc;
   --color-additional-a1: #0b6abe;
   --color-additional-a2: #1899e9;
   --color-additional-a3: #b3f1ff;

package/__inner__/cjs/components/ThemeProvider/_color/Theme_color_ozenDark.css

@@ -30,7 +30,7 @@
   --color-background-main-inverse: #f5f5f5;
   --color-content-accent-main: #a0a0a0;
   --color-accent-main: #181818;
-  --color-content-accent-primary: #fff;
+  --color-content-accent-primary: #dcdcdc;
   --color-accent-primary: #282828;
   --color-content-accent-disabled: #606060;
   --color-background-main-hover: #2c2c2c;

package/__inner__/cjs/components/ThemeProvider/_color/Theme_color_ozenDefault.css

@@ -29,7 +29,7 @@
   --color-content-primary-inverse: #fff;
   --color-content-accent-main: #a0a0a0;
   --color-accent-main: #181818;
-  --color-content-accent-primary: #fff;
+  --color-content-accent-primary: #dcdcdc;
   --color-accent-primary: #282828;
   --color-content-accent-disabled: #606060;
   --color-background-main: #fff;

package/__inner__/cjs/components/ThemeProvider/types.d.ts

@@ -8,6 +8,7 @@ import type { CardProps } from '../Card';
 import type { CheckboxProps } from '../Checkbox';
 import type { CheckboxGroupProps } from '../CheckboxGroup';
 import type { ChipProps } from '../Chip';
+import type { ChipProps as ChiPropsNext } from '../ChipNext';
 import type { CollapseProps } from '../Collapse';
 import type { ContainerProps } from '../Container';
 import type { DataListProps } from '../DataList';
@@ -69,6 +70,7 @@ export type Theme = {
         Checkbox?: Partial<CheckboxProps>;
         CheckboxGroup?: Partial<CheckboxGroupProps>;
         Chip?: Partial<ChipProps>;
+        ChipNext?: Partial<ChiPropsNext>;
         Collapse?: Partial<CollapseProps>;
         Container?: Partial<ContainerProps>;
         DataList?: Partial<DataListProps>;

package/__inner__/cjs/utils/renderContent/index.d.ts

@@ -0,0 +1 @@
+export * from './renderContent';

package/__inner__/cjs/utils/renderContent/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./renderContent"), exports);

package/__inner__/cjs/utils/renderContent/renderContent.d.ts

@@ -0,0 +1,6 @@
+import type { FC, ReactElement, ReactNode } from 'react';
+export type RenderContentType<Props extends object> = {
+    content?: string | number | FC<Props> | ReactElement<Props> | (() => ReactElement<Props>);
+    props?: Props;
+};
+export declare function renderContent<Props extends object>({ content, props, }: RenderContentType<Props>): ReactNode;

package/__inner__/cjs/utils/renderContent/renderContent.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderContent = void 0;
+var tslib_1 = require("tslib");
+var react_1 = tslib_1.__importStar(require("react"));
+var react_is_1 = require("react-is");
+var mergeDeep_1 = require("../../utils/mergeDeep");
+function renderContent(_a) {
+    var content = _a.content, props = _a.props;
+    // primitives: string or number
+    if (typeof content === 'string' || typeof content === 'number') {
+        return content;
+    }
+    // react-element
+    if ((0, react_is_1.isElement)(content)) {
+        return (0, react_1.cloneElement)(content, (0, mergeDeep_1.mergeDeep)(props, content.props));
+    }
+    // render-function
+    if (typeof content === 'function' && !(0, react_1.isValidElement)(content)) {
+        return content(props);
+    }
+    // react-component
+    if ((0, react_is_1.isValidElementType)(content)) {
+        var Content = content;
+        return react_1.default.createElement(Content, tslib_1.__assign({}, props));
+    }
+    return null;
+}
+exports.renderContent = renderContent;

package/__inner__/esm/components/Avatar/Avatar.css

@@ -1,112 +1,115 @@
 .Avatar {
   --avatar-size: 100%;
+  --avatar-color: var(--color-content-action-on);
+  --avatar-bg-color: unset;
   display: flex;
   align-items: center;
   justify-content: center;
   flex-shrink: 0;
   inline-size: var(--avatar-size);
   block-size: var(--avatar-size);
+  color: var(--avatar-color);
+  background-color: var(--avatar-bg-color);
   font-family: Roboto, sans-serif;
   border-radius: 50%;
   position: relative;
   overflow: visible;
-  color: var(--color-content-action-on);
 }
 
   .Avatar_color_a1 {
-      background: var(--color-additional-a1);
+      --avatar-bg-color: var(--color-additional-a1);
     }
 
   .Avatar_color_a2 {
-      background: var(--color-additional-a2);
+      --avatar-bg-color: var(--color-additional-a2);
     }
 
   .Avatar_color_a3 {
-      background: var(--color-additional-a3);
+      --avatar-bg-color: var(--color-additional-a3);
     }
 
   .Avatar_color_b1 {
-      background: var(--color-additional-b1);
+      --avatar-bg-color: var(--color-additional-b1);
     }
 
   .Avatar_color_b2 {
-      background: var(--color-additional-b2);
+      --avatar-bg-color: var(--color-additional-b2);
     }
 
   .Avatar_color_b3 {
-      background: var(--color-additional-b3);
+      --avatar-bg-color: var(--color-additional-b3);
     }
 
   .Avatar_color_c1 {
-      background: var(--color-additional-c1);
+      --avatar-bg-color: var(--color-additional-c1);
     }
 
   .Avatar_color_c2 {
-      background: var(--color-additional-c2);
+      --avatar-bg-color: var(--color-additional-c2);
     }
 
   .Avatar_color_c3 {
-      background: var(--color-additional-c3);
+      --avatar-bg-color: var(--color-additional-c3);
     }
 
   .Avatar_color_d1 {
-      background: var(--color-additional-d1);
+      --avatar-bg-color: var(--color-additional-d1);
     }
 
   .Avatar_color_d2 {
-      background: var(--color-additional-d2);
+      --avatar-bg-color: var(--color-additional-d2);
     }
 
   .Avatar_color_d3 {
-      background: var(--color-additional-d3);
+      --avatar-bg-color: var(--color-additional-d3);
     }
 
   .Avatar_color_e1 {
-      background: var(--color-additional-e1);
+      --avatar-bg-color: var(--color-additional-e1);
     }
 
   .Avatar_color_e2 {
-      background: var(--color-additional-e2);
+      --avatar-bg-color: var(--color-additional-e2);
     }
 
   .Avatar_color_e3 {
-      background: var(--color-additional-e3);
+      --avatar-bg-color: var(--color-additional-e3);
     }
 
   .Avatar_color_f1 {
-      background: var(--color-additional-f1);
+      --avatar-bg-color: var(--color-additional-f1);
     }
 
   .Avatar_color_f2 {
-      background: var(--color-additional-f2);
+      --avatar-bg-color: var(--color-additional-f2);
     }
 
   .Avatar_color_f3 {
-      background: var(--color-additional-f3);
+      --avatar-bg-color: var(--color-additional-f3);
     }
 
   .Avatar_color_g1 {
-      background: var(--color-additional-g1);
+      --avatar-bg-color: var(--color-additional-g1);
     }
 
   .Avatar_color_g2 {
-      background: var(--color-additional-g2);
+      --avatar-bg-color: var(--color-additional-g2);
     }
 
   .Avatar_color_g3 {
-      background: var(--color-additional-g3);
+      --avatar-bg-color: var(--color-additional-g3);
     }
 
   .Avatar_color_h1 {
-      background: var(--color-additional-h1);
+      --avatar-bg-color: var(--color-additional-h1);
     }
 
   .Avatar_color_h2 {
-      background: var(--color-additional-h2);
+      --avatar-bg-color: var(--color-additional-h2);
     }
 
   .Avatar_color_h3 {
-      background: var(--color-additional-h3);
+      --avatar-bg-color: var(--color-additional-h3);
     }
 
   .Avatar-Image {

package/__inner__/esm/components/Avatar/Avatar.d.ts

@@ -1,6 +1,6 @@
 import './Avatar.css';
 import React from 'react';
-import type { ComponentPropsWithRef, ComponentRef } from 'react';
+import type { ComponentPropsWithRef, ComponentRef, ReactNode } from 'react';
 import type { IndicatorProps } from '../Indicator';
 export declare const avatarSizeVariant: readonly ["4xs", "3xs", "2xs", "xs", "s", "m", "l", "xl"];
 export declare const avatarHueVariant: number[];
@@ -16,14 +16,14 @@ export type AvatarProps = {
     /** Url изображения */
     src?: string;
     /** Имя пользователя */
-    name: string;
+    name?: string;
     /** Цветовой оттенок аватарки (при использовании без src) */
     hue?: AvatarHueVariant;
     /** Дополнительные СSS-классы */
     className?: string;
     /** Свойства компонента Indicator */
     indicatorProps?: IndicatorProps;
-    children?: never;
+    children?: ReactNode;
 } & ComponentPropsWithRef<typeof avatarEl>;
 export declare const cnAvatar: import("@bem-react/classname").ClassNameFormatter;
 export declare const Avatar: React.ForwardRefExoticComponent<Omit<AvatarProps, "ref"> & React.RefAttributes<HTMLDivElement>>;

package/__inner__/esm/components/Avatar/Avatar.js

@@ -7,6 +7,7 @@ import { cn } from '../../utils/classname';
 import { Indicator } from '../Indicator';
 import { AVATAR_DEFAULT_HUE, AVATAR_DEFAULT_ONLINE, AVATAR_DEFAULT_SIZE, } from './constants';
 import { getHashNumber } from './get-hash-number';
+import { matchSizeIndicatorToAvatar, getInitials } from './utils';
 export var avatarSizeVariant = [
     '4xs',
     '3xs',
@@ -20,38 +21,25 @@ export var avatarSizeVariant = [
 export var avatarHueVariant = [1, 2, 3];
 var avatarEl = 'div';
 export var cnAvatar = cn('Avatar');
-var getInitials = function (name) {
-    var _a, _b, _c;
-    var parts = name.split(' ');
-    var initials;
-    if (parts.length === 1) {
-        initials = ((_a = parts[0]) === null || _a === void 0 ? void 0 : _a.charAt(0)) || '';
-    }
-    else {
-        initials = ((_b = parts.shift()) !== null && _b !== void 0 ? _b : '').charAt(0) + ((_c = parts.pop()) !== null && _c !== void 0 ? _c : '').charAt(0);
-    }
-    return initials.toUpperCase();
-};
-var matchSizeIndicatorToAvatar = {
-    '4xs': 'xs',
-    '3xs': 'xs',
-    '2xs': 'xs',
-    xs: 's',
-    s: 's',
-    m: 's',
-    l: 'm',
-    xl: 'm',
-};
 export var Avatar = forwardRef(function (inProps, ref) {
     var props = useThemeProps({ props: inProps, name: 'Avatar' });
-    var _a = props.size, size = _a === void 0 ? AVATAR_DEFAULT_SIZE : _a, _b = props.online, online = _b === void 0 ? AVATAR_DEFAULT_ONLINE : _b, _c = props.hue, hue = _c === void 0 ? AVATAR_DEFAULT_HUE : _c, src = props.src, name = props.name, className = props.className, indicatorProps = props.indicatorProps, other = __rest(props, ["size", "online", "hue", "src", "name", "className", "indicatorProps"]);
+    var _a = props.size, size = _a === void 0 ? AVATAR_DEFAULT_SIZE : _a, _b = props.online, online = _b === void 0 ? AVATAR_DEFAULT_ONLINE : _b, _c = props.hue, hue = _c === void 0 ? AVATAR_DEFAULT_HUE : _c, src = props.src, nameProp = props.name, className = props.className, indicatorProps = props.indicatorProps, children = props.children, other = __rest(props, ["size", "online", "hue", "src", "name", "className", "indicatorProps", "children"]);
+    var name = nameProp || '';
     var _d = __read(useBoolean(!!src), 2), showImage = _d[0], off = _d[1].off;
     var indicatorSize = matchSizeIndicatorToAvatar[size];
     var colorShades = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
     var color = "".concat(colorShades[getHashNumber(name, colorShades.length)]).concat(hue);
-    var initials = getInitials(name);
+    var renderContent = function () {
+        if (children) {
+            return children;
+        }
+        if (src && showImage) {
+            return (React.createElement("img", { src: src, alt: name, className: cnAvatar('Image'), onError: off }));
+        }
+        return getInitials(name);
+    };
     return (React.createElement("div", __assign({ className: cnAvatar({ size: size, color: !showImage && color }, [className]) }, other, { ref: ref }),
-        src && showImage ? (React.createElement("img", { src: src, alt: name, className: cnAvatar('Image'), onError: off })) : (initials),
-        online && (React.createElement(Indicator, __assign({ variant: "success", size: indicatorSize, className: cnAvatar('Online'), border: true }, indicatorProps)))));
+        renderContent(),
+        online && (React.createElement(Indicator, __assign({ variant: "success", size: indicatorSize, border: true }, indicatorProps, { className: cnAvatar('Online', indicatorProps === null || indicatorProps === void 0 ? void 0 : indicatorProps.className) })))));
 });
 Avatar.displayName = 'Avatar';

package/__inner__/esm/components/Avatar/utils.d.ts

@@ -0,0 +1,6 @@
+import type { IndicatorSizeVariant } from '../Indicator';
+import type { AvatarSizeVariant } from './index';
+export declare const getInitials: (name: string) => string;
+export declare const matchSizeIndicatorToAvatar: {
+    [key in AvatarSizeVariant]: IndicatorSizeVariant;
+};

package/__inner__/esm/components/Avatar/utils.js

@@ -0,0 +1,22 @@
+export var getInitials = function (name) {
+    var _a, _b, _c;
+    var parts = name.split(' ');
+    var initials;
+    if (parts.length === 1) {
+        initials = ((_a = parts[0]) === null || _a === void 0 ? void 0 : _a.charAt(0)) || '';
+    }
+    else {
+        initials = ((_b = parts.shift()) !== null && _b !== void 0 ? _b : '').charAt(0) + ((_c = parts.pop()) !== null && _c !== void 0 ? _c : '').charAt(0);
+    }
+    return initials.toUpperCase();
+};
+export var matchSizeIndicatorToAvatar = {
+    '4xs': 'xs',
+    '3xs': 'xs',
+    '2xs': 'xs',
+    xs: 's',
+    s: 's',
+    m: 's',
+    l: 'm',
+    xl: 'm',
+};

package/__inner__/esm/components/Button/Button.d.ts

@@ -1,17 +1,17 @@
 import './Button.css';
-import React from 'react';
 import type { ReactNode, ElementType } from 'react';
 import type { IconProps, IconSize } from '@ozen-ui/icons';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
 import type { PolymorphicComponentPropsWithoutRef } from '../../utils/polymorphicComponentWithRef';
+import type { RenderContentType } from '../../utils/renderContent';
 import { BUTTON_DEFAULT_TAG } from './constants';
 export declare const buttonVariant: readonly ["contained", "outlined", "ghost", "function"];
 export declare const buttonColorVariant: readonly ["primary", "secondary", "warning", "error"];
 export type ButtonVariant = (typeof buttonVariant)[number];
 export type ButtonColorVariant = (typeof buttonColorVariant)[number];
-export type ButtonIconComponent = React.FC<IconProps & {
+export type ButtonIcon = RenderContentType<IconProps & {
     size?: IconSize;
-}>;
+}>['content'];
 type ButtonBaseProps = {
     /**
      * Вариант отображения кнопки
@@ -37,9 +37,9 @@ type ButtonBaseProps = {
     /** Дополнительные CSS-классы */
     className?: string;
     /** Иконка слева */
-    iconLeft?: ButtonIconComponent;
+    iconLeft?: ButtonIcon;
     /** Иконка справа */
-    iconRight?: ButtonIconComponent;
+    iconRight?: ButtonIcon;
     /** Если {true} растягивает кнопку на всю ширину родительского контейнера */
     fullWidth?: boolean;
 };