@redneckz/wildless-cms-uni-blocks 0.3.32 → 0.3.33

package/mobile/lib/model/SitemapProps.d.ts

@@ -1,5 +1,5 @@
 import type { LinkProps } from './LinkProps';
-import { IconName } from '../icons/IconName';
+import type { Picture } from './Picture';
 /**
  * @title Меню
  * @required ["text", "href"]
@@ -14,7 +14,7 @@ export interface TopMenuItem extends LinkProps {
  */
 export interface DispositionItem extends LinkProps {
     /** @hidden */
-    icon?: IconName;
+    icon?: Picture;
 }
 export interface SitemapProps {
     /** @title Дополнительное меню */

package/mobile/lib/services/sitemap/SitemapProps.d.ts

@@ -1,5 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
-import { IconName } from '../../icons/IconName';
+import type { Picture } from '../../model/Picture';
 /**
  * @title Ссылка
  * @required ["text", "href"]
@@ -14,7 +14,7 @@ export interface TopMenuItem extends LinkProps {
  */
 export interface DispositionItem extends LinkProps {
     /** @hidden */
-    icon?: IconName;
+    icon?: Picture;
 }
 export interface SitemapProps {
     /** @title Основное меню */

package/mobile/lib/ui-kit/Button/ButtonInner.js

@@ -2,14 +2,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 export const ButtonInner = JSX((props) => {
     const { text, aboveText, appendLeft } = props;
-    return (_jsxs("div", { className: getButtonStyle(props), children: [appendLeft ? appendLeft : null, isWithText(props) ? (_jsxs("div", { children: [_jsx("div", { className: "text-m-2xs font-light text-left", children: aboveText }), _jsx("div", { className: "text-m-button text-left", children: text })] })) : null] }));
+    return (_jsxs("div", { className: getButtonStyle(props), children: [appendLeft ? appendLeft : null, isWithText(props) ? (_jsxs("div", { children: [_jsx("div", { className: "text-m-2xs font-light text-left", children: aboveText }), _jsx("div", { className: "text-base text-left", children: text })] })) : null] }));
 });
 const getButtonStyle = (props) => {
     const { version, aboveText, rounded } = props;
     if (version === 'link') {
         return '';
     }
-    const withTextStyle = `px-8 gap-2 ${aboveText ? 'py-2' : 'py-3.5'}`;
+    const withTextStyle = `px-8 gap-2 ${aboveText ? 'py-2' : 'py-4'}`;
     return [
         'flex items-center justify-center',
         isWithText(props) ? withTextStyle : 'h-12 w-12',

package/mobile/lib/ui-kit/Button/ButtonInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonInner.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,KAAK,EAAE,EAAE;IACzD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC9C,OAAO,CACL,eAAK,SAAS,EAAE,cAAc,CAAC,KAAK,CAAC,aAClC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAC9B,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,0BACE,cAAK,SAAS,EAAC,iCAAiC,YAAE,SAAS,GAAO,EAClE,cAAK,SAAS,EAAC,yBAAyB,YAAE,IAAI,GAAO,IACjD,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAE,EAAE;IACjD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE9C,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAG,cAAc,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEpE,OAAO;QACL,kCAAkC;QAClC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;QAC/C,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;KAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAoB,EAAE,EAAE,CACvE,OAAO,CAAC,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"ButtonInner.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,KAAK,EAAE,EAAE;IACzD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC9C,OAAO,CACL,eAAK,SAAS,EAAE,cAAc,CAAC,KAAK,CAAC,aAClC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAC9B,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,0BACE,cAAK,SAAS,EAAC,iCAAiC,YAAE,SAAS,GAAO,EAClE,cAAK,SAAS,EAAC,qBAAqB,YAAE,IAAI,GAAO,IAC7C,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAE,EAAE;IACjD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE9C,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAG,cAAc,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAElE,OAAO;QACL,kCAAkC;QAClC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;QAC/C,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;KAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAoB,EAAE,EAAE,CACvE,OAAO,CAAC,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC"}

package/mobile/lib/ui-kit/Button/ButtonProps.d.ts

@@ -1,6 +1,6 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { LinkProps } from '../../model/LinkProps';
-import type { IconName } from '../Icon/IconProps';
+import type { Picture } from '../../model/Picture';
 /**
  * @hidden
  */
@@ -21,7 +21,7 @@ export interface ButtonProps extends ButtonAdditionalProps, LinkProps {
 }
 export interface ButtonWithIconProps extends ButtonProps {
     /** @title Иконка */
-    icon?: IconName;
+    icon?: Picture;
     /** @title Верхний текст */
     aboveText?: string;
     /** @hidden */

package/mobile/lib/ui-kit/Button/ButtonSection.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink.js';
-import { Icon } from '../Icon/Icon.js';
+import { Img } from '../Img/Img.js';
 import { Button } from './Button.js';
 export const ButtonSection = JSX(({ context, className = '', buttons }) => {
     const { handlerDecorator } = context;
@@ -11,6 +11,6 @@ export const ButtonSection = JSX(({ context, className = '', buttons }) => {
 function renderButton({ icon, ...button }, i) {
     if (!button?.text)
         return;
-    return icon ? (_jsx(Button, { appendLeft: _jsx(Icon, { name: icon, width: "24", height: "24", asSVG: true }), ...button }, String(i))) : (_jsx(Button, { ...button }, String(i)));
+    return icon ? (_jsx(Button, { appendLeft: _jsx(Img, { image: icon, width: "24", height: "24", asSVG: true }), ...button }, String(i))) : (_jsx(Button, { ...button }, String(i)));
 }
 //# sourceMappingURL=ButtonSection.js.map

package/mobile/lib/ui-kit/Button/ButtonSection.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonSection.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonSection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAqB,CAAC,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5F,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IACnC,OAAO,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CACvB,cAAK,SAAS,EAAE,GAAG,SAAS,EAAE,YAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAC7B,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CACnE,GACG,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,SAAS,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,EAAuB,EAAE,CAAS;IACvE,IAAI,CAAC,MAAM,EAAE,IAAI;QAAE,OAAO;IAE1B,OAAO,IAAI,CAAC,CAAC,CAAC,CACZ,KAAC,MAAM,IAEL,UAAU,EAAE,KAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,KAAK,SAAG,KACzD,MAAM,IAFL,MAAM,CAAC,CAAC,CAAC,CAGd,CACH,CAAC,CAAC,CAAC,CACF,KAAC,MAAM,OAAqB,MAAM,IAArB,MAAM,CAAC,CAAC,CAAC,CAAgB,CACvC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ButtonSection.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonSection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAqB,CAAC,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5F,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IACnC,OAAO,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CACvB,cAAK,SAAS,EAAE,GAAG,SAAS,EAAE,YAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAC7B,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CACnE,GACG,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,SAAS,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,EAAuB,EAAE,CAAS;IACvE,IAAI,CAAC,MAAM,EAAE,IAAI;QAAE,OAAO;IAE1B,OAAO,IAAI,CAAC,CAAC,CAAC,CACZ,KAAC,MAAM,IAEL,UAAU,EAAE,KAAC,GAAG,IAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,KAAK,SAAG,KACzD,MAAM,IAFL,MAAM,CAAC,CAAC,CAAC,CAGd,CACH,CAAC,CAAC,CAAC,CACF,KAAC,MAAM,OAAqB,MAAM,IAArB,MAAM,CAAC,CAAC,CAAC,CAAgB,CACvC,CAAC;AACJ,CAAC"}

package/mobile/lib/ui-kit/Icon/Icon.js

@@ -7,7 +7,7 @@ const svgColorsMap = {
     primary: 'text-primary-main',
     secondary: 'text-primary-text',
 };
-export const Icon = JSX(({ className = '', name, alt = `Иконка ${IconTitleMap[name] || name}`, title = alt, asSVG, color = 'primary', ...imgProps }) => {
+export const Icon = JSX(({ className = '', name = '', alt = `Иконка ${IconTitleMap[name] || name}`, title = alt, asSVG, color = 'primary', ...imgProps }) => {
     const href = `${projectSettings.CDN || ''}icons/${name}.svg`;
     if (asSVG) {
         return (_jsxs("svg", { className: `${svgColorsMap[color]} ${className}`, ...imgProps, "aria-hidden": "true", style: color === 'secondary' ? { filter: 'invert(1)' } : null, children: [title ? _jsx("title", { children: title }) : null, alt ? _jsx("desc", { children: alt }) : null, _jsx("use", { href: `${href}#icon`, xlinkHref: `${href}#icon` })] }));

package/mobile/lib/ui-kit/Icon/Icon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../src/ui-kit/Icon/Icon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,YAAY,GAA8B;IAC9C,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,mBAAmB;IAC5B,SAAS,EAAE,mBAAmB;CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CACrB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,GAAG,GAAG,UAAU,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAC5C,KAAK,GAAG,GAAG,EACX,KAAK,EACL,KAAK,GAAG,SAAS,EACjB,GAAG,QAAQ,EACZ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,eAAe,CAAC,GAAG,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC;IAE7D,IAAI,KAAK,EAAE;QACT,OAAO,CACL,eACE,SAAS,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,SAAS,EAAE,KAC5C,QAAQ,iBACA,MAAM,EAClB,KAAK,EAAE,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,aAE5D,KAAK,CAAC,CAAC,CAAC,0BAAQ,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EACrC,GAAG,CAAC,CAAC,CAAC,yBAAO,GAAG,GAAQ,CAAC,CAAC,CAAC,IAAI,EAChC,cAAK,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,OAAO,GAAI,IACpD,CACP,CAAC;KACH;IAED,OAAO,CACL,cACE,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,KACR,QAAQ,iBACA,MAAM,GAClB,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../src/ui-kit/Icon/Icon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,YAAY,GAA8B;IAC9C,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,mBAAmB;IAC5B,SAAS,EAAE,mBAAmB;CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CACrB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,EAAE,EACT,GAAG,GAAG,UAAU,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAC5C,KAAK,GAAG,GAAG,EACX,KAAK,EACL,KAAK,GAAG,SAAS,EACjB,GAAG,QAAQ,EACZ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,eAAe,CAAC,GAAG,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC;IAE7D,IAAI,KAAK,EAAE;QACT,OAAO,CACL,eACE,SAAS,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,SAAS,EAAE,KAC5C,QAAQ,iBACA,MAAM,EAClB,KAAK,EAAE,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,aAE5D,KAAK,CAAC,CAAC,CAAC,0BAAQ,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EACrC,GAAG,CAAC,CAAC,CAAC,yBAAO,GAAG,GAAQ,CAAC,CAAC,CAAC,IAAI,EAChC,cAAK,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,OAAO,GAAI,IACpD,CACP,CAAC;KACH;IAED,OAAO,CACL,cACE,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,KACR,QAAQ,iBACA,MAAM,GAClB,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/ui-kit/Icon/IconProps.d.ts

@@ -5,13 +5,21 @@ export type { IconName };
  * @enumNames ["Нет", "Основной", "Второстепенный"]
  */
 export declare type IconColor = 'none' | 'primary' | 'secondary';
-export interface IconProps {
-    className?: string;
-    name: IconName;
+export interface IconCompatibilityFields {
+    /** @title Альтернативный текст (alt) */
     alt?: string;
+    /** @title Текст подсказки (title) */
     title?: string;
+    /** @title Ширина */
     width?: string;
+    /** @title Высота */
     height?: string;
+    /** @hidden */
     asSVG?: boolean;
+    /** @hidden */
     color?: IconColor;
 }
+export declare type IconProps = IconCompatibilityFields & {
+    className?: string;
+    name?: IconName;
+};

package/mobile/lib/ui-kit/Img/Img.d.ts

@@ -1,8 +1,5 @@
-import type { Picture, ImgSource } from '../../model/Picture';
-export interface ImageProps {
-    className?: string;
-    imageClassName?: string;
-    image: Picture;
-}
-export declare const Img: (props: import("@redneckz/uni-jsx").PropsWithChildren<ImageProps, any>, context?: any) => any;
+import type { ImgSource, Picture } from '../../model/Picture';
+import type { Image, ImageProps } from './ImgProps';
+export declare const Img: (props: import("@redneckz/uni-jsx").PropsWithChildren<ImageProps<Image>, any>, context?: any) => any;
+export declare const ImgAsPicture: (props: import("@redneckz/uni-jsx").PropsWithChildren<ImageProps<Picture>, any>, context?: any) => any;
 export declare function formatToMimeType(format: ImgSource['format']): string | undefined;

package/mobile/lib/ui-kit/Img/Img.js

@@ -1,10 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export const Img = JSX(({ className = '', image, imageClassName }) => {
+import { Icon } from '../Icon/Icon.js';
+export const Img = JSX(({ className = '', image, imageClassName = '', ...iconProps }) => {
+    // backwards compatibility with existing icons in usage
+    const icon = typeof image === 'string' ? image : image?.icon;
+    if (icon || icon === '') {
+        return _jsx(Icon, { className: className, name: icon, ...iconProps });
+    }
+    return (_jsx(ImgAsPicture, { className: className, imageClassName: imageClassName, image: image }));
+});
+export const ImgAsPicture = JSX(({ className = '', image, imageClassName = '' }) => {
     if (!image) {
         return null;
     }
-    return (_jsxs("picture", { className: className, children: [image.sources?.length
+    return (_jsxs("picture", { className: className, children: [image?.sources?.length
                 ? image.sources.map(({ src, format }, index) => (_jsx("source", { srcSet: src, type: formatToMimeType(format) }, `${index}_${src}`)))
                 : null, renderImg(image, imageClassName)] }));
 });

package/mobile/lib/ui-kit/Img/Img.js.map

@@ -1 +1 @@
-{"version":3,"file":"Img.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/Img.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AASxC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CAAa,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE;IAC/E,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,mBAAS,SAAS,EAAE,SAAS,aAC1B,KAAK,CAAC,OAAO,EAAE,MAAM;gBACpB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAC5C,iBAAgC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAA9D,GAAG,KAAK,IAAI,GAAG,EAAE,CAAiD,CAChF,CAAC;gBACJ,CAAC,CAAC,IAAI,EACP,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,IACzB,CACX,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE;IAC/C,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM;QAC5D,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM;KAChE,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;IAChC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC;IAErC,OAAO,CACL,cACE,GAAG,EAAE,KAAK,CAAC,GAAG,EACd,SAAS,EAAE,UAAU,cAAc,EAAE,EACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,KACR,KAAK,CAAC,IAAI,GACd,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,MAA2B;IAC1D,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC"}
+{"version":3,"file":"Img.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/Img.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CACpB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE;IAC/D,uDAAuD;IACvD,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;IAC7D,IAAI,IAAI,IAAI,IAAI,KAAK,EAAE,EAAE;QACvB,OAAO,KAAC,IAAI,IAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,KAAM,SAAS,GAAI,CAAC;KAClE;IAED,OAAO,CACL,KAAC,YAAY,IACX,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAgB,GACvB,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAE;IACjD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,mBAAS,SAAS,EAAE,SAAS,aAC1B,KAAK,EAAE,OAAO,EAAE,MAAM;gBACrB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAC5C,iBAAgC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAA9D,GAAG,KAAK,IAAI,GAAG,EAAE,CAAiD,CAChF,CAAC;gBACJ,CAAC,CAAC,IAAI,EACP,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,IACzB,CACX,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,KAAc,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE;IACxD,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM;QAC5D,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM;KAChE,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;IAChC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC;IAErC,OAAO,CACL,cACE,GAAG,EAAE,KAAK,CAAC,GAAG,EACd,SAAS,EAAE,UAAU,cAAc,EAAE,EACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,KACR,KAAK,CAAC,IAAI,GACd,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,MAA2B;IAC1D,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC"}

package/mobile/lib/ui-kit/Img/ImgProps.d.ts

@@ -1,7 +1,10 @@
 import type { Picture } from '../../model/Picture';
-export interface ImageContent {
-    image?: Picture;
+import type { IconCompatibilityFields, IconName } from '../Icon/IconProps';
+export declare type Image = Picture | IconName;
+export interface ImageContent<T = Picture> {
+    image?: T;
 }
-export interface ImageProps extends ImageContent {
+export interface ImageProps<T> extends ImageContent<T>, IconCompatibilityFields {
     className?: string;
+    imageClassName?: string;
 }

package/mobile/lib/ui-kit/List/ListItem.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3 mt-2';
+const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3';
 const LIST_DOT_STYLE_MAP = {
     primary: 'bg-primary-main',
     secondary: 'bg-white',
     gray: 'bg-secondary-text',
 };
 export const ListItem = JSX(({ className = '', isDotted = true, children, version = 'primary' }) => {
-    return (_jsxs("div", { className: `font-sans flex items-start ${className}`, role: "listitem", children: [isDotted && _jsx("div", { className: getListStyle(version) }), _jsx("span", { children: children })] }));
+    return (_jsxs("div", { className: `font-sans flex items-center ${className}`, role: "listitem", children: [isDotted && _jsx("div", { className: getListStyle(version) }), _jsx("span", { children: children })] }));
 });
 const getListStyle = (version) => {
     const size = version === 'gray' ? 'w-1.5 h-1.5 min-w-1.5 min-h-1.5' : 'w-2 h-2 min-w-2 min-h-2';

package/mobile/lib/ui-kit/List/ListItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListItem.js","sourceRoot":"","sources":["../../../src/ui-kit/List/ListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAaxC,MAAM,kBAAkB,GAAG,qCAAqC,CAAC;AAEjE,MAAM,kBAAkB,GAAoC;IAC1D,OAAO,EAAE,iBAAiB;IAC1B,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,mBAAmB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,EAAE,EAAE,EAAE;IACrE,OAAO,CACL,eAAK,SAAS,EAAE,8BAA8B,SAAS,EAAE,EAAE,IAAI,EAAC,UAAU,aACvE,QAAQ,IAAI,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,GAAI,EACtD,yBAAO,QAAQ,GAAQ,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,yBAAyB,CAAC;IAChG,OAAO,GAAG,kBAAkB,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;AACxE,CAAC,CAAC"}
+{"version":3,"file":"ListItem.js","sourceRoot":"","sources":["../../../src/ui-kit/List/ListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAaxC,MAAM,kBAAkB,GAAG,gCAAgC,CAAC;AAE5D,MAAM,kBAAkB,GAAoC;IAC1D,OAAO,EAAE,iBAAiB;IAC1B,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,mBAAmB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,EAAE,EAAE,EAAE;IACrE,OAAO,CACL,eAAK,SAAS,EAAE,+BAA+B,SAAS,EAAE,EAAE,IAAI,EAAC,UAAU,aACxE,QAAQ,IAAI,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,GAAI,EACtD,yBAAO,QAAQ,GAAQ,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,yBAAyB,CAAC;IAChG,OAAO,GAAG,kBAAkB,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;AACxE,CAAC,CAAC"}

package/mobile/lib/ui-kit/SearchBar/SearchBar.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { Icon } from '../Icon/Icon.js';
+import { Img } from '../Img/Img.js';
 export const SearchBar = JSX(({ className, context }) => {
     const { term, setTerm } = context.useSearch();
-    return (_jsxs("form", { className: `relative ${className || ''}`, children: [_jsxs("div", { className: "absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none", children: [_jsx("div", { className: "w-[20px] h-[20px]", children: _jsx(Icon, { name: "LoupeIcon", width: "24", height: "24" }) }), !term && (_jsx("label", { htmlFor: "search-bar-input", className: "font-sans font-normal text-sm text-secondary-text", children: "\u041F\u043E\u0438\u0441\u043A \u043F\u043E \u0441\u0430\u0439\u0442\u0443" }))] }), _jsx("input", { id: "search-bar-input", className: 'h-12 pl-12 w-full peer placeholder-transparent font-sans font-normal text-base text-black border border-solid rounded box-border outline-none pr-[6%] border-main-divider focus:border-primary-text', value: term, onChange: (e) => setTerm(e.target.value), type: "text", name: "search-bar-input", placeholder: "some search" }), _jsx("button", { className: "visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none", onClick: (e) => {
+    return (_jsxs("form", { className: `relative ${className || ''}`, children: [_jsxs("div", { className: "absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none", children: [_jsx("div", { className: "w-[20px] h-[20px]", children: _jsx(Img, { image: "LoupeIcon", width: "24", height: "24" }) }), !term && (_jsx("label", { htmlFor: "search-bar-input", className: "font-sans font-normal text-sm text-secondary-text", children: "\u041F\u043E\u0438\u0441\u043A \u043F\u043E \u0441\u0430\u0439\u0442\u0443" }))] }), _jsx("input", { id: "search-bar-input", className: 'h-12 pl-12 w-full peer placeholder-transparent font-sans font-normal text-base text-black border border-solid rounded box-border outline-none pr-[6%] border-main-divider focus:border-primary-text', value: term, onChange: (e) => setTerm(e.target.value), type: "text", name: "search-bar-input", placeholder: "some search" }), _jsx("button", { className: "visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none", onClick: (e) => {
                     e.preventDefault();
                     setTerm('');
-                }, children: _jsx(Icon, { name: "CloseIcon", width: "24", height: "24" }) })] }));
+                }, children: _jsx(Img, { image: "CloseIcon", width: "24", height: "24" }) })] }));
 });
 //# sourceMappingURL=SearchBar.js.map

package/mobile/lib/ui-kit/SearchBar/SearchBar.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAgB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IACrE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAC9C,OAAO,CACL,gBAAM,SAAS,EAAE,YAAY,SAAS,IAAI,EAAE,EAAE,aAC5C,eAAK,SAAS,EAAC,yGAAyG,aACtH,cAAK,SAAS,EAAC,mBAAmB,YAChC,KAAC,IAAI,IAAC,IAAI,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GAC5C,EACL,CAAC,IAAI,IAAI,CACR,gBACE,OAAO,EAAC,kBAAkB,EAC1B,SAAS,EAAC,mDAAmD,2FAGvD,CACT,IACG,EACN,gBACE,EAAE,EAAC,kBAAkB,EACrB,SAAS,EACP,qMAAqM,EAEvM,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACxC,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,kBAAkB,EACvB,WAAW,EAAC,aAAa,GACzB,EACF,iBACE,SAAS,EAAC,uHAAuH,EACjI,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC,YAED,KAAC,IAAI,IAAC,IAAI,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GACzC,IACJ,CACR,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAgB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IACrE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAC9C,OAAO,CACL,gBAAM,SAAS,EAAE,YAAY,SAAS,IAAI,EAAE,EAAE,aAC5C,eAAK,SAAS,EAAC,yGAAyG,aACtH,cAAK,SAAS,EAAC,mBAAmB,YAChC,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GAC5C,EACL,CAAC,IAAI,IAAI,CACR,gBACE,OAAO,EAAC,kBAAkB,EAC1B,SAAS,EAAC,mDAAmD,2FAGvD,CACT,IACG,EACN,gBACE,EAAE,EAAC,kBAAkB,EACrB,SAAS,EACP,qMAAqM,EAEvM,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACxC,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,kBAAkB,EACvB,WAAW,EAAC,aAAa,GACzB,EACF,iBACE,SAAS,EAAC,uHAAuH,EACjI,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC,YAED,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GACzC,IACJ,CACR,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/Tabs/Tabs.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { Icon } from '../../ui-kit/Icon/Icon.js';
+import { Img } from '../Img/Img.js';
 const TAB_STYLE = 'px-2 h-14 pb-2 pt-3 border border-b-0 border-main-stroke';
 const ACTIVE_TAB_STYLE = 'px-2 h-16 pt-4 pb-2 text-white bg-primary-main';
 export const Tabs = JSX(({ tabs, currentTabIndex, onTabClick }) => {
@@ -10,5 +10,5 @@ const renderTab = (currentTabIndex, onTabClick) => (tab, index) => {
     const isActive = currentTabIndex === index;
     return (_jsxs("div", { className: `flex h-full flex-1 cursor-pointer mr-2 last:mr-0 box-content ${isActive ? ACTIVE_TAB_STYLE : TAB_STYLE}`, role: "tab", onClick: () => onTabClick(index), "aria-selected": String(isActive), children: [tab?.icon ? renderIcon(tab, isActive) : null, _jsxs("div", { children: [tab?.title ? _jsx("h3", { className: "font-medium m-0 text-base", children: tab?.title }) : null, tab?.description ? (_jsx("span", { className: `font-light text-xs ${isActive ? '' : 'text-secondary-text'}`, children: tab?.description })) : null] })] }, String(index)));
 };
-const renderIcon = (tab, isActive) => (_jsx("div", { className: "h-full mt-1", style: isActive ? { filter: 'invert(1)' } : null, children: _jsx(Icon, { className: "w-5 h-5 mr-3", name: tab?.icon || 'CardIcon', asSVG: !isActive }) }));
+const renderIcon = (tab, isActive) => (_jsx("div", { className: "h-full mt-1", style: isActive ? { filter: 'invert(1)' } : null, children: _jsx(Img, { className: "w-5 h-5 mr-3", image: tab?.icon || 'CardIcon', asSVG: !isActive }) }));
 //# sourceMappingURL=Tabs.js.map

package/mobile/lib/ui-kit/Tabs/Tabs.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/ui-kit/Tabs/Tabs.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,MAAM,SAAS,GAAG,0DAA0D,CAAC;AAC7E,MAAM,gBAAgB,GAAG,gDAAgD,CAAC;AAE1E,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAY,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3E,OAAO,CACL,cAAK,SAAS,EAAC,4CAA4C,EAAC,IAAI,EAAC,SAAS,YACvE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,GAC9C,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GACb,CAAC,eAAuB,EAAE,UAA2B,EAAE,EAAE,CAAC,CAAC,GAAQ,EAAE,KAAa,EAAE,EAAE;IACpF,MAAM,QAAQ,GAAG,eAAe,KAAK,KAAK,CAAC;IAC3C,OAAO,CACL,eAEE,SAAS,EAAE,gEACT,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAChC,EAAE,EACF,IAAI,EAAC,KAAK,EACV,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,mBACjB,MAAM,CAAC,QAAQ,CAAC,aAE9B,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAC7C,0BACG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,aAAI,SAAS,EAAC,2BAA2B,YAAE,GAAG,EAAE,KAAK,GAAM,CAAC,CAAC,CAAC,IAAI,EAC/E,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,CAClB,eAAM,SAAS,EAAE,sBAAsB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,EAAE,YAC3E,GAAG,EAAE,WAAW,GACZ,CACR,CAAC,CAAC,CAAC,IAAI,IACJ,KAhBD,MAAM,CAAC,KAAK,CAAC,CAiBd,CACP,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,QAAiB,EAAE,EAAE,CAAC,CAClD,cAAK,SAAS,EAAC,aAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,YAC3E,KAAC,IAAI,IAAC,SAAS,EAAC,cAAc,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,UAAU,EAAE,KAAK,EAAE,CAAC,QAAQ,GAAI,GAC9E,CACP,CAAC"}
+{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/ui-kit/Tabs/Tabs.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGjC,MAAM,SAAS,GAAG,0DAA0D,CAAC;AAC7E,MAAM,gBAAgB,GAAG,gDAAgD,CAAC;AAE1E,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAY,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3E,OAAO,CACL,cAAK,SAAS,EAAC,4CAA4C,EAAC,IAAI,EAAC,SAAS,YACvE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,GAC9C,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GACb,CAAC,eAAuB,EAAE,UAA2B,EAAE,EAAE,CAAC,CAAC,GAAQ,EAAE,KAAa,EAAE,EAAE;IACpF,MAAM,QAAQ,GAAG,eAAe,KAAK,KAAK,CAAC;IAC3C,OAAO,CACL,eAEE,SAAS,EAAE,gEACT,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAChC,EAAE,EACF,IAAI,EAAC,KAAK,EACV,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,mBACjB,MAAM,CAAC,QAAQ,CAAC,aAE9B,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAC7C,0BACG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,aAAI,SAAS,EAAC,2BAA2B,YAAE,GAAG,EAAE,KAAK,GAAM,CAAC,CAAC,CAAC,IAAI,EAC/E,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,CAClB,eAAM,SAAS,EAAE,sBAAsB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,EAAE,YAC3E,GAAG,EAAE,WAAW,GACZ,CACR,CAAC,CAAC,CAAC,IAAI,IACJ,KAhBD,MAAM,CAAC,KAAK,CAAC,CAiBd,CACP,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,QAAiB,EAAE,EAAE,CAAC,CAClD,cAAK,SAAS,EAAC,aAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,YAC3E,KAAC,GAAG,IAAC,SAAS,EAAC,cAAc,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,IAAI,UAAU,EAAE,KAAK,EAAE,CAAC,QAAQ,GAAI,GAC9E,CACP,CAAC"}

package/mobile/lib/ui-kit/Tabs/TabsProps.d.ts

@@ -1,4 +1,4 @@
-import type { IconName } from '../../icons/IconName';
+import type { Picture } from '../../model/Picture';
 /**
  * @title Вкладка
  */
@@ -7,7 +7,7 @@ export interface Tab {
     title?: string;
     /** @title Описание */
     description?: string;
-    icon?: IconName;
+    icon?: Picture;
 }
 export declare type TabClickHandler = (value: number) => void;
 export interface TabsProps {

package/mobile/src/components/Accordion/Accordion.example.json

@@ -3,7 +3,9 @@
   "accordionItems": [
     {
       "label": "Аккордеон 1",
-      "labelIcon": "CardIcon",
+      "labelIcon": {
+        "icon": "CardIcon"
+      },
       "blocks": [
         {
           "blockListType": "TextBlock",
@@ -19,7 +21,9 @@
     },
     {
       "label": "Аккордеон 2",
-      "labelIcon": "CardIcon",
+      "labelIcon": {
+        "icon": "CardIcon"
+      },
       "blocks": [
         {
           "blockListType": "TextBlock",
@@ -35,7 +39,9 @@
     },
     {
       "label": "Аккордеон 3",
-      "labelIcon": "CardIcon",
+      "labelIcon": {
+        "icon": "CardIcon"
+      },
       "blocks": [
         {
           "blockListType": "TextBlock",

package/mobile/src/components/Accordion/AccordionContent.ts

@@ -1,6 +1,6 @@
 import type { BlockDef } from '../../ui-kit/BlocksList/BlocksListProps';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { IconName } from '../../icons/IconName';
+import type { Picture } from '../../model/Picture';
 /**
  * @title Элемент списка
  */
@@ -21,7 +21,7 @@ export interface AccordionItemCommonProps {
    * @default false
    */
   bordered?: boolean; // TODO: только для мобильной версии
-  labelIcon?: IconName; // TODO: только для мобильной версии
+  labelIcon?: Picture; // TODO: только для мобильной версии
 }
 
 /**

package/mobile/src/components/Accordion/AccordionItem.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import { Icon } from '../../ui-kit/Icon/Icon';
 import type { AccordionItemCommonProps } from './AccordionContent';
 import { AccordionItemInner } from './AccordionItemInner';
+import { Img } from '../../ui-kit/Img/Img';
 import { useActiveHandler } from './useActiveHandler';
 
 export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
@@ -28,11 +28,11 @@ export const AccordionItem = JSX<AccordionItemProps>(
             }`}
           >
             {labelIcon ? (
-              <Icon name={labelIcon} width="24" height="24" asSVG className="mr-3" />
+              <Img image={labelIcon} width="24" height="24" asSVG className="mr-3" />
             ) : null}
             {label}
           </span>
-          {hasContent ? <Icon name={icon} width="24" height="24" asSVG /> : null}
+          {hasContent ? <Img image={icon} width="24" height="24" asSVG /> : null}
         </button>
         {hasContent ? <AccordionItemInner blocks={blocks} context={context} /> : null}
       </li>

package/mobile/src/components/BenefitsBlock/BenefitsBlock.example.json

@@ -3,11 +3,15 @@
   "benefits": [
     {
       "label": "Преимущество №1",
-      "icon": "ClockIcon"
+      "icon": {
+        "icon": "ClockIcon"
+      }
     },
     {
       "label": "Преимущество №2",
-      "icon": "SignDocsIcon"
+      "icon": {
+        "icon": "SignDocsIcon"
+      }
     }
   ]
 }

package/mobile/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import { Img } from '../../ui-kit/Img/Img';
 import type { Benefit, BenefitsBlockContent } from './BenefitsBlockContent';
 
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
@@ -29,14 +29,14 @@ export const BenefitsBlock = JSX<BenefitsBlockProps>(
 const renderStep = (benefit: Benefit, i: number) => {
   return (
     <div key={String(i)} className="flex items-center gap-5 max-w-[500px]">
-      {benefit.icon && (
-        <Icon
+      {benefit.icon ? (
+        <Img
           className="h-[70px] w-[70px] min-w-[70px] min-h-[70px]"
-          name={benefit.icon}
+          image={benefit.icon}
           width="70"
           height="70"
         />
-      )}
+      ) : null}
       <div>
         <h3 className="font-medium text-xl m-0">{benefit.label}</h3>
         {benefit.description && (

package/mobile/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,4 +1,4 @@
-import type { IconName } from '../../ui-kit/Icon/IconProps';
+import type { Picture } from '../../model/Picture';
 
 export interface TextBenefit {
   /** @title Название */
@@ -11,7 +11,7 @@ export interface TextBenefit {
  * @title Преимущество
  */
 export interface Benefit extends TextBenefit {
-  icon?: IconName;
+  icon?: Picture;
 }
 
 /**

package/mobile/src/components/ComparisonTable/ComparisonTableContent.ts

@@ -1,6 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
-import type { IconName } from '../../ui-kit/Icon/IconProps';
 import type { ListOrientation } from '../../model/ListOrientation';
 
 /**
@@ -29,7 +28,7 @@ export interface ColumnHeader {
   title?: string;
   /** @title Подзаголовок */
   subtitle?: string;
-  icon?: IconName;
+  icon?: Picture;
   image?: Picture;
   link?: LinkProps;
 }
@@ -65,7 +64,7 @@ export interface TableColumnData {
 export interface TableColumnHeader {
   /** @title Заголовок */
   title?: string;
-  icon?: IconName;
+  icon?: Picture;
 }
 
 /**

package/mobile/src/components/ComparisonTable/HeaderCell.tsx

@@ -1,13 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { LinkProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
-import { Heading } from '../../ui-kit/Heading/Heading';
-import { Icon } from '../../ui-kit/Icon/Icon';
-import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { Img } from '../../ui-kit/Img/Img';
+import { Heading } from '../../ui-kit/Heading/Heading';
 
 export interface HeaderCellProps {
-  icon?: IconName;
+  icon?: Picture;
   image?: Picture;
   title?: string;
   subtitle?: string;
@@ -18,14 +16,14 @@ export interface HeaderCellProps {
 export const HeaderCell = JSX<HeaderCellProps>(
   ({ icon, image, title, subtitle, isFillGradient }) => (
     <div role="columnheader" scope="col">
-      {icon && (
-        <Icon
+      {icon ? (
+        <Img
           className="h-[63px] w-[63px] min-w-[63px] min-h-[63px] mb-4"
-          name={icon}
+          image={icon}
           width="63"
           height="63"
         />
-      )}
+      ) : null}
       {image?.src && (
         <div className="mb-3.5">
           <Img image={image} />