@redneckz/wildless-cms-uni-blocks 0.3.85 → 0.3.86

package/src/components/ProductGallery/ProductGallery.fixture.tsx

@@ -69,7 +69,7 @@ export default {
             productBlock: {
               title: 'Кредит по одному документу',
               description: 'Ставка от 5,5% годовых',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons,
               image: percentImage,
@@ -82,7 +82,7 @@ export default {
             },
             productBlock: {
               title: 'Ставка от 12,5% годовых на срок до 3 лет!',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons,
               image: worker,
@@ -95,7 +95,7 @@ export default {
             },
             productBlock: {
               title: 'Дополнительные бонусные баллы за покупки!',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons,
               image: creditCard,
@@ -108,7 +108,7 @@ export default {
             },
             productBlock: {
               title: 'Карты Unionpay',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons,
               image: creditCard,
@@ -133,7 +133,7 @@ export default {
             productBlock: {
               title: 'Кредит по одному документу',
               description: 'Кредит наличными без залога и поручительства, только по паспорту',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons: buttonsSecondary,
               image: percentImage,
@@ -146,7 +146,7 @@ export default {
             },
             productBlock: {
               title: 'Ставка от 12,5% годовых на срок до 3 лет!',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons: buttonsSecondary,
               image: worker,
@@ -159,7 +159,7 @@ export default {
             },
             productBlock: {
               title: 'Дополнительные бонусные баллы за покупки!',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons: buttonsSecondary,
               image: creditCard,
@@ -172,7 +172,7 @@ export default {
             },
             productBlock: {
               title: 'Карты Unionpay',
-              headingType: 'h2',
+              headlineVersion: 'L',
               items,
               buttons: buttonsSecondary,
               image: creditCard,

package/src/components/ProductGallery/ProductGalleryBlock.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
+import type { HeadlineProps } from '../../model/HeadlineType';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../types';
-import { HeadingType } from '../../ui-kit/Heading/HeadingContent';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
-import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
 
 const productGalleryStyleMap: Record<BlockVersion, string> = {
   primary: 'bg-white text-primary-text',
@@ -11,12 +11,12 @@ const productGalleryStyleMap: Record<BlockVersion, string> = {
 };
 
 export interface ProductGalleryBlockProps extends UniBlockProps {
-  headingType?: HeadingType;
+  headlineVersion?: HeadlineProps;
   block?: ProductBlockInnerContent;
 }
 
 export const ProductGalleryBlock = JSX<ProductGalleryBlockProps>(
-  ({ block, headingType, context, className = '' }) => {
+  ({ block, context, className = '' }) => {
     const version = block?.version ?? 'primary';
 
     return (
@@ -25,7 +25,7 @@ export const ProductGalleryBlock = JSX<ProductGalleryBlockProps>(
         role="listitem"
       >
         <div className="flex grow">
-          <ProductBlockInner context={context} headingType={headingType || 'h2'} {...block} />
+          <ProductBlockInner context={context} {...block} />
         </div>
       </section>
     );

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

@@ -1,6 +1,6 @@
 {
   "title": "Продуктовая плитка",
-  "headingType": "h3",
+  "headlineVersion": "S",
   "description": "Описание",
   "image": {
     "format": "webp",

package/src/components/ProductTile/ProductTile.fixture.tsx

@@ -85,7 +85,7 @@ const buttons3: ButtonProps[] = [
 
 export const PRODUCT_TILE: ProductTileContent = {
   title: 'Акция! “Кредит На все, что хочется!”',
-  headingType: 'h3',
+  headlineVersion: 'S',
   description: 'Потребительский кредит на любые цели, без залога и поручительства',
   benefits,
   buttons: buttons,
@@ -93,7 +93,7 @@ export const PRODUCT_TILE: ProductTileContent = {
 };
 export const PRODUCT_PENSION_TILE: ProductTileContent = {
   title: 'Кредит пенсионный',
-  headingType: 'h3',
+  headlineVersion: 'S',
   description: 'Для людей в возрасте до 75 лет',
   benefits,
   buttons: buttons2,
@@ -111,7 +111,6 @@ export default {
         context={context}
         className="col-span-6"
         title="Акция! “Пенсионный кредит”"
-        headingType="h3"
         description={'Потребительский кредит на любые цели, без залога и поручительства'}
         benefits={benefits}
         buttons={buttons2}
@@ -125,7 +124,6 @@ export default {
         context={context}
         className="col-span-8"
         title="Кредит под залог недвижимости"
-        headingType="h3"
         description={'Без переоформления залогой недвижимости на банк'}
         benefits={benefits}
         buttons={buttons2}
@@ -139,7 +137,6 @@ export default {
         context={context}
         className="col-span-4"
         title="Кредит пенсионный"
-        headingType="h3"
         description={'Для людей в возрасте до 75 лет'}
         benefits={benefits}
         buttons={buttons2}
@@ -152,7 +149,6 @@ export default {
         context={context}
         className="col-span-6"
         title="Ипотечное страхование"
-        headingType="h3"
         description={'Финансовая защита заемщиков в случае непредвиденных обстоятельств'}
         additionalDescription={
           'Страховая сумма и страховой взнос зависит от остатка задолженности по ипотеке'

package/src/components/ProductTile/ProductTile.tsx

@@ -3,12 +3,11 @@ import type { BlockVersion } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 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 { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import type { ProductTileContent, TextBenefit } from './ProductTileContent';
+import { Headline } from '../Headline/Headline';
 
 export interface ProductTileProps extends ProductTileContent, UniBlockProps {}
 
@@ -22,7 +21,7 @@ export const ProductTile = JSX<ProductTileProps>(
     context,
     className = '',
     title,
-    headingType = 'h3',
+    headlineVersion = 'S',
     description,
     additionalDescription,
     benefits,
@@ -40,17 +39,13 @@ export const ProductTile = JSX<ProductTileProps>(
         {...rest}
       >
         <div className="z-[1]">
-          {title ? (
-            <Heading
-              headingType={headingType}
-              as="h3"
-              title={title}
-              className={`whitespace-pre-wrap text-h4`}
-            />
-          ) : null}
-          {description ? (
-            <Description className="mt-2 text-md font-light" description={description} />
-          ) : null}
+          <Headline
+            context={context}
+            className="!p-0"
+            title={title}
+            description={description}
+            headlineVersion={headlineVersion}
+          />
           {renderBenefits(benefits || [], version)}
           {additionalDescription
             ? renderAdditionalDescription(additionalDescription, version)
@@ -73,7 +68,7 @@ function renderBenefits(benefits: TextBenefit[], version: BlockVersion) {
   return (
     <div className="flex mt-4">
       {benefits.length ? (
-        <div className="mr-6 gap-2.5 text-title-2xs">{benefits.map(renderBenefitLabel)}</div>
+        <div className="mr-6 gap-2.5 text-h6">{benefits.map(renderBenefitLabel)}</div>
       ) : null}
       {benefits.length ? (
         <div className="pt-1 text-m">

package/src/components/ProductTile/ProductTileContent.ts

@@ -1,7 +1,6 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 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 { HeadlineProps } from '../../model/HeadlineType';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 export interface TextBenefit {
@@ -14,9 +13,7 @@ export interface TextBenefit {
 /**
  * @title Продуктовая плитка
  */
-export type ProductTileContent = HeadingContent &
-  HeadingTypeContent &
-  DescriptionContent &
+export type ProductTileContent = HeadlineProps &
   ButtonContent &
   ImageContent & {
     version?: BlockVersion;

package/src/components/PromoTile/PromoTile.tsx

@@ -3,12 +3,12 @@ import type { BlockVersion } from '../../model/BlockVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { getTileHeadingType } from '../BaseTile/getTileHeadingType';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import type { PromoTileContent } from './PromoTileContent';
+import { Headline } from '../Headline/Headline';
 
 export interface PromoTileProps extends PromoTileContent, UniBlockProps {}
 
@@ -40,11 +40,15 @@ export const PromoTile = JSX<PromoTileProps>(
           context={context}
           title={
             title ? (
-              <Heading
-                headingType={getTileHeadingType(className)}
-                title={title}
-                className={`whitespace-pre-wrap max-w-[600px]`}
-              />
+              <div>
+                <Headline
+                  context={context}
+                  title={title}
+                  className={`!p-0 max-w-[600px]`}
+                  headlineVersion={getTileHeadingType(className)}
+                  bgColorHeadline={version}
+                />
+              </div>
             ) : null
           }
           buttons={

package/src/components/PromoTile/PromoTileContent.ts

@@ -1,13 +1,13 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
-import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
-import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
+import type { DescriptionProp } from '../../model/HeadlineType';
+import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 
 /**
  * @title Акции
  */
-export type PromoTileContent = HeadingContent &
-  DescriptionContent &
+export type PromoTileContent = HeadingCommonProps &
+  DescriptionProp &
   ButtonContent & {
     /** @title Дата публикации */
     date?: string;

package/src/components/Recommendation/RecommendationContent.ts

@@ -1,15 +1,11 @@
 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 { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
 
-export interface RecommendationCardTypes
-  extends HeadingContent,
-    DescriptionContent,
-    ListContent,
-    ImageContent {
+export interface RecommendationCardTypes extends HeadlineCommonProps, ListContent, ImageContent {
   /**
    * @title Соц сети
    * @minItems 3
@@ -20,7 +16,7 @@ export interface RecommendationCardTypes
 /**
  * @title Рекомендации
  */
-export interface RecommendationContent extends HeadingContent {
+export interface RecommendationContent extends HeadingCommonProps {
   /** @title Карточки */
   recommendations?: RecommendationCardTypes[];
   version?: BlockVersion;

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

@@ -41,7 +41,7 @@ export const StepsBlock = JSX<StepsBlockProps>(
           <Heading headingType="h3" className={`text-center ${styleMap.title}`} title={title} />
         ) : null}
         {description ? (
-          <p className={`text-m-md text-center ${styleMap.description} ${title ? 'mt-2' : ''}`}>
+          <p className={`text-m text-center ${styleMap.description} ${title ? 'mt-2' : ''}`}>
             {description}
           </p>
         ) : null}
@@ -84,9 +84,7 @@ const renderStepTitle =
               <div className="font-medium text-m-title-xs m-0 text-left mb-1">{step.label}</div>
             ) : null}
             {step.description ? (
-              <div className={`font-normal text-sm ${styleMap.description} text-left`}>
-                {step.description}
-              </div>
+              <div className={`text-s ${styleMap.description} text-left`}>{step.description}</div>
             ) : null}
           </div>
         </div>

package/src/components/StepsBlock/StepsBlock.tsx

@@ -41,7 +41,12 @@ export const StepsBlock = JSX<StepsBlockProps>(
         {...rest}
       >
         {title ? (
-          <Heading headingType="h2" className="max-w-[47rem] text-center mb-9" title={title} />
+          <Heading
+            headingType="h3"
+            as="h2"
+            className="max-w-[47rem] text-center mb-9"
+            title={title}
+          />
         ) : null}
         {steps?.length ? (
           <div className="box-border">
@@ -50,7 +55,7 @@ export const StepsBlock = JSX<StepsBlockProps>(
                 steps.map(renderStepIcon(styleMap)),
               )}
             </div>
-            <div className={`flex justify-between ${stepGap}`}>
+            <div className={`flex justify-between whitespace-pre-line ${stepGap}`}>
               {steps.map(renderStepTitle(styleMap, Boolean(button?.text)))}
             </div>
           </div>
@@ -67,14 +72,14 @@ const renderStepIcon =
   (styleMap: StyleType) =>
   ({ icon }: Step, i: number) => {
     return (
-      <div key={String(i)} className="flex flex-col items-center text-center relative">
+      <div key={String(i)} className="flex flex-col items-center text-center">
         <div
-          className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 ${styleMap.iconBackground}`}
+          className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 flex justify-center items-center ${styleMap.iconBackground}`}
         >
           {checkIsIconRenderable(icon) ? (
             <Img image={icon} width="48" height="48" asSVG />
           ) : (
-            <span className={`font-normal text-title-sm ${styleMap.title}`}>{i + 1}</span>
+            <span className={`text-h4 ${styleMap.iconText}`}>{i + 1}</span>
           )}
         </div>
       </div>
@@ -85,23 +90,19 @@ const renderStepTitle = (styleMap: StyleType, isMainButton: boolean) => (step: S
   return (
     <div
       key={String(i)}
-      className="flex flex-col items-center justify-between text-center relative w-[276px] whitespace-pre-line overflow-hidden"
+      className="flex flex-col items-center justify-between text-center w-[276px] overflow-hidden"
     >
       <div>
-        {step.label ? <div className="font-normal text-xl-light m-0 mt-4">{step.label}</div> : null}
+        {step.label ? <div className="text-xl m-0 mt-4">{step.label}</div> : null}
         {step.description ? (
-          <div
-            className={`font-light text-base ${styleMap.description} ${
-              step.label ? 'mt-2' : 'mt-4'
-            }`}
-          >
+          <div className={`text-l ${styleMap.description} ${step.label ? 'mt-2' : 'mt-4'}`}>
             {step.description}
           </div>
         ) : null}
       </div>
       {step?.button?.text && !isMainButton ? (
         <Button
-          className="box-border mt-8 py-3 h-12 w-full max-w-[240px]"
+          className="mt-8 py-4 w-full max-w-[240px]"
           version="primary"
           href={step?.button?.href}
         >

package/src/components/StepsBlock/StepsBlockStyleMaps.ts

@@ -4,6 +4,7 @@ export type StyleType = {
   background: string;
   title: string;
   description: string;
+  iconText: string;
   iconBackground: string;
   iconConnector: string;
 };
@@ -13,13 +14,15 @@ const STEPS_BLOCK_STYLE_MAPS: Record<BlockVersion, StyleType> = {
     background: 'bg-white',
     title: 'text-primary-text',
     description: 'text-secondary-text',
-    iconBackground: 'bg-secondary-light',
+    iconText: 'text-secondary-text',
+    iconBackground: 'bg-main-divider',
     iconConnector: 'bg-secondary-light',
   },
   secondary: {
     background: 'bg-primary-main',
     title: 'text-white',
     description: 'text-white/80',
+    iconText: 'text-white',
     iconBackground: 'bg-white/30',
     iconConnector: 'bg-white',
   },

package/src/components/TariffsTable/TariffsTableContent.ts

@@ -1,11 +1,10 @@
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
-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';
 import type { CellData } from '../ComparisonTable/ComparisonTableContent';
+import type { HeadlineCommonProps, TitleProp } from '../../model/HeadlineType';
 
 /**
  * @title Ряд
@@ -43,24 +42,23 @@ export type TariffsTableCellData = CellData &
 /**
  * @title Параметр
  */
-export type TariffsTableRowHeader = HeadingContent & {
+export type TariffsTableRowHeader = TitleProp & {
   icon?: Picture;
 };
 
 /**
  * @title Таблица тарифов
  */
-export type TariffsTableContent = HeadingContent &
-  DescriptionContent & {
-    /** @title Колонки */
-    columns?: TariffsTableColumn[];
-    /** @title Параметры */
-    rowHeaders?: TariffsTableRowHeader[];
-    /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
-    orientation?: ListOrientation;
-    /** @title Скрывать строк */
-    hiddenRowsNum?: number;
-  };
+export type TariffsTableContent = HeadlineCommonProps & {
+  /** @title Колонки */
+  columns?: TariffsTableColumn[];
+  /** @title Параметры */
+  rowHeaders?: TariffsTableRowHeader[];
+  /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
+  orientation?: ListOrientation;
+  /** @title Скрывать строк */
+  hiddenRowsNum?: number;
+};
 
 /** @hidden */
 export type TariffsTableTileCellProps = {

package/src/components/Tile/Tile.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
+import type { TileContent } from './TileContent';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -10,7 +11,6 @@ import { List } from '../../ui-kit/List/List';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
-import type { TileContent } from './TileContent';
 
 export interface TileProps extends TileContent, UniBlockProps {
   role?: string;
@@ -37,8 +37,6 @@ export const Tile = JSX<TileProps>((props) => {
     ...rest
   } = props;
 
-  const headingTextClassName = version === 'primary' ? 'text-primary-text' : '';
-
   return (
     <BlockWrapper
       context={context}
@@ -55,7 +53,8 @@ export const Tile = JSX<TileProps>((props) => {
               headingType={headingType}
               as="h3"
               title={title}
-              className={`whitespace-pre-wrap max-w-[600px] mb-3 ${headingTextClassName}`}
+              className={`whitespace-pre-wrap max-w-[600px] text-h4
+              ${version === 'primary' ? 'text-primary-text' : ''}`}
             />
           ) : null
         }
@@ -68,13 +67,10 @@ export const Tile = JSX<TileProps>((props) => {
             />
           ) : null
         }
-        image={image?.src && <Img className="mt-auto ml-7" image={image} />}
+        image={image?.src ? <Img className="mt-auto ml-7" image={image} /> : null}
       >
         {description ? (
-          <Description
-            className="max-w-[600px] text-title-new-sm font-light"
-            description={description}
-          />
+          <Description className="max-w-[600px] text-xl-light mt-2" description={description} />
         ) : null}
         {children}
         {renderList(items, version, isDotted)}
@@ -90,7 +86,7 @@ function renderList(items, version, isDotted: boolean) {
     <List
       items={items}
       isDotted={isDotted}
-      itemClassName="text-title-2xs font-light mt-2"
+      itemClassName="text-h6 font-light mt-2"
       version={listVersion}
     />
   ) : null;

package/src/components/Tile/TileContent.ts

@@ -1,16 +1,15 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 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 { DescriptionProp } from '../../model/HeadlineType';
+import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
 /**
  * @title Плитка
  */
-export type TileContent = HeadingContent &
-  HeadingTypeContent &
-  DescriptionContent &
+export type TileContent = HeadingCommonProps &
+  DescriptionProp &
   ListContent &
   ButtonContent &
   ImageContent & {