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

package/mobile/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/mobile/src/components/Catalog/Catalog.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/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/mobile/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/mobile/src/components/ComparisonTable/HeaderCell.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/mobile/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/mobile/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/mobile/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/mobile/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;
+  };

package/mobile/src/components/ExchangeRateTile/ExchangeRateTileContent.ts

@@ -1,9 +1,11 @@
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Курсы обмена валют
  */
-export type ExchangeRateTileContent = TitleProps & {
-  button?: ButtonProps;
-};
+export type ExchangeRateTileContent = UniBlockContent &
+  TitleProps & {
+    button?: ButtonProps;
+  };

package/mobile/src/components/Gallery/Gallery.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/GracePeriod/GracePeriodContent.ts

@@ -1,4 +1,5 @@
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 
 export interface Month {
@@ -29,7 +30,8 @@ export interface CalendarItem {
 /**
  * @title Льготный период
  */
-export type GracePeriodContent = HeadlineCommonProps & {
-  /** @title Периоды */
-  calendar?: CalendarItem[];
-};
+export type GracePeriodContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /** @title Периоды */
+    calendar?: CalendarItem[];
+  };

package/mobile/src/components/Header/HeaderContent.ts

@@ -1,6 +1,7 @@
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconProps, Picture } from '../../model/Picture';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /**
  * @title Пункт подменю
@@ -19,12 +20,10 @@ export interface DispositionItem extends LinkProps {
 /**
  * @title Логотип
  */
-export interface Logo {
-  /** @title Иконка логотипа */
-  image?: Picture;
+export type Logo = ImageContent & {
   /** @title Текст логотипа */
   title?: string;
-}
+};
 
 /**
  * @title Шапка (для мобильных горизонтальная прокрутка shift+mouseScroll)

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

@@ -18,15 +18,17 @@ export const Headline = JSX<HeadlineProps>(
     headlineVersion = 'XL',
     align = 'text-center',
     as,
-    version = '',
     ...rest
   }) => {
     const versionStyle = headlineVersionStyles[headlineVersion];
 
     return (
       <BlockWrapper
-        className={style('flex flex-col p-12', versionStyle.wrapper, className)}
-        version={version}
+        className={style(
+          'flex flex-col p-12 group-data-secondary:bg-primary-main group-data-secondary:text-white',
+          versionStyle.wrapper,
+          className,
+        )}
         {...rest}
       >
         {title ? (

package/mobile/src/components/Headline/HeadlineContent.ts

@@ -1,15 +1,16 @@
 import type { HeadlineProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { HeadingTagType } from '../../ui-kit/Heading/HeadingProps';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
  * @title Заголовок
  */
-export type HeadlineContent = HeadlineProps & {
-  /** @title Изображение (моб.) */
-  image?: Picture;
-  align?: TextAlign;
-  /** @hidden */
-  as?: HeadingTagType;
-};
+export type HeadlineContent = UniBlockContent &
+  HeadlineProps &
+  ImageContent & {
+    align?: TextAlign;
+    /** @hidden */
+    as?: HeadingTagType;
+  };

package/mobile/src/components/HorizontalLayout/HorizontalLayoutContent.ts

@@ -1,3 +1,5 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
+
 /**
  * @title Отсуп между компонентами
  * @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький", "Самый маленький", "Без отступа"]
@@ -7,8 +9,8 @@ export type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
 /**
  * @title Горизонтальный компоновщик
  */
-export interface HorizontalLayoutContent {
+export type HorizontalLayoutContent = UniBlockContent & {
   gap?: GapVersion;
   /** @title Внутренний отступ компоновщика */
   isPadding?: boolean;
-}
+};

package/mobile/src/components/ImgBlock/ImgBlockContent.ts

@@ -1,8 +1,9 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 
 /**
  * @title Картинка
  */
-export interface ImgBlockContent {
+export type ImgBlockContent = UniBlockContent & {
   image?: Picture;
-}
+};

package/mobile/src/components/InsuranceAmountBlock/InsuranceAmountBlockContent.ts

@@ -1,6 +1,7 @@
+import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
-import type { TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Кнопка выбора программы
@@ -25,9 +26,10 @@ export type InsuranceAmountBlockTab = TitleProps & {
 /**
  * @title Страховые суммы
  */
-export type InsuranceAmountBlockContent = TitleProps & {
-  /** @title Список вкладок */
-  insuranceTabs?: InsuranceAmountBlockTab[];
-  /** @title Кнопка */
-  button?: ButtonProps;
-};
+export type InsuranceAmountBlockContent = UniBlockContent &
+  TitleProps & {
+    /** @title Список вкладок */
+    insuranceTabs?: InsuranceAmountBlockTab[];
+    /** @title Кнопка */
+    button?: ButtonProps;
+  };

package/mobile/src/components/InvestmentInfo/InvestmentInfoContent.ts

@@ -1,3 +1,5 @@
+import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
 /**
@@ -24,9 +26,7 @@ export type InvestmentCell = {
 /**
  * @title Элемент данных 1
  */
-export type InvestmentZeroColumn = {
-  /** @title Название */
-  title?: string;
+export type InvestmentZeroColumn = TitleProps & {
   /** @hidden */
   cells?: InvestmentCell[];
 };
@@ -44,11 +44,12 @@ export type InvestmentColumn = {
 /**
  * @title Блок инвестиций
  */
-export type InvestmentInfoContent = ListContent & {
-  /** @title Буллиты */
-  isDotted?: boolean;
-  /** @title Элемент данных 1 */
-  investmentZeroColumn?: InvestmentZeroColumn;
-  /** @title Остальные элементы данных */
-  investmentColumns?: InvestmentColumn[];
-};
+export type InvestmentInfoContent = UniBlockContent &
+  ListContent & {
+    /** @title Буллиты */
+    isDotted?: boolean;
+    /** @title Элемент данных 1 */
+    investmentZeroColumn?: InvestmentZeroColumn;
+    /** @title Остальные элементы данных */
+    investmentColumns?: InvestmentColumn[];
+  };

package/mobile/src/components/LikeControl/LikeControl.tsx

@@ -2,9 +2,10 @@ import { JSX } from '@redneckz/uni-jsx';
 import { handlerDecorator } from '../../hooks/handlerDecorator';
 import { useLikeService } from '../../hooks/useLikeService';
 import { useRouter } from '../../hooks/useRouter';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import { LikeButton } from '../../ui-kit/Button/LikeButton';
 
-interface LikeControlProps {
+interface LikeControlProps extends UniBlockContent {
   className?: string;
 }
 

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

@@ -1,4 +1,5 @@
 import type { HeadlineCommonProps } 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';
@@ -24,28 +25,29 @@ export interface LinkDocsItem extends LinkProps {
 /**
  * @title Список документов
  */
-export type LinkDocsContent = HeadlineCommonProps & {
-  /**
-   *  @title Иконка
-   *  @default {
-   *   "size": {
-   *     "width": 24,
-   *     "height": 24
-   *   },
-   *   "format": "webp"
-   * }
-   */
-  icon?: Picture;
-  /** @title Список */
-  documents?: LinkDocsItem[];
-  columnsMode?: LinkColumnsMode;
-  /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
-  orientation?: ListOrientation; // TODO: мобильный проп
-  /** @title Рамка элементов (моб.) */ // TODO: мобильный проп
-  hasBorder?: boolean;
-  /**
-   * @title Выравнивание
-   * @default text-center
-   */
-  align?: TextAlign;
-};
+export type LinkDocsContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /**
+     *  @title Иконка
+     *  @default {
+     *   "size": {
+     *     "width": 24,
+     *     "height": 24
+     *   },
+     *   "format": "webp"
+     * }
+     */
+    icon?: Picture;
+    /** @title Список */
+    documents?: LinkDocsItem[];
+    columnsMode?: LinkColumnsMode;
+    /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
+    orientation?: ListOrientation; // TODO: мобильный проп
+    /** @title Рамка элементов (моб.) */ // TODO: мобильный проп
+    hasBorder?: boolean;
+    /**
+     * @title Выравнивание
+     * @default text-center
+     */
+    align?: TextAlign;
+  };

package/mobile/src/components/LinkList/LinkListContent.ts

@@ -1,9 +1,10 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 
 /**
  * @title Список документов
  */
-export interface LinkListContent {
+export type LinkListContent = UniBlockContent & {
   /** @title Список */
   documents?: LinkProps[];
-}
+};

package/mobile/src/components/MiniGallery/MiniGallery.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/MobileAppTile/MobileAppTileContent.ts

@@ -1,6 +1,6 @@
 import type { AlignType } from '../../model/AlignType';
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
@@ -9,7 +9,8 @@ import type { ListContent } from '../../ui-kit/List/ListContent';
 /**
  * @title Мобильное приложение
  */
-export type MobileAppTileContent = HeadlineCommonProps &
+export type MobileAppTileContent = UniBlockContent &
+  HeadlineCommonProps &
   HeadingCommonProps &
   ButtonContent &
   ListContent & {
@@ -23,7 +24,6 @@ export type MobileAppTileContent = HeadlineCommonProps &
     qr?: Picture;
     /** @title Ссылка */
     href?: string; // TODO: для мобильной версии
-    version?: BlockVersion;
     /**
      * @default {
      *   "format": "webp",

package/mobile/src/components/OfficeMap/OfficeMapContent.ts

@@ -1,4 +1,5 @@
 import type { IconName } from '../../icons/IconName';
+import type { UniBlockContent } from '../../model/JSXBlock';
 
 export type WorkSchedule = {
   workTime: string;
@@ -14,17 +15,6 @@ export type WorkSchedule = {
   workingSunday: boolean;
 };
 
-/**
- * @title Карта офиса
- */
-export interface OfficeMapContent {
-  name?: string;
-  address: string;
-  workSchedule: WorkSchedule;
-  gpsLatitude?: number;
-  gpsLongitude?: number;
-}
-
 export type WorkScheduleWeek = {
   title?: string;
   status?: boolean;
@@ -39,3 +29,14 @@ export type NearbyOffices = {
   distance?: string;
   icon?: IconName;
 };
+
+/**
+ * @title Карта офиса
+ */
+export type OfficeMapContent = UniBlockContent & {
+  name?: string;
+  address: string;
+  workSchedule: WorkSchedule;
+  gpsLatitude?: number;
+  gpsLongitude?: number;
+};

package/mobile/src/components/OfficeServicesBlock/OfficeServicesBlockContent.ts

@@ -1,12 +1,14 @@
-import type { IconProps } from '../../model/Picture';
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { IconProps } from '../../model/Picture';
 
 export type OfficeServicesBlockList = LabelProps & IconProps;
 
 /**
  * @title Офисные услуги
  */
-export type OfficeServicesBlockContent = TitleProps & {
-  /** @title Список услуг */
-  servicesList?: OfficeServicesBlockList[];
-};
+export type OfficeServicesBlockContent = UniBlockContent &
+  TitleProps & {
+    /** @title Список услуг */
+    servicesList?: OfficeServicesBlockList[];
+  };

package/mobile/src/components/ParagraphBlock/ParagraphBlockContent.ts

@@ -1,12 +1,13 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { FontWeight, TextAlign, TextSize } from '../../ui-kit/Text/TextProps';
 
 /**
  * @title Параграф
  */
-export interface ParagraphBlockContent {
+export type ParagraphBlockContent = UniBlockContent & {
   size?: TextSize;
   align?: TextAlign;
   font?: FontWeight;
   /** @title Текст */
   text?: string;
-}
+};