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

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

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

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

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

package/src/components/PictureText/PictureTextContent.ts

@@ -1,35 +1,36 @@
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import type { BenefitsProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
-import type { BlockVersion } from '../../model/BlockVersion';
 
 /**
  * @title Картинка с текстом
  */
-export interface PictureTextContent extends BenefitsProps, HeadlineCommonProps {
-  /**
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 400
-   *   },
-   *   "sources": [{
-   *       "media": 1279,
-   *       "width": 240,
-   *       "format": "webp",
-   *       "alignment": "center"
-   *   }]
-   * }
-   */
-  image?: Picture;
-  /**
-   * @title Картинка справа/текст слева
-   * @default false
-   */
-  directionRight?: boolean;
-  /** @title Ежемесячный лимит */
-  monthLimit?: number;
-  /** @title Страховая сумма */
-  sum?: number;
-  version?: BlockVersion;
-}
+export type PictureTextContent = UniBlockContent &
+  BenefitsProps &
+  HeadlineCommonProps & {
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 400
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *       "width": 240,
+     *       "format": "webp",
+     *       "alignment": "center"
+     *   }]
+     * }
+     */
+    image?: Picture;
+    /**
+     * @title Картинка справа/текст слева
+     * @default false
+     */
+    directionRight?: boolean;
+    /** @title Ежемесячный лимит */
+    monthLimit?: number;
+    /** @title Страховая сумма */
+    sum?: number;
+  };

package/src/components/PictureText/renderBenefit.tsx

@@ -1,4 +1,4 @@
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
 import type { ComplexBenefitProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 import { RichText } from '../../ui-kit/RichText/RichText';

package/src/components/Placeholder/PlaceholderContent.ts

@@ -1,6 +1,7 @@
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 
 /**
  * @hidden
  */
-export type PlaceholderContent = HeadlineCommonProps;
+export type PlaceholderContent = UniBlockContent & HeadlineCommonProps;

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -1,7 +1,7 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { Footnote } from '../../model/Footnote';
 import type { HeadlineProps } from '../../model/HeadlineType';
 import type { IconVersion } from '../../model/IconVersion';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
 import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
@@ -42,7 +42,6 @@ export type ProductBlockInnerContent = HeadlineProps &
      */
     benefits?: BenefitItemProps[];
     benefitsVersion?: IconVersion;
-    version?: BlockVersion;
     /**
      *  @title Буллиты
      *  @default true
@@ -60,9 +59,10 @@ export type ProductBlockInnerContent = HeadlineProps &
 /**
  * @title Продуктовый блок
  */
-export interface ProductBlockContent extends ProductBlockInnerContent {
-  /** @title Хлебные крошки */
-  breadcrumbs?: LinkProps[];
-  /** @title Кнопка возврата */
-  backwardButton?: BackwardButtonProps;
-}
+export type ProductBlockContent = UniBlockContent &
+  ProductBlockInnerContent & {
+    /** @title Хлебные крошки */
+    breadcrumbs?: LinkProps[];
+    /** @title Кнопка возврата */
+    backwardButton?: BackwardButtonProps;
+  };

package/src/components/ProductBlock/ProductBlockInner.mobile.tsx

@@ -22,14 +22,13 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     buttons,
     image,
     items,
-    version = 'primary',
     isDotted = true,
     label,
     title,
     description,
     ...rest
   }) => (
-    <BlockWrapper className={`w-full ${className}`} version={version} {...rest}>
+    <BlockWrapper className={`w-full ${className}`} {...rest}>
       <div>
         {label ? renderLabel(label) : null}
         <Headline
@@ -41,7 +40,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
         />
         <BaseTile buttons={renderButtonsSection(buttons, { className: 'mt-5', isVertical: true })}>
           {benefits?.filter((_) => _.label)?.length ? (
-            <div className="mt-3">{benefits.map(renderBenefit(version, benefitsVersion))}</div>
+            <div className="mt-3">{benefits.map(renderBenefit('primary', benefitsVersion))}</div>
           ) : null}
           {items?.length ? (
             <List className="mt-3 text-m" items={items} isDotted={isDotted} />

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -42,6 +42,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             description={description}
             headlineVersion={headlineVersion}
             align="text-left"
+            version={version}
           />
           <div className="flex flex-col justify-between h-full">
             <BaseTile buttons={renderButtonsSection(buttons)}>

package/src/components/ProductGallery/ProductGallery.tsx

@@ -17,7 +17,7 @@ interface NavButtonProps {
 }
 
 export const ProductGallery = JSX<ProductGalleryProps>(
-  ({ className = '', slides = [], version = 'primary', ...rest }) => {
+  ({ className = '', slides = [], ...rest }) => {
     const galleryNav = slides.map((s) => s.nav);
     const galleryBlocks = slides.map((s) => s.productBlock);
     const [activeSlideIndex, setActiveSlideIndex] = useState(0);
@@ -26,7 +26,6 @@ export const ProductGallery = JSX<ProductGalleryProps>(
     return (
       <BlockWrapper
         className={`box-border pt-12 overflow-hidden relative w-100 mb-6 ${className}`}
-        version={version}
         {...rest}
       >
         <div
@@ -34,7 +33,7 @@ export const ProductGallery = JSX<ProductGalleryProps>(
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {galleryBlocks.map((_, i) => renderProductBlock({ ..._, ...rest, version }, i))}
+          {galleryBlocks.map((_, i) => renderProductBlock({ ..._, ...rest }, i))}
         </div>
 
         <div className="flex items-center absolute bottom-6 left-0 right-0 px-[26px] box-border h-28">
@@ -52,7 +51,7 @@ export const ProductGallery = JSX<ProductGalleryProps>(
   },
 );
 
-function renderProductBlock(block: ProductBlockInnerContent & UniBlockProps, i: number) {
+function renderProductBlock(block: ProductBlockInnerContent, i: number) {
   return (
     <section
       key={String(i)}

package/src/components/ProductGallery/ProductGalleryContent.ts

@@ -1,4 +1,4 @@
-import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
 
 /** @title Кнопка под слайдом */
@@ -22,11 +22,10 @@ export interface ProductSlide {
 /**
  * @title Продуктовая галерея
  */
-export interface ProductGalleryContent {
+export type ProductGalleryContent = UniBlockContent & {
   /**
    * @title Слайды
    * @minItems 2
    */
   slides?: ProductSlide[];
-  version?: BlockVersion;
-}
+};

package/src/components/ProductTile/ProductTileContent.ts

@@ -1,6 +1,11 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { DefaultListItemType } from '../../model/DefaultListItemType';
-import type { DescriptionProps, HeadlineProps, LabelProps } from '../../model/HeadlineType';
+import type {
+  AdditionalDescriptionProps,
+  DescriptionProps,
+  HeadlineProps,
+  LabelProps,
+} from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import type { RichTextItem } from '../../model/RichTextItem';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
@@ -21,7 +26,9 @@ export type Benefit = TextBenefit | RichTextItem;
 /**
  * @title Продуктовая плитка
  */
-export type ProductTileContent = HeadlineProps &
+export type ProductTileContent = UniBlockContent &
+  HeadlineProps &
+  AdditionalDescriptionProps &
   ButtonContent & {
     /**
      * @default {
@@ -38,14 +45,11 @@ export type ProductTileContent = HeadlineProps &
      * }
      */
     image?: Picture;
-    version?: BlockVersion;
     /**
      * @title Преимущества
      * @maxItems 7
      */
     benefits?: Benefit[];
-    /** @title Дополнительное описание */
-    additionalDescription?: string;
     /** @title Картинка справа/текст слева */
     isImageOnRightSide?: boolean;
   };

package/src/components/PromoTile/PromoTileContent.ts

@@ -1,15 +1,15 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { DescriptionProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 
 /**
  * @title Акции
  */
-export type PromoTileContent = HeadingCommonProps &
+export type PromoTileContent = UniBlockContent &
+  HeadingCommonProps &
   DescriptionProps &
   ButtonContent & {
     /** @title Дата публикации */
     date?: string;
-    version?: BlockVersion;
   };

package/src/components/Recommendation/RecommendationContent.ts

@@ -1,5 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
@@ -46,8 +46,8 @@ export interface RecommendationCardTypes extends HeadlineCommonProps, ListConten
 /**
  * @title Рекомендации
  */
-export interface RecommendationContent extends TitleProps {
-  /** @title Карточки */
-  recommendations?: RecommendationCardTypes[];
-  version?: BlockVersion;
-}
+export type RecommendationContent = UniBlockContent &
+  TitleProps & {
+    /** @title Карточки */
+    recommendations?: RecommendationCardTypes[];
+  };

package/src/components/RollupItem/RollupItem.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
-import { BlockVersion } from '../../model/BlockVersion';
-import type { JSXBlock } from '../../model/JSXBlock';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
@@ -10,7 +10,9 @@ import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { Img } from '../../ui-kit/Img/Img';
 import { getIconWithVersion } from '../../utils/getIconWithVersion';
-import type { RollupItemProps } from './RollupItemProps';
+import type { RollupItemContent } from './RollupItemContent';
+
+export interface RollupItemProps extends RollupItemContent, UniBlockProps {}
 
 export const RollupItem: JSXBlock<RollupItemProps> = JSX<RollupItemProps>(
   ({