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

package/mobile/src/components/LinkDocs/LinkDocsContent.ts

@@ -27,7 +27,7 @@ export interface LinkDocsContent {
   /** @title Заголовок */
   title?: string;
   /** @title Описание */
-  subtitle?: string;
+  description?: string;
   /** @title Название иконки */
   icon?: Picture;
   /** @title Список */

package/mobile/src/components/LinkDocs/LinkDocsHorizontalList.tsx

@@ -11,7 +11,7 @@ export interface LinkDocsHorizontalListProps extends LinkDocsVerticalListProps {
 export const LinkDocsHorizontalList = JSX<LinkDocsHorizontalListProps>(
   ({ context, hasBorder = true, documents, icon }) => {
     return (
-      <SwipeListControl context={context} className="text-m-sm text-primary-main">
+      <SwipeListControl context={context} className="text-m-sm text-primary-main mt-5">
         {documents?.length
           ? documents.map((doc, i) => (
               <LinkDocsListItem

package/mobile/src/components/LinkDocs/LinkDocsVerticalList.tsx

@@ -13,7 +13,9 @@ export const LinkDocsVerticalList = JSX<LinkDocsVerticalListProps>(
   ({ hasBorder = true, documents, icon }) => {
     return (
       <div
-        className={`text-m-sm text-primary-main flex flex-col ${hasBorder ? 'gap-3.5' : 'gap-2'}`}
+        className={`text-m-sm text-primary-main flex flex-col mt-5 ${
+          hasBorder ? 'gap-3.5' : 'gap-2'
+        }`}
         role="list"
       >
         {documents?.length

package/mobile/src/components/LinkDocs/linkDocsContentExample.ts

@@ -2,7 +2,7 @@ import type { LinkDocsContent } from './LinkDocsContent';
 
 export const linkDocsContentExample: LinkDocsContent = {
   title: 'Дополнительные документы',
-  subtitle: 'Ответы на часто задаваемые вопросы',
+  description: 'Ответы на часто задаваемые вопросы',
   documents: [
     { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
     { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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 Продуктовая плитка

package/mobile/src/react/IntersectionObserverTag.tsx

@@ -1,7 +1,7 @@
-import { FC, useCallback, useRef } from 'react';
-import { IntersectionObserverTagProps } from '../components/ContentPage/ContentPageContext';
+import { useCallback, useRef } from 'react';
+import { IntersectionObserverComponent } from '../components/ContentPage/ContentPageContext';
 
-export const IntersectionObserverTag: FC<IntersectionObserverTagProps> = (props) => {
+export const IntersectionObserverTag: IntersectionObserverComponent = (props) => {
   const { Tag, observerCallback, observerOptions, children, ...rest } = props;
 
   const intersectionObserver = useRef<IntersectionObserver>();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.3.71",
+  "version": "0.3.73",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

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

@@ -1,14 +1,22 @@
 {
   "title": "Преимущества",
-  "benefits": [
+  "benefitList": [
     {
       "label": "Преимущество №1",
+      "description": {
+        "name": "Описание 1",
+        "benefitType": "description"
+      },
       "icon": {
         "icon": "ClockIcon"
       }
     },
     {
       "label": "Преимущество №2",
+      "description": {
+        "name": "Описание 2",
+        "benefitType": "description"
+      },
       "icon": {
         "icon": "SignDocsIcon"
       }

package/src/components/BenefitsBlock/BenefitsBlock.fixture.tsx

@@ -2,35 +2,98 @@ import { context } from '../../react/setup-fixture';
 
 import { BenefitsBlock } from './BenefitsBlock';
 
+const itemsList = [
+  'Комиссия за выдачу',
+  'кредита не взимается',
+  'Допускается полное или',
+  'частичное погашение кредита',
+];
+
 export default {
-  default: (
+  description: (
+    <div className="container grid grid-cols-12">
+      <BenefitsBlock
+        context={context}
+        className="col-span-12"
+        title="Преимущества кредита"
+        benefitList={[
+          {
+            label: 'Без комиссии',
+            description: {
+              name: 'Комиссия за выдачу кредита не взимается. Допускается полное или частичное погашение кредита',
+              benefitType: 'text',
+            },
+            icon: { icon: 'ClockIcon' },
+          },
+          {
+            label: 'Оформление по паспорту',
+            description: {
+              name: 'Обеспечение не требуется. Кредит можно получить на любые цели',
+              benefitType: 'text',
+            },
+            icon: { icon: 'SignDocsIcon' },
+          },
+          {
+            label: 'Без залога и поручительства',
+            description: {
+              name: 'Единовременное перечисление суммы кредита в полном объёме на текущий счет в Банке',
+              benefitType: 'text',
+            },
+            icon: { icon: 'ComfortableCompIcon' },
+          },
+          {
+            label: 'Деньги за 3 дня',
+            description: {
+              name: 'Рассмотрение заявки с момента предоставления полного комплекта документов',
+              benefitType: 'text',
+            },
+            icon: { icon: 'ActualBalanceIcon' },
+          },
+        ]}
+      />
+    </div>
+  ),
+  list: (
     <div className="container grid grid-cols-12">
       <BenefitsBlock
         context={context}
         className="col-span-12"
         title="Преимущества кредита"
-        benefits={[
+        benefitList={[
           {
             label: 'Без комиссии',
-            description:
-              'Комиссия за выдачу кредита не взимается. Допускается полное или частичное погашение кредита',
             icon: { icon: 'ClockIcon' },
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
           },
           {
             label: 'Оформление по паспорту',
-            description: 'Обеспечение не требуется. Кредит можно получить на любые цели',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
             icon: { icon: 'SignDocsIcon' },
           },
           {
             label: 'Без залога и поручительства',
-            description:
-              'Единовременное перечисление суммы кредита в полном объёме на текущий счет в Банке',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
             icon: { icon: 'ComfortableCompIcon' },
           },
           {
             label: 'Деньги за 3 дня',
-            description:
-              'Рассмотрение заявки с момента предоставления полного комплекта документов',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
             icon: { icon: 'ActualBalanceIcon' },
           },
         ]}

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/ComparisonTable/ComparisonTable.fixture.mobile.tsx

@@ -21,15 +21,6 @@ const image2: Picture = {
   },
 };
 
-const image3: Picture = {
-  src: 'card-3.png',
-  format: 'webp',
-  size: {
-    width: 100,
-    height: 63,
-  },
-};
-
 const rowHeaders = [
   { title: 'Начисление процентов на остаток по счету' },
   { title: 'Начисление процентов на остаток по счету' },

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

@@ -22,11 +22,6 @@ export const TableCell = JSX<TableCellProps>(({ cell, rowHeader, isFillGradient
   );
 });
 
-const labelStyle = (isFillGradient = false): string =>
-  `text-right ${isFillGradient ? 'text-white' : ''}`;
-const descriptionStyle = (isFillGradient = false): string =>
-  `text-right ${isFillGradient ? 'text-white/80' : 'text-secondary-text'}`;
-
 const renderCellInner =
   (isFillGradient: boolean, rowHeader?: string) =>
   ({ label, description }: CellData, i: number) =>
@@ -36,9 +31,15 @@ const renderCellInner =
           {rowHeader}
         </div>
         <div className="basis-1/2">
-          {label ? <div className={labelStyle(isFillGradient)}>{label}</div> : null}
+          {label ? (
+            <div className={`text-right ${isFillGradient ? 'text-white' : ''}`}>{label}</div>
+          ) : null}
           {description ? (
-            <div className={descriptionStyle(isFillGradient)}>{description}</div>
+            <div
+              className={`text-right ${isFillGradient ? 'text-white/80' : 'text-secondary-text'}`}
+            >
+              {description}
+            </div>
           ) : null}
         </div>
       </div>

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

@@ -1457,7 +1457,7 @@
       "anchor": "documents",
       "content": {
         "title": "Дополнительные документы",
-        "subtitle": "Ответы на часто задаваемые вопросы",
+        "description": "Ответы на часто задаваемые вопросы",
         "icon": {
           "icon": "DocIcon"
         },

package/src/components/ContentPage/ContentPageContext.tsx

@@ -42,6 +42,10 @@ export interface IntersectionObserverTagProps {
   observerOptions?: IntersectionObserverInit;
 }
 
+export type IntersectionObserverComponent = (
+  props: IntersectionObserverTagProps & Record<string, any>,
+) => VNode;
+
 export interface ContentPageContext {
   useRouter: () => Router;
   useState: SetStateHook;
@@ -50,5 +54,5 @@ export interface ContentPageContext {
   useLikeService: () => LikeService;
   useSearch: () => Search;
   handlerDecorator?: HandlerDecorator;
-  IntersectionObserverTag: (props: IntersectionObserverTagProps & Record<string, any>) => VNode;
+  IntersectionObserverTag: IntersectionObserverComponent;
 }

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

@@ -17,13 +17,6 @@ const image: Picture = {
   title: 'money',
 };
 
-const buttonPrimary: ButtonCommonProps = {
-  href: '/credit-cards',
-  text: 'Подробнее',
-  target: '_blank',
-  version: 'secondary',
-  icon: { icon: 'BankIcon' },
-};
 const link: ButtonCommonProps = {
   href: '/credit-cards',
   text: 'Подробнее',

package/src/components/Headline/Headline.mobile.tsx

@@ -19,7 +19,7 @@ export const Headline = JSX<HeadlineProps>(
   }) => {
     const STYLE_MAPS = HEADLINE_BLOCK_STYLE_MAPS[bgColorHeadline];
     return (
-      <section className={`px-4 py-6 ${STYLE_MAPS.background} ${className}`}>
+      <section className={`px-4 py-6 flex flex-col gap-2.5 ${STYLE_MAPS.background} ${className}`}>
         {title ? (
           <Heading
             headingType="h2"
@@ -29,15 +29,13 @@ export const Headline = JSX<HeadlineProps>(
         ) : null}
         {description ? (
           <p
-            className={`font-normal text-m-md ${STYLE_MAPS.description} ${ALIGN_TEXT[align]} ${
-              title ? 'mt-2.5' : ''
-            }`}
+            className={`font-normal text-m-md ${STYLE_MAPS.description} ${ALIGN_TEXT[align]}            `}
           >
             {description}
           </p>
         ) : null}
         {image?.src && (
-          <div className="mt-5 mx-auto flex justify-center">
+          <div className="mt-2.5 mx-auto flex justify-center">
             <Img image={image} />
           </div>
         )}