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

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} />