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

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;
+  };

package/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/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/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/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,14 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '../../hooks/useBool';
 import { useLocation } from '../../hooks/useLocation';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import type { PreventableEvent } from '../../model/PreventableEvent';
+import { projectSettings } from '../../ProjectSettings';
 import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
 import { Location } from '../../ui-kit/Location/Location';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
 import { HeaderChatBotButton } from './HeaderChatBotButton';
-import { projectSettings } from '../../ProjectSettings';
 
 interface HeaderSecondaryMenuContent {
   version?: BlockVersion;
@@ -30,6 +32,11 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
 
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
+    const handleShowLocationModal = useCallback((ev?: PreventableEvent) => {
+      ev?.preventDefault();
+      showLocationModal();
+    }, []);
+
     return (
       <div className={style('flex items-center', className)}>
         <TopItem
@@ -37,7 +44,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           flat={true}
           href="#"
           text={location.name}
-          onClick={showLocationModal}
+          onClick={handleShowLocationModal}
         />
         {officesLink ? (
           <TopItem className="mr-7" flat={true} href={officesLink} text="Офисы и банкоматы" />

package/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/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/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/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/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;
+  };