@redneckz/wildless-cms-uni-blocks 0.3.31 → 0.3.34

package/mobile/src/components/ProductBlock/renderBenefit.tsx

@@ -1,5 +1,5 @@
 import type { BlockVersion } from '../../model/BlockVersion';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import { Img } from '../../ui-kit/Img/Img';
 import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 const benefitTitleStyleMap: Record<BlockVersion, string> = {
@@ -14,16 +14,16 @@ const benefitDescStyleMap: Record<BlockVersion, string> = {
 export function renderBenefit(benefit: Benefit, i: number, version: BlockVersion) {
   return (
     <div key={String(i)} className="flex gap-3 items-center mb-2.5 last:mb-0">
-      {benefit.icon && (
-        <Icon
+      {benefit.icon ? (
+        <Img
           className="w-6 h-6 rounded-full box-border"
-          name={benefit.icon}
+          image={benefit.icon}
           width="24"
           height="24"
           asSVG
           color={version}
         />
-      )}
+      ) : null}
       <div className={`font-medium text-m-title-xs m-0 ${benefitTitleStyleMap[version]}`}>
         {benefit.label}
       </div>

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

@@ -3,7 +3,7 @@
     {
       "nav": {
         "title": "Заголовок",
-        "desc": "Описание"
+        "description": "Описание"
       },
       "productBlock": {
         "title": "Продуктовая галерея",
@@ -15,6 +15,27 @@
           }
         },
         "description": "Описание",
+        "isDotted": "true",
+        "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+        "version": "primary"
+      }
+    },
+    {
+      "nav": {
+        "title": "Заголовок",
+        "description": "Описание"
+      },
+      "productBlock": {
+        "title": "Продуктовая галерея",
+        "image": {
+          "format": "webp",
+          "size": {
+            "width": 234,
+            "height": 234
+          }
+        },
+        "description": "Описание",
+        "isDotted": "true",
         "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
         "version": "primary"
       }

package/mobile/src/components/ProductGallery/ProductGalleryBlock.tsx

@@ -1,8 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../types';
 import { HeadingType } from '../../ui-kit/Heading/HeadingContent';
-import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
 import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
+import type { UniBlockProps } from '../../types';
+
+const productGalleryStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
 
 export interface ProductGalleryBlockProps extends UniBlockProps {
   headingType?: HeadingType;
@@ -10,9 +16,13 @@ export interface ProductGalleryBlockProps extends UniBlockProps {
 }
 
 export const ProductGalleryBlock = JSX<ProductGalleryBlockProps>(
-  ({ block, headingType, context }) => {
+  ({ block, headingType, context, className = '' }) => {
+    const version = block?.version ?? 'primary';
+
     return (
-      <section className="flex grow-0 shrink-0 basis-full px-4 pt-6">
+      <section
+        className={`flex grow-0 shrink-0 basis-full px-4 pt-6 ${productGalleryStyleMap[version]} ${className}`}
+      >
         <div className="flex grow">
           <ProductBlockInner context={context} headingType={headingType || 'h2'} {...block} />
         </div>

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

@@ -10,7 +10,8 @@
         "image": {
           "format": "webp",
           "size": {
-            "width": 280
+            "width": 608,
+            "height": 299
           }
         },
         "version": "primary",

package/mobile/src/components/ProductGalleryGreen/ProductGalleryGreen.tsx

@@ -1,38 +1,61 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
 import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
 import type { ProductGalleryGreenContent } from './ProductGalleryGreenContent';
 
 export interface ProductGalleryProps extends ProductGalleryGreenContent, UniBlockProps {}
 
+type StyleType = {
+  title: string;
+  text: string;
+};
+
+const productGalleryGreenStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
+const productBlockStyleMap: Record<BlockVersion, StyleType> = {
+  primary: { title: 'text-secondary-text', text: 'text-secondary-text' },
+  secondary: { title: 'text-white', text: 'text-white/80' },
+};
+
+const productSlideStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
 export const ProductGalleryGreen = JSX<ProductGalleryProps>(
-  ({ className = '', context, slides = [], anchor = null }) => {
+  ({ className = '', context, slides = [], version = 'primary', duration = 0, anchor = null }) => {
     const galleryNav = slides.map((s) => s.nav);
     const galleryBlocks = slides.map((s) => s.productBlock);
     const [activeSlideIndex, setActiveSlideIndex] = context.useState(0);
 
     return (
       <section
-        className={`box-border pt-[70px] relative font-sans overflow-hidden bg-primary-main w-100 ${className}`}
         id={anchor}
+        className={`box-border pt-[50px] overflow-hidden relative font-sans w-100 ${className}
+        ${productGalleryGreenStyleMap[version]}`}
       >
         <div
           className="flex duration-1000 pb-14"
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {galleryBlocks.map((_, i) => renderProductBlock(_, i, context))}
+          {galleryBlocks.map((_, i) => renderProductBlock({ ..._, version }, i, context))}
         </div>
 
-        <div className="flex items-center absolute bottom-6 left-0 right-0 px-9 box-border">
+        <div className="flex items-center absolute bottom-6 left-0 right-0 px-[26px] box-border">
           {galleryNav.map((slide, i) =>
             renderNavButton({
               slide,
               i,
               activeSlideIndex,
               onClick: () => setActiveSlideIndex(i),
+              version,
+              duration,
             }),
           )}
         </div>
@@ -42,47 +65,43 @@ export const ProductGalleryGreen = JSX<ProductGalleryProps>(
 );
 
 function renderProductBlock(block: ProductBlockInnerContent, i: number, context) {
+  const { version } = block;
+  const additionalClass = version ? productBlockStyleMap[version].title : '';
+
   return (
     <section
       key={String(i)}
-      className="box-border relative flex grow-0 shrink-0 basis-full px-9"
+      className="box-border relative flex grow-0 shrink-0 basis-full"
       role="listitem"
     >
       <div className="flex grow">
-        {block.backgroundText ? (
-          <div className="absolute text-[454px] font-bold text-white tracking-[-10px] leading-[299px] opacity-[.1] right-12 top-20 z-0">
-            {block.backgroundText}
-          </div>
-        ) : null}
         <ProductBlockInner
-          className="pl-2.5 pt-2.5 pb-1.5 pr-[6.25rem] z-[1]"
+          className={`pl-[50px] pr-2 z-[1] ${additionalClass}`}
           context={context}
           textBlockClassName="mb-[154px]"
-          version="secondary"
           {...block}
         />
-        <Icon
-          className="absolute right-[460px] top-[200px] z-0 mb-4"
-          name="ArrowsRewindRight"
-          width="230"
-          height="187"
-        />
       </div>
     </section>
   );
 }
 
-function renderNavButton({ slide, i, activeSlideIndex, onClick }) {
+function renderNavButton({ slide, i, activeSlideIndex, onClick, version, duration }) {
   const isActiveBtn = i === activeSlideIndex;
+
   const btnClassName = isActiveBtn
-    ? 'bg-white shadow-dark-blue/42 h-[102px] w-[354px] min-w-[354px] max-w-[354px] p-0'
-    : 'bg-white/10 min-w-[277px] px-0 pt-4 pb-[23px] hover:pt-[21px] hover:pb-7 ease-in duration-300';
+    ? 'bg-white shadow-dark-blue/42 h-[102px] w-[354px] min-w-[354px] max-w-[354px] p-0 border-none'
+    : `min-w-[277px] px-0 pt-4 pb-[23px] hover:py-[26px] hover:py-[26px] ease-in duration-300
+      ${productSlideStyleMap[version]}`;
   const btnTitleClassName = isActiveBtn
-    ? 'text-[18px] text-primary-text pb-[10px]'
-    : 'text-m-base text-white pb-[3px]';
+    ? 'text-primary-text text-title-2xs'
+    : `text-base ${productBlockStyleMap[version].title}`;
   const btnDescClassName = isActiveBtn
-    ? 'text-[18px] text-secondary-text'
-    : 'text-m-base text-white';
+    ? 'text-secondary-text text-m-title-xs mt-2.5'
+    : `text-m-md mt-1.5 ${productBlockStyleMap[version].text}`;
+
+  const additionalBorder = version === 'secondary' ? 'border-white/50' : '';
+  const progressBarClassName = isActiveBtn ? 'animate-slide' : '';
 
   return (
     <button
@@ -90,14 +109,18 @@ function renderNavButton({ slide, i, activeSlideIndex, onClick }) {
       key={String(i)}
       onClick={onClick}
       aria-label={slide?.title}
-      className={`box-border font-sans group relative overflow-hidden border-white/50 border-[1px] cursor-pointer text-left mb-6a mx-1 grow basis-0 backdrop-blur-sm
-        ${btnClassName}
+      className={`box-border font-sans group relative overflow-hidden border-[1px] cursor-pointer text-left mx-1 grow basis-0 backdrop-blur-sm
+      ${btnClassName} ${additionalBorder}
       `}
     >
       <div className="border-0 px-6">
         <div className={`font-medium ${btnTitleClassName}`}>{slide?.title}</div>
         <div className={`text-secondary-text ${btnDescClassName}`}>{slide.description}</div>
       </div>
+      <div
+        className={`absolute bottom-0 left-0 w-full h-[3px] bg-primary-main -translate-x-full ${progressBarClassName}`}
+        style={{ animationDuration: `${duration}s`, animationFillMode: 'forwards' }}
+      ></div>
     </button>
   );
 }

package/mobile/src/components/ProductGalleryGreen/ProductGalleryGreenContent.ts

@@ -1,4 +1,5 @@
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 /** @title Кнопка под слайдом */
 interface ProductGalleryNav {
@@ -29,4 +30,5 @@ export interface ProductGalleryGreenContent {
   duration?: number;
   /** @title Слайды */
   slides?: ProductSlide[];
+  version?: BlockVersion;
 }

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

@@ -10,7 +10,12 @@
         }
       },
       "title": "Заголовок 1",
-      "description": "Описание 1"
+      "description": "Описание 1",
+      "socialMedia": [
+        { "href":  "https://t.me" },
+        { "href":  "https://vk.com" },
+        { "href":  "https://ok.ru" }
+      ]
     },
     {
       "image": {
@@ -21,7 +26,12 @@
         }
       },
       "title": "Заголовок 2",
-      "description": "Описание 2"
+      "description": "Описание 2",
+      "socialMedia": [
+        { "href":  "https://t.me" },
+        { "href":  "https://vk.com" },
+        { "href":  "https://ok.ru" }
+      ]
     },
     {
       "image": {
@@ -32,7 +42,12 @@
         }
       },
       "title": "Заголовок 3",
-      "description": "Описание 3"
+      "description": "Описание 3",
+      "socialMedia": [
+        { "href":  "https://t.me" },
+        { "href":  "https://vk.com" },
+        { "href":  "https://ok.ru" }
+      ]
     }
   ]
 }

package/mobile/src/components/Recommendation/Recommendation.tsx

@@ -3,7 +3,7 @@ import type { UniBlockProps } from '../../types';
 import { ArrowButton } from '../../ui-kit/Button/ArrowButton';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { RecommendationCard } from './RecommendationCard';
-import type { RecommendationCardContent, RecommendationContent } from './RecommendationContent';
+import type { RecommendationCardTypes, RecommendationContent } from './RecommendationContent';
 
 const BLUR_BLOCK_CLASSES = 'absolute top-0 bottom-0 w-[84px]';
 const CARD_FULL_VIEW_COUNT = 2;
@@ -17,16 +17,16 @@ export const Recommendation = JSX<RecommendationProps>(
 
     const blockClassName =
       version === 'secondary' ? 'bg-primary-main text-white' : 'bg-white text-primary-text';
-    const cardClassName = version === 'secondary' ? 'border-main-divider' : 'border-main-stroke';
+    const cardClassName = version === 'secondary' ? 'border-white/50' : 'border-main-stroke';
 
     return (
       <section
-        className={`relative font-sans p-[50px] overflow-hidden ${blockClassName} ${className}`}
+        className={`relative font-sans p-9 overflow-hidden text-center ${blockClassName} ${className}`}
         id={anchor}
       >
-        {title ? <Heading headingType="h3" className="mb-8" title={title} /> : null}
+        {title ? <Heading headingType="h2" className="mb-6" title={title} /> : null}
         <div
-          className="flex duration-1000 gap-4"
+          className="flex duration-1000 gap-3.5"
           style={{ transform: `translateX(-${activeCardIndex * CARD_SHIFT}px)` }}
           role="list"
         >
@@ -58,7 +58,7 @@ export const Recommendation = JSX<RecommendationProps>(
 
 const renderRecommendationCard =
   ({ context, version, className }) =>
-  (card: RecommendationCardContent, i: number) => {
+  (card: RecommendationCardTypes, i: number) => {
     return (
       <RecommendationCard
         key={String(i)}

package/mobile/src/components/Recommendation/RecommendationCard.tsx

@@ -1,31 +1,40 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../types';
 import { Description } from '../../ui-kit/Description/Description';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { BaseTile } from '../BaseTile/BaseTile';
-import type { RecommendationCardContent } from './RecommendationContent';
+import { SocialMedia } from '../Footer/SocialMedia';
+import type { UniBlockProps } from '../../types';
+import type { RecommendationCardTypes } from './RecommendationContent';
 
-export interface RecommendationCardProps extends RecommendationCardContent, UniBlockProps {
-  version?: BlockVersion;
-}
+export interface RecommendationCardProps extends RecommendationCardTypes, UniBlockProps {}
 
 export const RecommendationCard = JSX<RecommendationCardProps>(
-  ({ context, className = '', title, description, items, image, version }) => {
+  ({ context, className = '', title, description, items, image, version, socialMedia }) => {
     return (
       <section
-        className={`border border-solid box-border rounded-md p-7 min-w-[515px] max-w-[515px] ${className}`}
+        className={`border border-solid box-border py-[30px] px-9 min-w-[515px] max-w-[515px] ${className}`}
         role="listitem"
       >
         <BaseTile
           context={context}
-          title={title && <Heading headingType="h4" title={title} className="mb-4" />}
+          className="flex justify-between"
+          title={
+            title ? (
+              <h4 className={`font-sans text-title-xs font-normal m-0 mb-3.5`}>{title}</h4>
+            ) : null
+          }
           image={image?.src && <Img className="mt-auto ml-7" image={image} />}
         >
-          {description ? <Description description={description} /> : null}
-          {items?.length ? <List items={items} version={version} /> : null}
+          {description ? <Description className="text-left" description={description} /> : null}
+          {items?.length ? (
+            <List
+              className="text-md font-light flex flex-col gap-2"
+              items={items}
+              version={version}
+            />
+          ) : null}
+          <SocialMedia className="pt-[42px] pb-0" media={socialMedia} context={context} />
         </BaseTile>
       </section>
     );

package/mobile/src/components/Recommendation/RecommendationContent.ts

@@ -1,19 +1,21 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { LinkProps } from '../../model/LinkProps';
 import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
 import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
-export type RecommendationCardContent = HeadingContent &
+export type RecommendationCardTypes = HeadingContent &
   DescriptionContent &
   ListContent &
-  ImageContent;
-
+  ImageContent &
+  RecommendationContent;
 /**
  * @title Рекомендации
  */
 export interface RecommendationContent extends HeadingContent {
   /** @title Карточки */
-  recommendations?: RecommendationCardContent[];
+  recommendations?: RecommendationCardTypes[];
   version?: BlockVersion;
+  socialMedia?: LinkProps[];
 }

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

@@ -7,15 +7,21 @@
     {
       "label": "Шаг №1",
       "description": "Описание шага №1",
-      "icon": "NewDocIcon"
+      "icon": {
+        "icon": "NewDocIcon"
+      }
     },
     {
       "label": "Шаг №2",
-      "icon": "PassSendIcon"
+      "icon": {
+        "icon": "PassSendIcon"
+      }
     },
     {
       "description": "Шаг №3 без заголовка",
-      "icon": "ActualBalanceIcon"
+      "icon": {
+        "icon": "ActualBalanceIcon"
+      }
     }
   ]
 }

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Heading } from '../../ui-kit/Heading/Heading';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { UniBlockProps } from '../../types';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
 import type { Step, StepsBlockContent } from './StepsBlockContent';
-import type { BlockVersion } from '../../model/BlockVersion';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -16,6 +16,16 @@ type StyleType = {
   iconConnector: string;
 };
 
+const STEPS_SIZE_MAP: Record<SizeVersion, string> = {
+  normal: 'h-[70px] w-[70px] min-w-[70px] min-h-[70px]',
+  small: 'h-[50px] w-[50px] min-w-[50px] min-h-[50px]',
+};
+
+const STEPS_TILE_DESCRIPTION_HEIGHT_MAP: Record<SizeVersion, string> = {
+  normal: 'min-h-[70px]',
+  small: 'min-h-[50px]',
+};
+
 const STEPS_BLOCK_STYLE_MAPS: Record<BlockVersion, StyleType> = {
   primary: {
     background: 'bg-white',
@@ -88,7 +98,9 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
             <div className={`min-h-8 h-full w-[2px] ${style.iconConnector} ${margin}`} />
           )}
         </div>
-        <div className="flex flex-col justify-start relative">
+        <div
+          className={`flex flex-col justify-center h-fit ${STEPS_TILE_DESCRIPTION_HEIGHT_MAP[size]}`}
+        >
           {step.label && (
             <div className="font-medium text-m-title-xs m-0 text-left">{step.label}</div>
           )}
@@ -110,10 +122,7 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
 const renderIconArea = (params: RenderStepTitleParams) => {
   const { step, size, i, version } = params;
   const style = styleMaps(version);
-  const iconAreaSize =
-    size === 'normal'
-      ? 'h-[70px] w-[70px] min-w-[70px] min-h-[70px]'
-      : 'h-[50px] w-[50px] min-w-[50px] min-h-[50px]';
+  const iconAreaSize = STEPS_SIZE_MAP[size];
 
   const iconSize = size === 'normal' ? '38' : '27';
   const iconTextSize = size === 'normal' ? 'text-m-title' : 'text-m-title-xs';
@@ -123,7 +132,8 @@ const renderIconArea = (params: RenderStepTitleParams) => {
       className={`${iconAreaSize} ${style.iconBackground} rounded-full z-10 mr-3 flex justify-center content-center`}
     >
       <span className={`font-medium flex self-center ${style.title} ${iconTextSize}`}>
-        {(step.icon && <Icon name={step.icon} width={iconSize} height={iconSize} asSVG />) || i + 1}
+        {(step.icon?.icon && <Img image={step.icon} width={iconSize} height={iconSize} asSVG />) ||
+          i + 1}
       </span>
     </div>
   );

package/mobile/src/components/StepsBlock/StepsBlockContent.ts

@@ -1,6 +1,6 @@
-import type { IconName } from '../../ui-kit/Icon/IconProps';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { Picture } from '../../model/Picture';
 
 /**
  * @title Шаг
@@ -10,7 +10,7 @@ export interface Step {
   label?: string;
   /** @title Описание */
   description?: string;
-  icon?: IconName;
+  icon?: Picture;
 }
 
 /**
@@ -26,9 +26,10 @@ export interface StepsBlockContent {
   /**
    * @title Шаги
    * @minItems 2
-   * @maxItems 3
+   * @maxItems 4
    */
   steps?: Step[];
+  /** @title Размер шагов (моб.) */
   size?: SizeVersion; // TODO: mobile content
   version?: BlockVersion; // TODO: mobile content
 }

package/mobile/src/components/TariffsTable/TableTileHeader.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import { Img } from '../../ui-kit/Img/Img';
 import type { TariffsTableRowHeader } from './TariffsTableContent';
 
 export const TableTileHeader = JSX<TariffsTableRowHeader>(({ title, icon }) => {
@@ -8,7 +8,7 @@ export const TableTileHeader = JSX<TariffsTableRowHeader>(({ title, icon }) => {
     <div className="flex gap-2.5 mb-2">
       {title ? <Heading headingType="h3" className="font-medium" title={title} /> : null}
       {icon ? (
-        <Icon className="ml-auto max-w-6 max-h-6" name={icon} width="24px" height="24px" />
+        <Img className="ml-auto max-w-6 max-h-6" image={icon} width="24px" height="24px" />
       ) : null}
     </div>
   );

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

@@ -5,11 +5,15 @@
   "rowHeaders": [
     {
       "title": "Параметр 1",
-      "icon": "MoneyIcon"
+      "icon": {
+        "icon": "MoneyIcon"
+      }
     },
     {
       "title": "Параметр 2",
-      "icon": "DollarIcon"
+      "icon": {
+        "icon": "DollarIcon"
+      }
     },
     {
       "title": "Параметр 3"
@@ -45,7 +49,9 @@
             "label": "Ячейка 3-2",
             "buttons": [
               {
-                "icon": "AppleIcon",
+                "icon": {
+                  "icon": "AppleIcon"
+                },
                 "rounded": true,
                 "version": "secondary",
                 "href": "/",
@@ -53,7 +59,9 @@
                 "text": ""
               },
               {
-                "icon": "PlayMarketIcon",
+                "icon": {
+                  "icon": "PlayMarketIcon"
+                },
                 "rounded": true,
                 "version": "secondary",
                 "href": "/",

package/mobile/src/components/TariffsTable/TariffsTableCell.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
-import { Icon } from '../../ui-kit/Icon/Icon';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import type { TariffsTableCellData, TariffsTableList } from './TariffsTableContent';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 export interface TariffsTableCellProps {
   cell: TariffsTableCellData[];
@@ -55,7 +54,7 @@ const renderButtons = (buttons: ButtonWithIconProps[]) => (
         className={`${idx > 0 && rounded ? 'ml-3' : ''} w-12 h-12`}
         key={String(idx)}
         rounded={rounded}
-        appendLeft={icon && <Icon name={icon} width="24px" height="24px" asSVG />}
+        appendLeft={icon ? <Img image={icon} width="24px" height="24px" asSVG /> : null}
         {...buttonProps}
       />
     ))}

package/mobile/src/components/TariffsTable/TariffsTableContent.ts

@@ -1,4 +1,3 @@
-import type { IconName } from '../../icons/IconName';
 import type { CellData } from '../ComparisonTable/ComparisonTableContent';
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
@@ -6,6 +5,7 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
 import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
+import { Picture } from '../../model/Picture';
 
 /**
  * @title Ряд
@@ -44,7 +44,7 @@ export type TariffsTableCellData = CellData &
  * @title Параметр
  */
 export type TariffsTableRowHeader = HeadingContent & {
-  icon?: IconName;
+  icon?: Picture;
 };
 
 /**