@redneckz/wildless-cms-uni-blocks 0.8.22 → 0.8.23

package/src/components/Carousel/CarouselContent.ts

@@ -1,7 +1,9 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
+
 /**
  * @title Карусель
  */
-export interface CarouselContent {
+export type CarouselContent = UniBlockContent & {
   /**
    * @title Количество видимых карточек
    * @enumNames ["auto", "1", "2", "3"]
@@ -18,4 +20,4 @@ export interface CarouselContent {
   isCyclic?: boolean;
   /** @title Внутренний отступ  */
   isPadding?: boolean;
-}
+};

package/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.tsx

@@ -11,7 +11,7 @@ interface CarouselBankHistoryCardProps extends CarouselBankHistoryCardContent, U
 }
 
 export const CarouselBankHistoryCard = JSX<CarouselBankHistoryCardProps>(
-  ({ title, description, blocksLength = 0, activeIndex, options, ...rest }) => {
+  ({ title, description, blocksLength = 0, activeIndex, options }) => {
     const orderNumber = Number(options?.key?.split('-').slice(-1)[0]) || 0;
     const isActive = orderNumber === activeIndex;
 

package/src/components/CarouselBankHistoryCard/CarouselBankHistoryCardContent.ts

@@ -1,9 +1,7 @@
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+
 /**
  * @title Карточка карусели истории банка
  */
-export interface CarouselBankHistoryCardContent {
-  /** @title Заголовок */
-  title?: string;
-  /** @title Описание */
-  description?: string;
-}
+export type CarouselBankHistoryCardContent = UniBlockContent & HeadlineCommonProps;

package/src/components/CarouselCard/CarouselCardContent.ts

@@ -1,18 +1,20 @@
-import type { SizeVersion } from '../../model/SizeVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { SizeVersion } from '../../model/SizeVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Карточка карусели
  */
-export interface CarouselCardContent extends HeadlineCommonProps {
-  /**
-   * @title Кнопка
-   * @default {
-   *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
-   *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
-   * }
-   */
-  button?: ButtonWithIconProps;
-  carouselVersion?: SizeVersion;
-}
+export type CarouselCardContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /**
+     * @title Кнопка
+     * @default {
+     *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+     *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
+     * }
+     */
+    button?: ButtonWithIconProps;
+    carouselVersion?: SizeVersion;
+  };

package/src/components/CarouselCatalogCard/CarouselCatalogCardContent.ts

@@ -1,5 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
@@ -7,7 +7,8 @@ import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 /**
  * @title Карточка каталога
  */
-export type CarouselCatalogCardContent = HeadlineCommonProps &
+export type CarouselCatalogCardContent = UniBlockContent &
+  HeadlineCommonProps &
   ImageContent & {
     /** @title Цена в рублях */
     price?: number;
@@ -21,5 +22,4 @@ export type CarouselCatalogCardContent = HeadlineCommonProps &
      * }
      */
     button?: ButtonWithIconProps;
-    version?: BlockVersion;
   };

package/src/components/CarouselEventCard/CarouselEventCardContent.ts

@@ -1,12 +1,13 @@
 import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
+import type { IconProps } from '../../model/Picture';
 
 /**
  * @title Карточка мероприятия в карусели
  */
-export type CarouselEventCardContent = TitleProps &
+export type CarouselEventCardContent = UniBlockContent &
+  TitleProps &
   DescriptionProps &
-  LinkCommonProps & {
-    icon?: Picture;
-  };
+  LinkCommonProps &
+  IconProps;

package/src/components/CarouselInvestmentCard/CarouselInvestmentCardContent.ts

@@ -1,5 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { AdditionalDescriptionProps, HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 
 /**
@@ -21,29 +21,28 @@ export interface CardsListItem {
 /**
  * @title Карточка галереи инвестиций
  */
-export interface CarouselInvestmentCardContent extends HeadlineCommonProps {
-  /** @title Доп. описание карточки  */
-  additionalDescription?: string;
-  /** @default 1 */
-  columnsMode?: CardColumnsMode;
-  /**
-   * @title Список
-   */
-  cardsList?: CardsListItem[];
-  /**
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 290
-   *   },
-   *   "sources": [{
-   *       "media": 1279,
-   *       "width": 174,
-   *       "format": "webp",
-   *       "alignment": "southeast"
-   *   }]
-   * }
-   */
-  image?: Picture;
-  version?: BlockVersion;
-}
+export type CarouselInvestmentCardContent = UniBlockContent &
+  HeadlineCommonProps &
+  AdditionalDescriptionProps & {
+    /** @default 1 */
+    columnsMode?: CardColumnsMode;
+    /**
+     * @title Список
+     */
+    cardsList?: CardsListItem[];
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 290
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *       "width": 174,
+     *       "format": "webp",
+     *       "alignment": "southeast"
+     *   }]
+     * }
+     */
+    image?: Picture;
+  };

package/src/components/CarouselLinks/CarouselLinks.example.json

@@ -51,5 +51,6 @@
       "text": "Текст",
       "href": "#"
     }
-  ]
+  ],
+  "version": "secondary"
 }

package/src/components/CarouselLinks/CarouselLinks.fixture.tsx

@@ -22,6 +22,7 @@ export default {
       title="О Банке"
       description={description}
       additionalDescription={additionalDescription}
+      version="secondary"
       block={{ type: 'Carousel', blocks: new Array(3).fill(link).flat() }}
     />
   ),

package/src/components/CarouselLinks/CarouselLinks.tsx

@@ -13,19 +13,10 @@ export interface CarouselLinksProps extends CarouselLinksContent, UniBlockProps
 const MAX_LINKS_COUNT = 10;
 
 export const CarouselLinks = JSX<CarouselLinksProps>(
-  ({
-    className = '',
-    additionalDescription,
-    description,
-    links,
-    title,
-    version = 'secondary',
-    ...rest
-  }) => {
+  ({ className = '', additionalDescription, description, links, title, ...rest }) => {
     return (
       <BlockWrapper
         className={`flex w-full p-10 overflow-hidden justify-between ${className}`}
-        version={version}
         {...rest}
       >
         <div className="flex flex-col max-w-96 pr-9 text-white text-xl-light">
@@ -53,7 +44,6 @@ const renderLinks = (links: LinkProps[]) => {
 
   return (
     <Carousel
-      version=""
       className="min-w-[832px] w-[832px]"
       isBlur={false}
       isCyclic={true}

package/src/components/CarouselLinks/CarouselLinksContent.ts

@@ -1,10 +1,11 @@
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { AdditionalDescriptionProps, HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 
 /** @title Карусель с ссылками */
-export interface CarouselLinksContent extends HeadlineCommonProps {
-  /** @title Дополнительное описание */
-  additionalDescription?: string;
-  /** @title Ссылки */
-  links?: LinkProps[];
-}
+export type CarouselLinksContent = UniBlockContent &
+  HeadlineCommonProps &
+  AdditionalDescriptionProps & {
+    /** @title Ссылки */
+    links?: LinkProps[];
+  };

package/src/components/CarouselProductCard/CarouselProductCardContent.ts

@@ -1,5 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { HeadlineSmallProps } from '../../model/HeadlineType';
+import type { AdditionalDescriptionProps, HeadlineSmallProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
@@ -15,37 +15,36 @@ export interface ListProps {
 /**
  * @title Карточка продуктовой карусели
  */
-export type CarouselProductCardContent = HeadlineSmallProps & {
-  /** @title Дополнительное описание */
-  additionalDescription?: string;
-  /**
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 140
-   *   },
-   *   "sources": [{
-   *       "media": 1279,
-   *       "width": 84,
-   *       "format": "webp",
-   *       "alignment": "center"
-   *   }]
-   * }
-   */
-  icon?: Picture;
-  /** @title Кнопка */
-  button?: ButtonWithIconProps;
-  /**
-   * @title Буллиты
-   * @default true
-   */
-  isDotted?: boolean;
-  /** @title Список */
-  items?: ListProps[];
-  version?: BlockVersion;
-  /**
-   * @title Выравнивание
-   * @default text-center
-   */
-  align?: TextAlign;
-};
+export type CarouselProductCardContent = UniBlockContent &
+  HeadlineSmallProps &
+  AdditionalDescriptionProps & {
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 140
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *       "width": 84,
+     *       "format": "webp",
+     *       "alignment": "center"
+     *   }]
+     * }
+     */
+    icon?: Picture;
+    /** @title Кнопка */
+    button?: ButtonWithIconProps;
+    /**
+     * @title Буллиты
+     * @default true
+     */
+    isDotted?: boolean;
+    /** @title Список */
+    items?: ListProps[];
+    /**
+     * @title Выравнивание
+     * @default text-center
+     */
+    align?: TextAlign;
+  };

package/src/components/CarouselProgramsCard/CarouselProgramsCardContent.ts

@@ -1,13 +1,13 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { IconProps } from '../../model/Picture';
 
 /**
  * @title Карточка программ карусели
  */
-export type CarouselProgramsCardContent = TitleProps & {
-  icon?: Picture;
-  /** @title Список */
-  list?: HeadlineCommonProps[];
-  version?: BlockVersion;
-};
+export type CarouselProgramsCardContent = UniBlockContent &
+  TitleProps &
+  IconProps & {
+    /** @title Список */
+    list?: HeadlineCommonProps[];
+  };

package/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -1,38 +1,39 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
+import type { IconProps, Picture } from '../../model/Picture';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
-export type RecommendationSocialMedia = LinkCommonProps & {
-  version: ButtonVersion;
-  icon?: Picture;
-  rounded?: boolean;
-};
+export type RecommendationSocialMedia = LinkCommonProps &
+  IconProps & {
+    version: ButtonVersion;
+    rounded?: boolean;
+  };
 
 /**
  * @title Карточка рекомендаций
  */
-export interface CarouselRecommendationCardContent extends HeadlineCommonProps, ListContent {
-  /**
-   * @title Соц сети
-   */
-  socialMedia?: RecommendationSocialMedia[];
-  /**
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 290
-   *   },
-   *   "sources": [{
-   *       "media": 1279,
-   *       "width": 174,
-   *       "format": "webp",
-   *       "alignment": "southeast"
-   *   }]
-   * }
-   */
-  image?: Picture;
-  version?: BlockVersion;
-}
+export type CarouselRecommendationCardContent = UniBlockContent &
+  HeadlineCommonProps &
+  ListContent & {
+    /**
+     * @title Соц сети
+     */
+    socialMedia?: RecommendationSocialMedia[];
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 290
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *       "width": 174,
+     *       "format": "webp",
+     *       "alignment": "southeast"
+     *   }]
+     * }
+     */
+    image?: Picture;
+  };

package/src/components/CarouselTariffsCard/CarouselTariffsCardContent.ts

@@ -1,16 +1,18 @@
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { IconProps } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Карточка тарифной карусели
  */
-export type CarouselTariffsCardContent = TitleProps & {
-  icon?: Picture;
-  /** @title Выделить карточку */
-  isHighlighting?: boolean;
-  /** @title Кнопка */
-  button?: ButtonProps;
-  /** @title Ячейка */
-  cardCells?: HeadlineCommonProps[];
-};
+export type CarouselTariffsCardContent = UniBlockContent &
+  TitleProps &
+  IconProps & {
+    /** @title Выделить карточку */
+    isHighlighting?: boolean;
+    /** @title Кнопка */
+    button?: ButtonProps;
+    /** @title Ячейка */
+    cardCells?: HeadlineCommonProps[];
+  };

package/src/components/ComparisonTable/ComparisonTableBody.tsx

@@ -1,13 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
+import type { TitleProps } from '../../model/HeadlineType';
 import { ComparisonTableColumnHeaders } from './ComparisonTableColumnHeaders';
-import type { Column, RowHeader } from './ComparisonTableContent';
+import type { Column } from './ComparisonTableContent';
 import { ComparisonTableRows } from './ComparisonTableRows';
 import { COLS_LENGTH_FOR_SCROLL } from './constants';
 
 interface ComparisonTableBodyProps {
   columns?: Column[];
-  rowHeaders?: RowHeader[];
+  rowHeaders?: TitleProps[];
   isShowAllRow: boolean;
   isColoredFirstColumn: boolean;
   visibleRowLength: number;

package/src/components/ComparisonTable/ComparisonTableContent.ts

@@ -1,7 +1,8 @@
+import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { Picture } from '../../model/Picture';
-import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Ячейка
@@ -30,26 +31,19 @@ export interface Column {
   data?: CellData[][];
 }
 
-/**
- * @title Параметр
- */
-export interface RowHeader {
-  /** @title Заголовок */
-  title?: string;
-}
-
 /**
  * @title Сравнительная таблица
  */
-export type ComparisonTableContent = TitleProps & {
-  /** @title Параметры */
-  rowHeaders?: TitleProps[];
-  /** @title Продукты */
-  columns?: Column[];
-  /** @title Закрасить первую колонку */
-  isColoredFirstColumn?: boolean;
-  /** @title Отображать заданное количество строк */
-  visibleRowLength?: number;
-  /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
-  orientation?: ListOrientation; // TODO: мобильный проп
-};
+export type ComparisonTableContent = UniBlockContent &
+  TitleProps & {
+    /** @title Параметры */
+    rowHeaders?: TitleProps[];
+    /** @title Продукты */
+    columns?: Column[];
+    /** @title Закрасить первую колонку */
+    isColoredFirstColumn?: boolean;
+    /** @title Отображать заданное количество строк */
+    visibleRowLength?: number;
+    /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
+    orientation?: ListOrientation; // TODO: мобильный проп
+  };

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

@@ -1,17 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { TitleProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
+import type { IconProps } from '../../model/Picture';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
-export interface HeaderCellProps {
-  icon?: Picture;
-  image?: Picture;
-  title?: string;
-  subtitle?: string;
-  isFillGradient?: boolean;
-  link?: LinkProps;
-}
+export type HeaderCellProps = ImageContent &
+  IconProps &
+  TitleProps & {
+    subtitle?: string;
+    isFillGradient?: boolean;
+    link?: LinkProps;
+  };
 
 const headingStyle = (isFillGradient = false): string => (isFillGradient ? 'text-white' : '');
 const subtitleStyle = (isFillGradient = false): string =>

package/src/components/ComparisonTable/TableRow.tsx

@@ -1,12 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { CellData, RowHeader } from './ComparisonTableContent';
+import type { TitleProps } from '../../model/HeadlineType';
+import type { CellData } from './ComparisonTableContent';
 import { COLUMN_WIDTH, DIVIDER_CLASSES, FIRST_CELL_CLASSES } from './constants';
 import { TableCarouselContainer } from './TableCarouselContainer';
 import { TableCell } from './TableCell';
 import { TableRowContainer } from './TableRowContainer';
 
 export interface Row {
-  header: RowHeader;
+  header: TitleProps;
   data: CellData[][];
 }
 export interface TableRowProps {

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import { UniBlockProps } from '../../model/JSXBlock';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';

package/src/components/ContactsBlock/ContactsBlockContent.ts

@@ -1,21 +1,20 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { AdditionalDescriptionProps, HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Элемент плитки
  */
-export interface ContactBlockProps extends HeadlineCommonProps {
-  /** @title Дополнительное описание */
-  additionalDescription?: string;
-  /** @title Кнопка */
-  button?: ButtonProps;
-}
+export type ContactBlockProps = HeadlineCommonProps &
+  AdditionalDescriptionProps & {
+    /** @title Кнопка */
+    button?: ButtonProps;
+  };
 
 /**
  * @title Контакты
  */
-export interface ContactsBlockContent {
+export type ContactsBlockContent = UniBlockContent & {
   /**
    * @title Данные
    * @maxItems 2
@@ -26,5 +25,4 @@ export interface ContactsBlockContent {
    * @maxItems 2
    * */
   contacts?: ContactBlockProps[][];
-  version?: BlockVersion;
-}
+};

package/src/components/ErrorBlock/ErrorBlockContent.ts

@@ -1,6 +1,7 @@
+import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
-import type { TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Изображение
@@ -56,10 +57,11 @@ export type ErrorType =
 /**
  * @title Блок ошибки
  */
-export type ErrorBlockContent = TitleProps & {
-  /** @title Описание */
-  subtitle?: string;
-  error?: ErrorContentDef;
-  /** @title Кнопка */
-  button?: ButtonProps;
-};
+export type ErrorBlockContent = UniBlockContent &
+  TitleProps & {
+    /** @title Описание */
+    subtitle?: string;
+    error?: ErrorContentDef;
+    /** @title Кнопка */
+    button?: ButtonProps;
+  };