@redneckz/wildless-cms-uni-blocks 0.3.75 → 0.3.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.3.75",
+  "version": "0.3.77",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -149,7 +149,7 @@
     "size-limit": "^7.0.8",
     "style-loader": "^3.3.1",
     "svgo": "^2.8.0",
-    "tailwindcss": "^3.1.1",
+    "tailwindcss": "^3.1.8",
     "ts-jest": "^28.0.6",
     "ts-json-schema-generator": "^1.0.0",
     "ts-loader": "^9.3.0",

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

@@ -1,5 +1,6 @@
 {
   "title": "Аккордеон",
+  "accordionAlignTitle": "center",
   "accordionItems": [
     {
       "label": "Аккордеон 1",
@@ -10,12 +11,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-12"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-12"]
         }
       ]
     },
@@ -28,12 +31,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-6"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-6"]
         }
       ]
     },
@@ -46,12 +51,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-12"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-12"]
         }
       ]
     }

package/src/components/Accordion/AccordionContent.ts

@@ -31,7 +31,10 @@ export interface AccordionItemCommonProps {
 export interface AccordionContent {
   /** @title Заголовок */
   title?: string;
-  /** @title Выравнивание заголовка */
+  /**
+   * @title Выравнивание заголовка
+   * @default center
+   */
   accordionAlignTitle?: AlignType;
   version?: BlockVersion;
   /** @title Список */

package/src/components/Calculator/renderRate.tsx

@@ -12,9 +12,7 @@ export function renderRate({ rate, title, sup, className = '' }: rateType) {
     <div>
       <div className="text-sm font-light ml-3">{title}</div>
       <div className="flex justify-start">
-        <span
-          className={`calc-rate-text font-mohave text-[200px] leading-[250px] pr-4 mt-[-16px] ${className}`}
-        >
+        <span className={`calc-rate-text font-mohave text-title-huge pr-4 mt-[-16px] ${className}`}>
           {rateFormat}
         </span>
         {sup ? <span className="calc-rate-text text-[65px] leading-[75px]">{sup}</span> : ''}

package/src/components/Catalog/Catalog.tsx

@@ -14,12 +14,13 @@ const CARD_FULL_VIEW_COUNT = 3;
 const CARD_SHIFT = 430;
 
 export const Catalog = JSX<CatalogProps>(
-  ({ context, cards = [], className = '', title, description }) => {
+  ({ context, cards = [], className = '', title, description, anchor = null }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     return (
       <section
         className={`bg-white relative font-sans p-9 overflow-hidden text-center ${className}`}
+        id={anchor}
       >
         {title ? <Heading headingType="h2" className="mb-6" title={title} /> : null}
         {description ? <Description className="mb-6" description={description} /> : null}

package/src/components/Catalog/CatalogContent.ts

@@ -22,5 +22,6 @@ export interface CatalogCardType extends HeadingContent, DescriptionContent, Ima
  */
 export type CatalogContent = HeadingContent &
   DescriptionContent & {
+    /** @title Список карточек */
     cards?: CatalogCardType[];
   };

package/src/components/ContentPage/ContentPage.page.json

@@ -2355,4 +2355,4 @@
       }
     }
   ]
-}
+}

package/src/components/GroupBlock/GroupBlock.example.json

@@ -10,19 +10,88 @@
       "blockType": "ProductBlock",
       "title": "Продуктовый блок",
       "description": "Описание текстового блока",
-      "tags": ["tag2"]
+      "tags": ["tag2"],
+      "backwardButton": {
+        "text": "Кнопка возврата",
+        "icon": { "icon": "ArrowLeftIcon" }
+      },
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 234,
+          "height": 234
+        }
+      }
     },
     {
       "blockType": "ProductTile",
       "title": "Продуктовая плитка",
       "description": "Описание текстового блока",
-      "tags": ["tag1"]
+      "tags": ["tag1"],
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 300
+        }
+      },
+      "version": "primary",
+      "benefits": [
+        {
+          "label": "Преимущество 1",
+          "description": "Описание"
+        },
+        {
+          "label": "Преимущество 2",
+          "description": "Описание"
+        },
+        {
+          "label": "Преимущество 3",
+          "description": "Описание"
+        }
+      ],
+      "buttons": [
+        {
+          "text": "Кнопка",
+          "version": "primary"
+        }
+      ]
     },
     {
       "blockType": "ProductBlock",
       "title": "Продуктовый блок",
       "description": "Описание текстового блока",
-      "tags": ["tag2"]
+      "tags": ["tag2"],
+      "headingType": "h2",
+      "backwardButton": {
+        "text": "Кнопка возврата",
+        "icon": { "icon": "ArrowLeftIcon" }
+      },
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 234,
+          "height": 234
+        }
+      },
+      "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+      "isDotted": true,
+      "buttons": [
+        {
+          "text": "Кнопка",
+          "version": "secondary"
+        }
+      ],
+      "version": "primary",
+      "benefits": [
+        {
+          "label": "Преимущество №1",
+          "icon": {"icon": "ClockIcon"}
+        },
+        {
+          "label": "Преимущество №2",
+          "icon": {"icon": "SignDocsIcon"}
+        }
+      ]
     }
   ]
 }

package/src/components/GroupBlock/GroupBlockContent.ts

@@ -4,10 +4,10 @@ import type { GroupBlockDef } from './BlocksTypeProps';
  *  @title Таб
  */
 export interface GroupBlockTab {
-  /** @title Название */
-  title?: string;
   /** @title Tег */
   tag?: string;
+  /** @title Название */
+  title?: string;
 }
 
 /**

package/src/components/LinkDocs/LinkDocsContent.ts

@@ -28,7 +28,16 @@ export interface LinkDocsContent {
   title?: string;
   /** @title Описание */
   description?: string;
-  /** @title Название иконки */
+  /**
+   *  @title Иконка
+   *  @default {
+   *   "size": {
+   *     "width": 24,
+   *     "height": 24
+   *   },
+   *   "format": "webp"
+   * }
+   */
   icon?: Picture;
   /** @title Список */
   documents?: LinkDocsItem[];

package/src/components/OtherProducts/OtherProducts.example.json

@@ -7,12 +7,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-12"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-12"]
         }
       ]
     },
@@ -22,12 +24,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-12"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-12"]
         }
       ]
     },
@@ -37,12 +41,14 @@
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок",
-          "description": "Описание текстового блока"
+          "description": "Описание текстового блока",
+          "style": ["col-span-12"]
         },
         {
           "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2"
+          "description": "Описание текстового блока №2",
+          "style": ["col-span-12"]
         }
       ]
     }

package/src/components/PictureText/PictureTextContent.ts

@@ -6,6 +6,7 @@ import type { Picture } from '../../model/Picture';
 export type TitleWithImageContent = HeadingContent & ImageContent;
 
 export interface PictureTextBenefit {
+  /** @title Иконка */
   icon?: Picture;
   /** @title Название */
   label?: string;

package/src/components/ProductBlock/ProductBlock.example.json

@@ -3,7 +3,6 @@
   "description": "Описание",
   "headingType": "h2",
   "backwardButton": {
-    "href": "https://rshb.ru",
     "text": "Кнопка возврата",
     "icon": { "icon": "ArrowLeftIcon" }
   },
@@ -12,24 +11,18 @@
     "size": {
       "width": 234,
       "height": 234
-    },
-    "alt": "",
-    "title": ""
+    }
   },
   "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
   "isDotted": true,
   "buttons": [
     {
       "text": "Кнопка",
-      "version": "secondary",
-      "target": "",
-      "icon": {
-        "alt": "",
-        "title": ""
-      }
+      "version": "secondary"
     }
   ],
   "version": "primary",
+  "benefitsVersion": "normal",
   "benefits": [
     {
       "label": "Преимущество №1",

package/src/components/ProductBlock/ProductBlock.fixture.tsx

@@ -2,7 +2,7 @@ import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ProductBlock } from './ProductBlock';
-import type { ProductBlockContent, ProductBlockBenefit } from './ProductBlockContent';
+import type { ProductBlockBenefit, ProductBlockContent } from './ProductBlockContent';
 
 const image: Picture = {
   src: 'money-1.png',
@@ -18,7 +18,7 @@ const benefits: ProductBlockBenefit[] = [
   {
     label: 'До 5 млн ₽',
     description: 'Кредитный лимит',
-    icon: { icon: 'EmptyWalletIcon', iconVersion: 'white' },
+    icon: { icon: 'CalendarTickIcon', iconVersion: 'white' },
   },
   {
     label: 'От 16,9%',

package/src/components/ProductTile/ProductTile.example.json

@@ -26,8 +26,7 @@
   "buttons": [
     {
       "text": "Кнопка",
-      "version": "primary",
-      "target": ""
+      "version": "primary"
     }
   ]
 }

package/src/components/ProductTile/ProductTile.tsx

@@ -5,7 +5,6 @@ import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { BaseTile } from '../BaseTile/BaseTile';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import type { ProductTileContent, TextBenefit } from './ProductTileContent';
@@ -33,39 +32,36 @@ export const ProductTile = JSX<ProductTileProps>(
   }) => {
     return (
       <section
-        className={`bg-white overflow-hidden text-primary-text font-sans p-9 box-border ${className} ${
+        className={`bg-white overflow-hidden text-primary-text font-sans p-9 box-border min-h-[364px] relative justify-between grid ${className} ${
           productTileStyleMap[version]
         } ${getTileRightPadding(className)} ${getTileMinHeight(className)} `}
         id={anchor}
       >
-        <BaseTile
-          context={context}
-          title={
-            title ? (
-              <Heading
-                headingType={headingType}
-                as="h3"
-                title={title}
-                className={`whitespace-pre-wrap max-w-[600px]`}
-              />
-            ) : null
-          }
-          buttons={
-            buttons?.length ? (
-              <ButtonSection context={context} buttons={buttons} className="flex mt-9 gap-3" />
-            ) : null
-          }
-          image={image?.src && <Img className="mt-auto ml-7" image={image} />}
-        >
+        <div className="z-[1]">
+          {title ? (
+            <Heading
+              headingType={headingType}
+              as="h3"
+              title={title}
+              className={`whitespace-pre-wrap text-h4`}
+            />
+          ) : null}
           {description ? (
-            <Description className="mt-4 max-w-[600px]" description={description} />
+            <Description className="mt-2 text-md font-light" description={description} />
           ) : null}
           {renderBenefits(benefits || [], version)}
-
           {additionalDescription
             ? renderAdditionalDescription(additionalDescription, version)
             : null}
-        </BaseTile>
+        </div>
+        {buttons?.length ? (
+          <ButtonSection
+            context={context}
+            buttons={buttons}
+            className="flex self-end mt-5 gap-4 z-[1]"
+          />
+        ) : null}
+        {image?.src ? <Img className="absolute right-0 bottom-0" image={image} /> : null}
       </section>
     );
   },
@@ -73,10 +69,12 @@ export const ProductTile = JSX<ProductTileProps>(
 
 function renderBenefits(benefits: TextBenefit[], version: BlockVersion) {
   return (
-    <div className="flex mt-5 mb-1">
-      {benefits.length ? <div className="mr-8">{benefits.map(renderBenefitLabel)}</div> : null}
+    <div className="flex mt-4">
+      {benefits.length ? (
+        <div className="mr-6 gap-2.5 text-title-2xs">{benefits.map(renderBenefitLabel)}</div>
+      ) : null}
       {benefits.length ? (
-        <div className="pt-1">
+        <div className="pt-1 text-m">
           {benefits.map((_, i) => renderBenefitDescription(_, i, version))}
         </div>
       ) : null}
@@ -86,7 +84,7 @@ function renderBenefits(benefits: TextBenefit[], version: BlockVersion) {
 
 function renderBenefitLabel(benefit: TextBenefit, i: number) {
   return (
-    <div key={String(i)} className={`text-xl font-medium ${i ? 'mt-2.5' : ''}`}>
+    <div key={String(i)} className={`${i ? 'mt-2.5' : ''}`}>
       {benefit.label}
     </div>
   );
@@ -99,7 +97,7 @@ function renderBenefitDescription(benefit: TextBenefit, i: number, version = 'pr
   };
 
   return (
-    <div key={String(i)} className={`text-sm ${i ? 'mt-4' : ''} ${labelStyleMap[version]}`}>
+    <div key={String(i)} className={`${i ? 'mt-4' : ''} ${labelStyleMap[version]}`}>
       {benefit.description}
     </div>
   );
@@ -111,5 +109,5 @@ function renderAdditionalDescription(additionalDescription: string, version = 'p
     secondary: 'text-white',
   };
 
-  return <div className={`text-sm mt-2.5 ${descStyleMap[version]}`}>{additionalDescription}</div>;
+  return <div className={`text-m mt-2.5 ${descStyleMap[version]}`}>{additionalDescription}</div>;
 }

package/src/components/PromoTile/PromoTile.example.json

@@ -6,8 +6,7 @@
     {
       "text": "Все акции",
       "href": "/credits",
-      "version": "secondary",
-      "target": ""
+      "version": "secondary"
     }
   ],
   "version": "secondary"

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

@@ -8,19 +8,34 @@
       "label": "Шаг №1",
       "description": "Описание шага №1",
       "icon": {
-        "icon": "NewDocIcon"
+        "icon": "NewDocIcon",
+        "size": {
+          "width": 48,
+          "height": 48
+        },
+        "format": "webp"
       }
     },
     {
       "label": "Шаг №2",
       "icon": {
-        "icon": "PassSendIcon"
+        "icon": "PassSendIcon",
+        "size": {
+          "width": 48,
+          "height": 48
+        },
+        "format": "webp"
       }
     },
     {
       "description": "Шаг №3 без заголовка",
       "icon": {
-        "icon": "ActualBalanceIcon"
+        "icon": "ActualBalanceIcon",
+        "size": {
+          "width": 48,
+          "height": 48
+        },
+        "format": "webp"
       }
     }
   ]

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

@@ -5,6 +5,7 @@ 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 { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
 import { getStyleMap } from './StepsBlockStyleMaps';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
@@ -109,7 +110,11 @@ const renderIconArea = (size: SizeVersion, version: BlockVersion) => (step: Step
       className={`${iconAreaSize} ${styleMap.iconBackground} rounded-full z-10 mr-3 flex justify-center content-center`}
     >
       <span className={`font-medium flex self-center ${styleMap.title} ${iconTextSize}`}>
-        {(step.icon?.icon && <Img image={step.icon} width={iconSize} height={iconSize} />) || i + 1}
+        {checkIsIconRenderable(step?.icon) ? (
+          <Img image={step.icon} width={iconSize} height={iconSize} asSVG />
+        ) : (
+          <span>{i + 1}</span>
+        )}
       </span>
     </div>
   );

package/src/components/StepsBlock/StepsBlock.tsx

@@ -5,7 +5,9 @@ import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { joinList } from '../../utils/joinList';
 import type { Step, StepsBlockContent } from './StepsBlockContent';
-import { getStyleMap, StyleType } from './StepsBlockStyleMaps';
+import type { StyleType } from './StepsBlockStyleMaps';
+import { getStyleMap } from './StepsBlockStyleMaps';
+import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -63,19 +65,23 @@ export const StepsBlock = JSX<StepsBlockProps>(
   },
 );
 
-const renderStepIcon = (styleMap: StyleType) => (step: Step, i: number) => {
-  return (
-    <div key={String(i)} className="flex flex-col items-center text-center relative">
-      <div
-        className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 ${styleMap.iconBackground}`}
-      >
-        {(step.icon?.icon && <Img image={step.icon} width="48" height="48" />) || (
-          <span className={`font-normal text-title-sm ${styleMap.title}`}>{i + 1}</span>
-        )}
+const renderStepIcon =
+  (styleMap: StyleType) =>
+  ({ icon }: Step, i: number) => {
+    return (
+      <div key={String(i)} className="flex flex-col items-center text-center relative">
+        <div
+          className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 ${styleMap.iconBackground}`}
+        >
+          {checkIsIconRenderable(icon) ? (
+            <Img image={icon} width="48" height="48" asSVG />
+          ) : (
+            <span className={`font-normal text-title-sm ${styleMap.title}`}>{i + 1}</span>
+          )}
+        </div>
       </div>
-    </div>
-  );
-};
+    );
+  };
 
 const renderStepTitle = (styleMap: StyleType, isMainButton: boolean) => (step: Step, i: number) => {
   return (

package/src/components/StepsBlock/StepsBlockContent.ts

@@ -11,6 +11,17 @@ export interface Step {
   label?: string;
   /** @title Описание */
   description?: string;
+  /**
+   *  @title Иконка
+   *  @default
+   * {
+   *   "size": {
+   *     "width": 48,
+   *     "height": 48
+   *   },
+   *   "format": "webp"
+   * }
+   */
   icon?: Picture;
   button?: ButtonProps;
 }

package/src/components/Tile/Tile.example.json

@@ -7,21 +7,14 @@
     "format": "webp",
     "size": {
       "width": 445
-    },
-    "alt": "",
-    "title": ""
+    }
   },
   "isDotted": true,
   "items": ["Пункт 1", "Пункт 2", "Пункт 3"],
   "buttons": [
     {
       "text": "Кнопка",
-      "version": "primary",
-      "target": "",
-      "icon": {
-        "alt": "",
-        "title": ""
-      }
+      "version": "primary"
     }
   ],
   "version": "primary"