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

package/mobile/src/components/TextBlock/TextBlockContent.ts

@@ -1,5 +1,5 @@
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 
 /**
@@ -12,15 +12,15 @@ export type TextBlockVersion = 'primary' | 'secondary' | 'secondary-light';
  * @title Размер иконки
  * @enumNames ["Нет", "Маленькая", "Большая"]
  */
-export type TextBlockIconVersion = 'none' | 'small' | 'big';
+type TextBlockIconVersion = 'none' | 'small' | 'big';
 
 /**
  * @title Текстовый блок
  */
 export type TextBlockContent = HeadlineCommonProps &
-  RichTextProps & {
+  RichTextProps &
+  ImageContent & {
     iconVersion?: TextBlockIconVersion;
-    image?: Picture;
     blockVersion?: TextBlockVersion;
     /** @title Буллиты */ // TODO: mobile prop
     isDotted?: boolean;

package/mobile/src/components/Tile/TileContent.ts

@@ -1,4 +1,4 @@
-import type { BlockVersion } from '../../model/BlockVersion';
+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';
@@ -10,7 +10,8 @@ import type { TagsContent } from '../../ui-kit/Tags/TagsContent';
 /**
  * @title Плитка
  */
-export type TileContent = HeadingCommonProps &
+export type TileContent = UniBlockContent &
+  HeadingCommonProps &
   RichTextProps &
   ListContent &
   ButtonContent &
@@ -36,5 +37,4 @@ export type TileContent = HeadingCommonProps &
      */
     isDotted?: boolean;
     listItemSize?: ListItemSize;
-    version?: BlockVersion;
   };

package/mobile/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -1,18 +1,17 @@
 import type { AlignTypeWithStretch } from '../../model/AlignType';
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { ColorPalette } from '../../model/ContentPageDef';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
 
 /**
  * @title Вертикальный компоновщик
  */
-export interface VerticalLayoutContent {
+export type VerticalLayoutContent = UniBlockContent & {
   colorPalette?: ColorPalette;
-  version?: BlockVersion;
   align?: AlignTypeWithStretch;
   gap?: GapVersion;
   /** @title Внутренний отступ компоновщика */
   isPadding?: boolean;
   /** @title Отступы вложенных компонентов */
   isInnerPadding?: boolean;
-}
+};

package/mobile/src/components/Video/VideoContent.ts

@@ -1,4 +1,5 @@
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 
 /**
@@ -7,19 +8,20 @@ import type { Picture } from '../../model/Picture';
  *   "title": "Заголовок блока"
  * }
  */
-export interface VideoContent extends TitleProps {
-  /**
-   * @title Ссылка на видео
-   */
-  url?: string;
-  /**
-   * @title Заставка в блоке
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 1004
-   *   },
-   * }
-   */
-  previewImg?: Picture;
-}
+export type VideoContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Ссылка на видео
+     */
+    url?: string;
+    /**
+     * @title Заставка в блоке
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 1004
+     *   },
+     * }
+     */
+    previewImg?: Picture;
+  };

package/mobile/src/model/HeadlineType.ts

@@ -25,6 +25,11 @@ export type LabelProps = {
   label?: string;
 };
 
+export type AdditionalDescriptionProps = {
+  /** @title Дополнительное описание */
+  additionalDescription?: string;
+};
+
 export type HeadlineCommonProps = TitleProps & DescriptionProps;
 
 export type HeadlineProps = HeadlineCommonProps & {

package/mobile/src/model/JSXBlock.ts

@@ -5,13 +5,21 @@ import type { BlockVersion } from './BlockVersion';
 import type { BlockDef } from './ContentPageDef';
 import type { VNode } from './VNode';
 
-export interface UniBlockProps {
+export interface UniBlockProps extends UniBlockContent {
   className?: string;
-  version?: BlockVersion;
   block?: BlockDef;
   options?: BlockRendererOptions;
 }
 
+export interface UniBlockContent {
+  version?: BlockVersion;
+  /**
+   *  @title Наследование темы
+   *  @default true
+   */
+  isTheme?: boolean;
+}
+
 export type JSXBlock<BlockProps extends UniBlockProps = UniBlockProps> = UNIComponent<
   BlockProps,
   any,

package/mobile/src/model/LogoType.ts

@@ -1,6 +1,4 @@
-import type { Picture } from './Picture';
+import type { ImageContent } from '../ui-kit/Img/ImgProps';
+import type { TitleProps } from './HeadlineType';
 
-export type LogoType = {
-  image?: Picture;
-  title?: string;
-};
+export type LogoType = ImageContent & TitleProps;

package/mobile/src/services/sitemap/SitemapProps.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../../model/LinkProps';
 import type { LogoType } from '../../model/LogoType';
-import type { Picture } from '../../model/Picture';
+import type { IconProps, Picture } from '../../model/Picture';
 
 /**
  * @title Ссылка
@@ -24,9 +24,7 @@ export interface DispositionItem extends LinkProps {
  * @title Представительства за рубежом
  * @required ["text", "href"]
  */
-export interface ForeignOffice extends LinkProps {
-  icon?: Picture;
-}
+export type ForeignOffice = LinkProps & IconProps;
 
 export interface SitemapDataProps {
   topItems?: TopMenuItem[];

package/mobile/src/ui-kit/BlockWrapper.tsx

@@ -20,7 +20,15 @@ export const blockStyles: Record<BlockVersion, string> = {
 };
 
 export const BlockWrapper = JSX<BlockWrapperProps>(
-  ({ className = '', version = 'primary', block, tag = 'section', role, children }) => {
+  ({
+    className = '',
+    version = 'primary',
+    block,
+    tag = 'section',
+    role,
+    isTheme = true,
+    children,
+  }) => {
     const Tag: any = tag;
 
     const ref = useBlockIntersectionObserver(block);
@@ -43,8 +51,13 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
 
     return (
       <Tag
-        className={style('group', blockStyles[version], isHidden ? 'hidden' : '', className)}
-        {...(version ? { 'data-ver': version } : {})}
+        className={style(
+          isTheme ? 'group' : '',
+          blockStyles[version],
+          isHidden ? 'hidden' : '',
+          className,
+        )}
+        {...(version && isTheme ? { 'data-ver': version } : {})}
         {...(block?.anchor ? { id: block.anchor, ref } : {})}
         role={role}
       >

package/mobile/src/ui-kit/SwipeListControl/SwipeListControl.tsx

@@ -24,6 +24,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
     children,
     onVisibleIndicesChange,
     listType = 'horizontal-list',
+    version,
   }) => {
     const itemCount = Array.isArray(children) ? children.length : 0;
 
@@ -53,6 +54,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
             activeIndex={activeIndex}
             dotCount={itemCount}
             listType={listType}
+            version={version}
           />
         ) : null}
       </div>

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlContent.ts

@@ -1,11 +1,11 @@
-import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { SwipeContainerProps } from './SwipeListControlProps';
 
 /**
  * @title Swipe-контроллер
  */
-export interface SwipeListControlContent extends SwipeContainerProps {
-  /** @title Точки-индикаторы */
-  showDots?: boolean;
-  version?: BlockVersion;
-}
+export type SwipeListControlContent = UniBlockContent &
+  SwipeContainerProps & {
+    /** @title Точки-индикаторы */
+    showDots?: boolean;
+  };

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BlockVersion } from '../../model/BlockVersion';
+import { style } from '../../utils/style';
 import type { SwipeListControlType } from './SwipeListControlProps';
 
 const containerStyles: Record<SwipeListControlType, string> = {
@@ -12,7 +14,7 @@ const activeDotStyles: Record<SwipeListControlType, string> = {
 };
 
 const dotStyle =
-  'cursor-pointer bg-primary-main rounded-full transition-width duration-300 group-data-secondary:bg-white group-data-transparent:bg-white';
+  'cursor-pointer rounded-full transition-width duration-300 bg-primary-main group-data-secondary:bg-white group-data-transparent:bg-white';
 
 const inactiveDotStyle = 'w-2 h-2 opacity-30';
 
@@ -21,10 +23,11 @@ interface SwipeListControlDotsProps {
   activeIndex?: number;
   dotCount?: number;
   listType?: SwipeListControlType;
+  version?: BlockVersion;
 }
 
 export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
-  ({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list' }) => {
+  ({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list', version }) => {
     const handleClick = (idx: number) => {
       if (idx !== activeIndex && containerRef?.current) {
         containerRef.current.children[idx]?.scrollIntoView({
@@ -35,7 +38,10 @@ export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
     };
 
     return dotCount ? (
-      <div className={`flex gap-2 ${containerStyles[listType]}`}>
+      <div
+        className={style('flex gap-2', containerStyles[listType], version ? 'group' : '')}
+        {...(version ? { 'data-ver': version } : {})}
+      >
         {new Array(dotCount).fill(null).map((_, idx: number) => (
           <div
             key={String(idx)}

package/mobile/src/ui-kit/Text/TextProps.ts

@@ -1,4 +1,4 @@
-import { BlockVersionMolecule } from '../../model/BlockVersion';
+import type { BlockVersionMolecule } from '../../model/BlockVersion';
 
 /**
  * @title Размер текста

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.8.21",
+  "version": "0.8.23",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -1,5 +1,6 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import type { ButtonAdditionalProps } from '../../ui-kit/Button/ButtonProps';
 
@@ -18,14 +19,15 @@ export interface SubmitButtonProps extends ButtonAdditionalProps {
 /**
  * @title Форма заявки
  */
-export type ApplicationFormContent = TitleProps & {
-  /**
-   * @title Вид заявки
-   * @default credit
-   * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
-   */
-  typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
-  button?: SubmitButtonProps;
-  /** @title Условия передачи данных */
-  link?: LinkProps;
-};
+export type ApplicationFormContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Вид заявки
+     * @default credit
+     * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
+     */
+    typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
+    button?: SubmitButtonProps;
+    /** @title Условия передачи данных */
+    link?: LinkProps;
+  };

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,6 +1,6 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 
 /**
@@ -47,12 +47,11 @@ export type BenefitBlockItemProps = LabelProps &
 /**
  * @title Блок преимущества
  */
-export type BenefitsBlockContent = TitleProps & {
-  /**
-   * @title Список преимуществ
-   * @maxItems 6
-   */
-  benefitList?: BenefitBlockItemProps[];
-  /** @default primary */
-  version?: BlockVersion;
-};
+export type BenefitsBlockContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Список преимуществ
+     * @maxItems 6
+     */
+    benefitList?: BenefitBlockItemProps[];
+  };

package/src/components/Bonus/BonusContent.ts

@@ -1,15 +1,15 @@
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /**
  * @title Изображение
  */
-export type BonusImageDef = {
+export type BonusImageDef = ImageContent & {
   /** @default image */
   bonusType?: 'image';
-  image?: Picture;
 };
 
 /**
@@ -45,7 +45,8 @@ export type BonusItem = HeadlineCommonProps & {
 /**
  * @title Блок Бонусы
  */
-export type BonusContent = HeadlineCommonProps & {
-  /** @title Список плиток */
-  bonusItems?: BonusItem[];
-};
+export type BonusContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /** @title Список плиток */
+    bonusItems?: BonusItem[];
+  };

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,6 +1,8 @@
 import type { AlignType } from '../../model/AlignType';
 import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+
 /**
  * @title Количество элементов в строке
  * @enumNames [
@@ -19,11 +21,12 @@ export type BonusBenefit = LabelProps & IconProps & DescriptionProps;
 /**
  * @title Блок бонусов и преимуществ
  */
-export type BonusBenefitsBlockContent = TitleProps & {
-  /** @title Подзаголовок */
-  subtitle?: string;
-  /** @title Список бонусов */
-  bonusBenefits?: BonusBenefit[];
-  columnsCount?: ColumnsCount;
-  cardTextAlign?: AlignType;
-};
+export type BonusBenefitsBlockContent = UniBlockContent &
+  TitleProps & {
+    /** @title Подзаголовок */
+    subtitle?: string;
+    /** @title Список бонусов */
+    bonusBenefits?: BonusBenefit[];
+    columnsCount?: ColumnsCount;
+    cardTextAlign?: AlignType;
+  };

package/src/components/BusinessBlock/BusinessBlockContent.ts

@@ -1,5 +1,8 @@
-import type { IconProps, Picture } from '../../model/Picture';
+import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { IconProps } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /** @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }}} */
 export type BusinessCardItemProps = IconProps & {
@@ -7,30 +10,27 @@ export type BusinessCardItemProps = IconProps & {
   text?: string;
 };
 
-export interface BusinessCardProps {
-  /** @title Заголовок карточки */
-  title?: string;
-  image?: Picture;
-  /** @title Список */
-  cardItems?: BusinessCardItemProps[];
-  /**
-   * @title Кнопка
-   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
-   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}, "text": "Кнопка"}
-   */
-  button?: ButtonWithIconProps;
-}
+export type BusinessCardProps = TitleProps &
+  ImageContent & {
+    /** @title Список */
+    cardItems?: BusinessCardItemProps[];
+    /**
+     * @title Кнопка
+     * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
+     * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}, "text": "Кнопка"}
+     */
+    button?: ButtonWithIconProps;
+  };
 
 /**
  * @title Бизнес блок
  */
-export interface BusinessBlockContent {
-  /** @title Заголовок блока */
-  title?: string;
-  /**
-   * @title Карточки
-   * @minItems 2
-   * @maxItems 2
-   */
-  cards?: BusinessCardProps[];
-}
+export type BusinessBlockContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Карточки
+     * @minItems 2
+     * @maxItems 2
+     */
+    cards?: BusinessCardProps[];
+  };

package/src/components/CardTransfer/CardTransferContent.ts

@@ -1,10 +1,12 @@
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Перевод с карты на карту
  */
-export type CardTransferContent = LabelProps &
+export type CardTransferContent = UniBlockContent &
+  LabelProps &
   TitleProps & {
     /** @title Плейсхолдер */
     placeholder?: string;

package/src/components/Carousel/Carousel.tsx

@@ -43,7 +43,14 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
     const isBankHistoryCarousel = childBlocks && childBlocks[0]?.type === 'CarouselBankHistoryCard';
 
     return (
-      <BlockWrapper className={style(getPaddingStyle(isPadding), className)} {...rest}>
+      <BlockWrapper
+        className={style(
+          getPaddingStyle(isPadding),
+          'group-data-secondary:bg-primary-main group-data-secondary:text-white',
+          className,
+        )}
+        {...rest}
+      >
         <div className="relative max-w-full">
           <SwipeListContainer
             containerRef={containerRef}

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