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

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

@@ -40,6 +40,7 @@ export const TextBlock = JSX<TextBlockProps>(
     isDotted = true,
   }) => {
     const textBlockStyleMap = textBlockStyleMaps[blockVersion];
+    const listBlockVersion = blockVersion === 'secondary' ? 'secondary' : 'gray';
 
     return (
       <section
@@ -59,7 +60,7 @@ export const TextBlock = JSX<TextBlockProps>(
               className="mt-1 text-m-md"
               items={items}
               isDotted={isDotted}
-              version={blockVersion === 'secondary' ? 'secondary' : 'gray'}
+              version={listBlockVersion}
             />
           ) : null}
         </div>

package/src/components/TextBlock/TextBlock.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { Picture } from '../../model/Picture';
-import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
 import type { TextBlockContent, TextBlockVersion } from './TextBlockContent';
 

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

@@ -1,7 +1,6 @@
 {
   "title": "Плитка",
   "headingType": "h3",
-  "titleSize": "M",
   "description": "Описание",
   "image": {
     "format": "webp",

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;
@@ -53,7 +53,7 @@ export const Tile = JSX<TileProps>((props) => {
               headingType={headingType}
               as="h3"
               title={title}
-              className={`whitespace-pre-wrap max-w-[600px] ${title ? 'mb-3' : ''}
+              className={`whitespace-pre-wrap max-w-[600px] text-h4
               ${version === 'primary' ? 'text-primary-text' : ''}`}
             />
           ) : null
@@ -67,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)}
@@ -83,12 +80,14 @@ export const Tile = JSX<TileProps>((props) => {
 });
 
 function renderList(items, version, isDotted: boolean) {
+  const listVersion = version === 'primary' ? 'tile' : 'tile-white';
+
   return items?.length ? (
     <List
       items={items}
       isDotted={isDotted}
-      itemClassName="text-title-2xs font-light mt-2"
-      version={version === 'primary' ? 'tile' : 'tile-white'}
+      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 & {