@redneckz/wildless-cms-uni-blocks 0.3.72 → 0.3.73

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -2,34 +2,45 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import type { Benefit, BenefitsBlockContent } from './BenefitsBlockContent';
+import type { BenefitItem, BenefitsBlockContent } from './BenefitsBlockContent';
+import { DescriptionType, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
 
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
 
 export const BenefitsBlock = JSX<BenefitsBlockProps>(
-  ({ className = '', title, benefits, anchor = null }) => {
+  ({ className = '', headingType = 'h2', title, benefitList, anchor = null }) => {
     return (
       <section
         className={`font-sans text-primary-text bg-white p-12 flex flex-col items-center ${className}`}
         id={anchor}
       >
         {title ? (
-          <Heading headingType="h2" className="max-w-[47rem] text-center" title={title} />
-        ) : null}
-        {benefits?.length ? (
-          <div className="grid grid-cols-2 gap-8 mt-9">{benefits.map(renderStep)}</div>
+          <Heading
+            headingType={headingType}
+            as="h2"
+            className="max-w-[47rem] text-center"
+            title={title}
+          />
         ) : null}
+        {benefitList?.length ? renderBenefits(benefitList) : null}
       </section>
     );
   },
 );
 
-const renderStep = (benefit: Benefit, i: number) => {
+const renderBenefits = (benefits: BenefitItem[]) => {
+  return (
+    <div className="flex flex-wrap justify-center gap-x-20 mt-9">{benefits.map(renderStep)}</div>
+  );
+};
+
+const renderStep = (benefit: BenefitItem, i: number) => {
+  const description = benefit?.description || undefined;
   return (
-    <div key={String(i)} className="flex items-center gap-5 max-w-[500px]">
+    <div key={String(i)} className="flex items-center basis-1/2 max-w-[500px] mb-[46px]">
       {benefit?.icon ? (
         <Img
-          className="h-[70px] w-[70px] min-w-[70px] min-h-[70px]"
+          className="h-[70px] w-[70px] min-w-[70px] min-h-[70px] mr-5"
           image={benefit.icon}
           width="70"
           height="70"
@@ -37,10 +48,35 @@ const renderStep = (benefit: Benefit, i: number) => {
       ) : null}
       <div>
         {benefit?.label ? <h3 className="font-medium text-xl m-0">{benefit.label}</h3> : null}
-        {benefit?.description ? (
-          <div className="font-normal text-sm mt-2">{benefit.description}</div>
-        ) : null}
+        {renderDescription(description)}
       </div>
     </div>
   );
 };
+
+const renderDescription = (description?: DescriptionType) => {
+  const benefitType = description ? description?.benefitType : null;
+  if (!benefitType) {
+    return null;
+  }
+  return description ? (
+    <div className="font-light text-base text-secondary-text mt-2">
+      {benefitType === 'list'
+        ? renderListBenefit(description as ListBenefitDef)
+        : renderTextBenefit(description as TextBenefitDef)}
+    </div>
+  ) : null;
+};
+
+const renderTextBenefit = (description?: TextBenefitDef) => (description ? description.name : null);
+
+const renderListBenefit = (description?: ListBenefitDef) => {
+  const listStyleType = description?.bullets ? 'list-disc pl-6' : '';
+  return description?.items && description.items.length > 0 ? (
+    <ul className={listStyleType}>
+      {description.items.map((_, i) => (
+        <li key={`benefitListItem-${i}`}>{_}</li>
+      ))}
+    </ul>
+  ) : null;
+};

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,28 +1,58 @@
 import type { Picture } from '../../model/Picture';
+import type { HeadingContent, HeadingTypeContent } from '../../ui-kit/Heading/HeadingContent';
+import type { EmptyOption } from '../../model/EmptyOptionType';
 
-export interface TextBenefit {
-  /** @title Название */
-  label?: string;
-  /** @title Описание */
-  description?: string;
-}
+/**
+ * @title Пункты описания
+ * @default {"benefitType": "text"}
+ */
+export type TextBenefitDef = {
+  /**
+   * @title Описание
+   */
+  name?: string;
+  benefitType?: 'text';
+};
+
+/**
+ * @title Список
+ * @default {"benefitType": "list"}
+ */
+export type ListBenefitDef = {
+  /** @title Буллиты */
+  bullets?: boolean;
+  /**
+   * @title Пункты
+   * @example ["Пункт 1"]
+   */
+  items?: string[];
+  benefitType?: 'list';
+};
+
+/**
+ * @title Вид контента
+ */
+export type DescriptionType = EmptyOption | TextBenefitDef | ListBenefitDef;
 
 /**
  * @title Преимущество
  */
-export interface Benefit extends TextBenefit {
+export interface BenefitItem {
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: DescriptionType;
   icon?: Picture;
 }
 
 /**
  * @title Блок преимущества
  */
-export interface BenefitsBlockContent {
-  /** @title Заголовок */
-  title?: string;
-  /**
-   * @title Список преимуществ
-   * @maxItems 6
-   */
-  benefits?: Benefit[];
-}
+export type BenefitsBlockContent = HeadingContent &
+  HeadingTypeContent & {
+    /**
+     * @title Список преимуществ
+     * @maxItems 6
+     */
+    benefitList?: BenefitItem[];
+  };

package/src/components/Bonus/Bonus.fixture.tsx

@@ -11,20 +11,20 @@ export const BONUS: BonusContent = {
       name: '5 баллов за каждые 100 ₽',
       description:
         'Повышенное начисление баллов за операции оплаты товаров и услуг в сети АЗС Роснефть',
-      bonusCount: 5,
+      bonusCount: '5',
       bonusName: 'баллов',
     },
     {
       name: '1 балл за каждые 100 ₽',
       description: 'За остальные операции оплаты товаров и услуг',
-      bonusCount: 1,
+      bonusCount: '1',
       bonusName: 'балл',
     },
     {
       name: '300 приветственных баллов',
       description:
         'За операции оплаты товаров и услуг на общую сумму 1 000 рублей и более в течение первых двух месяцев после получения карты',
-      bonusCount: 300,
+      bonusCount: '300',
       bonusName: 'баллов',
     },
   ],

package/src/components/Bonus/BonusContent.ts

@@ -8,7 +8,7 @@ interface BonusItems {
   /** @title Описание плитки */
   description?: string;
   /** @title Количество баллов */
-  bonusCount?: number;
+  bonusCount?: string;
   /** @title Наименование */
   bonusName?: string;
 }

package/src/components/Insurance/Insurance.fixture.tsx

@@ -1,9 +1,9 @@
 import { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
-import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
+import type { InsuranceBenefit } from './InsuranceContent';
 import { Insurance } from './Insurance';
 
-const benefits: Benefit[] = [
+const benefits: InsuranceBenefit[] = [
   {
     label: 'Телесное повреждение',
     description: 'Описание',

package/src/components/Insurance/Insurance.tsx

@@ -3,8 +3,7 @@ import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
-import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
-import type { InsuranceContent } from './InsuranceContent';
+import type { InsuranceBenefit, InsuranceContent } from './InsuranceContent';
 
 export interface InsuranceProps extends InsuranceContent, UniBlockProps {}
 
@@ -36,7 +35,7 @@ export const Insurance = JSX<InsuranceProps>(
   },
 );
 
-function renderBenefit(benefit: Benefit, i: number) {
+function renderBenefit(benefit: InsuranceBenefit, i: number) {
   return (
     <div key={String(i)} className="flex items-center gap-5">
       {benefit?.icon ? (

package/src/components/Insurance/InsuranceContent.ts

@@ -1,12 +1,26 @@
 import type { Picture } from '../../model/Picture';
-import type { BenefitsBlockContent } from '../BenefitsBlock/BenefitsBlockContent';
 import type { InsuranceProps } from '../../model/Insurance';
 
-export type InsuranceContent = BenefitsBlockContent &
-  InsuranceProps & {
-    /** @title Заголовок */
-    title?: string;
-    /** @title Описание */
-    description?: string;
-    image?: Picture;
-  };
+/**
+ * @title Преимущество
+ */
+export interface InsuranceBenefit {
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: string;
+  icon?: Picture;
+}
+
+export type InsuranceContent = InsuranceProps & {
+  /** @title Заголовок */
+  title?: string;
+  /** @title Описание */
+  description?: string;
+  image?: Picture;
+  /**
+   * @title Список преимуществ
+   * @maxItems 6
+   */
+  benefits?: InsuranceBenefit[];
+};

package/src/components/PictureText/PictureText.tsx

@@ -1,11 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import type { PictureTextContent } from './PictureTextContent';
+import type { PictureTextContent, PictureTextBenefit } from './PictureTextContent';
 
 import { BlockVersion } from '../../model/BlockVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 export interface PictureTextProps extends PictureTextContent, UniBlockProps {}
 
@@ -43,7 +42,7 @@ export const PictureText = JSX<PictureTextProps>(
   },
 );
 
-function renderBenefit(benefit: Benefit, i: number, version: string) {
+function renderBenefit(benefit: PictureTextBenefit, i: number, version: string) {
   return (
     <div key={String(i)} className="flex flex-row mb-8">
       {benefit.icon ? (
@@ -56,7 +55,7 @@ function renderBenefit(benefit: Benefit, i: number, version: string) {
         />
       ) : null}
       <div className="flex gap-1 flex-col h-full ml-5 max-w-[490px]">
-        {benefit.label && (
+        {benefit?.label ? (
           <div
             className={`font-medium text-xl m-0 ${
               version === 'primary' ? 'text-primary-text' : ''
@@ -64,14 +63,14 @@ function renderBenefit(benefit: Benefit, i: number, version: string) {
           >
             {benefit.label}
           </div>
-        )}
-        {benefit.description && (
+        ) : null}
+        {benefit?.description ? (
           <div
             className={`font-normal text-sm ${version === 'primary' ? 'text-secondary-text' : ''}`}
           >
             {benefit.description}
           </div>
-        )}
+        ) : null}
       </div>
     </div>
   );

package/src/components/PictureText/PictureTextContent.ts

@@ -1,17 +1,25 @@
 import { BlockVersion } from '../../model/BlockVersion';
 import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
+import type { Picture } from '../../model/Picture';
 
 export type TitleWithImageContent = HeadingContent & ImageContent;
 
+export interface PictureTextBenefit {
+  icon?: Picture;
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: string;
+}
+
 /**
  * @title Картинка с текстом
  */
 export interface PictureTextContent extends TitleWithImageContent {
   version?: BlockVersion;
   /** @title Список преимуществ */
-  benefits?: Benefit[];
+  benefits?: PictureTextBenefit[];
   /**
    * @title Картинка справа/текст слева
    * @default false

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

@@ -1,8 +1,8 @@
 import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 import { ProductBlock } from './ProductBlock';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ProductBlockBenefit } from './ProductBlockContent';
 
 const title = 'Кредит до 5 000 000 Р\nбез залога и поручителей';
 const description =
@@ -25,7 +25,7 @@ const image: Picture = {
   ],
 };
 
-const benefits: Benefit[] = [
+const benefits: ProductBlockBenefit[] = [
   {
     label: 'До 5 млн ₽',
     description: 'Кредитный лимит',

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

@@ -1,9 +1,8 @@
 import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 import { ProductBlock } from './ProductBlock';
-import type { ProductBlockContent } from './ProductBlockContent';
+import type { ProductBlockContent, ProductBlockBenefit } from './ProductBlockContent';
 
 const image: Picture = {
   src: 'money-1.png',
@@ -15,7 +14,7 @@ const image: Picture = {
   },
 };
 
-const benefits: Benefit[] = [
+const benefits: ProductBlockBenefit[] = [
   {
     label: 'До 5 млн ₽',
     description: 'Кредитный лимит',

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -6,10 +6,18 @@ import type { DescriptionContent } from '../../ui-kit/Description/DescriptionCon
 import type { HeadingContent, HeadingTypeContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
-import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
+import { Picture } from '../../model/Picture';
+
+export interface ProductBlockBenefit {
+  icon?: Picture;
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: string;
+}
 
 export type BenefitItemProps = {
-  benefit: Benefit;
+  benefit: ProductBlockBenefit;
   version?: BlockVersion;
   benefitsVersion?: IconVersion;
 };
@@ -25,7 +33,7 @@ export type ProductBlockInnerContent = HeadingContent &
      * @minItems 2
      * @maxItems 3
      */
-    benefits?: Benefit[];
+    benefits?: ProductBlockBenefit[];
     benefitsVersion?: IconVersion;
     version?: BlockVersion;
     /**

package/src/components/ProductBlock/renderBenefit.tsx

@@ -27,13 +27,13 @@ export function renderBenefit(
           asSVG
         />
       ) : null}
-      <div className="flex gap-0.5 flex-col h-full max-w-[149px]  min-w-[149px]">
+      <div className="flex gap-0.5 flex-col h-full max-w-[149px] min-w-[149px]">
         <div className={`text-xl m-0 ${benefitTitleStyleMap[version]}`}>{benefit.label}</div>
-        {benefit.description && (
+        {benefit.description ? (
           <div className={`font-light text-m-md ${benefitDescStyleMap[version]}`}>
             {benefit.description}
           </div>
-        )}
+        ) : null}
       </div>
     </div>
   );

package/src/components/ProductTile/ProductTile.tsx

@@ -8,8 +8,7 @@ import { Img } from '../../ui-kit/Img/Img';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
-import type { TextBenefit } from '../BenefitsBlock/BenefitsBlockContent';
-import type { ProductTileContent } from './ProductTileContent';
+import type { ProductTileContent, TextBenefit } from './ProductTileContent';
 
 export interface ProductTileProps extends ProductTileContent, UniBlockProps {}
 

package/src/components/ProductTile/ProductTileContent.ts

@@ -3,7 +3,13 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
 import type { HeadingContent, HeadingTypeContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { TextBenefit } from '../BenefitsBlock/BenefitsBlockContent';
+
+export interface TextBenefit {
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: string;
+}
 
 /**
  * @title Продуктовая плитка