@redneckz/wildless-cms-uni-blocks 0.3.22 → 0.3.23

package/src/components/Accordion/AccordionItemInner.tsx

@@ -2,11 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { AccordionItemProps } from './AccordionItem';
 import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
 
-export const AccordionItemInner = JSX<AccordionItemProps>(({ blocks, columns = 1, context }) => {
-  const className = 'mb-5 last:mb-0 pb-5';
-  return (
-    <div className="transition-all duration-300 max-h-0 overflow-hidden">
-      {renderBlocksList({ context, className, columns, blocks })}
-    </div>
-  );
-});
+export const AccordionItemInner = JSX<AccordionItemProps>(
+  ({ blocks, columns = 1, context, version = 'primary' }) => {
+    const className = 'mb-5 last:mb-0 pb-5';
+    return (
+      <div className="transition-all duration-300 max-h-0 overflow-hidden">
+        {renderBlocksList({ context, className, columns, blocks, version })}
+      </div>
+    );
+  },
+);

package/src/components/Accordion/{utils/useActiveHandler.ts → useActiveHandler.ts}

@@ -1,7 +1,8 @@
-import type { IconName } from '../../../icons/IconName';
+import type { IconName } from '../../icons/IconName';
+import { ActiveHandler } from '../../ui-kit/BlocksList/BlocksListProps';
 
-export const useActiveHandler = ({ context, blocks }) => {
-  const [isActive, setIsActive] = context.useState(false);
+export const useActiveHandler = ({ context, blocks, initialState = false }: ActiveHandler) => {
+  const [isActive, setIsActive] = context.useState(initialState);
   const hasContent = blocks?.length;
   const icon: IconName = isActive ? 'MinusIcon' : 'PlusIcon';
 

package/src/components/LinkDocs/LinkDocs.mobile.tsx

@@ -19,7 +19,9 @@ export const LinkDocs = JSX<LinkDocsProps>(
     hasBorder = true,
   }) => {
     return (
-      <section className={`font-sans text-primary-text py-6 px-4 bg-white ${className}`}>
+      <section
+        className={`font-sans text-primary-text py-6 px-4 bg-white overflow-x-hidden ${className}`}
+      >
         {title ? (
           <Heading
             headingType="h2"

package/src/components/OtherProducts/OtherProductsContent.ts

@@ -9,6 +9,10 @@ export interface blockItemCommonProps {
    * @default Список
    */
   label?: string;
+  /**
+   * @title Отображать в раскрытом виде
+   */
+  isExpanded?: boolean;
   /** @title Блоки */
   blocks?: BlockDef[];
   /**
@@ -17,7 +21,6 @@ export interface blockItemCommonProps {
    */
   bordered?: boolean; // TODO: только для мобильной версии
   columns?: ColumnsCount;
-  isActive?: boolean;
 }
 
 /**

package/src/components/OtherProducts/OtherProductsItem.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useActiveHandler } from './utils/useActiveHandler';
+import { useActiveHandler } from './useActiveHandler';
 import type { UniBlockProps } from '../../types';
 import type { blockItemCommonProps } from './OtherProductsContent';
 import { Icon } from '../../ui-kit/Icon/Icon';
@@ -7,30 +7,32 @@ import { OtherProductsItemInner } from './OtherProductsItemInner';
 
 export interface BlockItemProps extends blockItemCommonProps, UniBlockProps {}
 
-export const OtherProductsItem = JSX<BlockItemProps>(({ label, blocks, columns, context }) => {
-  const { hasContent, icon, handleToggle, isActive } = useActiveHandler({
-    context,
-    blocks,
-  });
+export const OtherProductsItem = JSX<BlockItemProps>(
+  ({ label, isExpanded, blocks, columns, context }) => {
+    const { hasContent, icon, handleToggle, isActive } = useActiveHandler({
+      context,
+      blocks,
+      initialState: isExpanded,
+    });
 
-  return (
-    <div className="border-0 border-b border-solid border-main-divider">
-      {hasContent ? (
-        <OtherProductsItemInner
-          columns={columns}
-          blocks={blocks}
-          context={context}
-          isActive={isActive}
-        />
-      ) : null}
-      <button
-        className={`border-none bg-primary-main px-0 py-[25px] text-center w-full font-sans text-white text-base
-        ${hasContent ? 'group cursor-pointer' : ''}`}
-        onClick={handleToggle}
-      >
-        <span className="pr-3">{isActive ? 'Скрыть' : label}</span>
-        {hasContent ? <Icon name={icon} width="20" height="20" asSVG /> : null}
-      </button>
-    </div>
-  );
-});
+    return (
+      <div className="border-0 border-b border-solid border-main-divider">
+        {hasContent ? (
+          <OtherProductsItemInner
+            isExpanded={isActive}
+            columns={columns}
+            blocks={blocks}
+            context={context}
+          />
+        ) : null}
+        <button
+          className="border-none bg-primary-main px-0 py-[25px] w-full font-sans text-white text-base flex justify-center cursor-pointer"
+          onClick={handleToggle}
+        >
+          <span className="pr-3">{isActive ? 'Скрыть' : label}</span>
+          {hasContent ? <Icon name={icon} width="20" height="20" asSVG /> : null}
+        </button>
+      </div>
+    );
+  },
+);

package/src/components/OtherProducts/{utils/useActiveHandler.ts → useActiveHandler.ts}

@@ -1,7 +1,8 @@
-import type { IconName } from '../../../icons/IconName';
+import type { IconName } from '../../icons/IconName';
+import { ActiveHandler } from '../../ui-kit/BlocksList/BlocksListProps';
 
-export const useActiveHandler = ({ context, blocks }) => {
-  const [isActive, setIsActive] = context.useState(false);
+export const useActiveHandler = ({ context, blocks, initialState = false }: ActiveHandler) => {
+  const [isActive, setIsActive] = context.useState(initialState);
   const hasContent = blocks?.length;
   const icon: IconName = isActive ? 'ArrowUpIcon' : 'ArrowDownIcon';
 

package/src/components/TariffsTable/TariffsTable.mobile.tsx

@@ -18,7 +18,9 @@ export const TariffsTable = JSX<TariffsTableProps>(
     const tiles = getTiles(rowHeaders, colData);
 
     return (
-      <section className={`px-4 py-6 bg-white font-sans text-primary-text ${className}`}>
+      <section
+        className={`px-4 py-6 bg-white font-sans text-primary-text overflow-x-hidden ${className}`}
+      >
         {title ? (
           <Heading
             headingType="h2"

package/src/content-page-repository/transformPicture.ts

@@ -13,8 +13,9 @@ export async function transformPicture(
   options: TransformationOptions,
 ): Promise<Picture> {
   const sources = picture.sources || [];
+  const src = picture?.src || '';
   const [transformedPicture, ...transformedSources] = await Promise.all(
-    [picture].concat(sources).map((_) => transformImg(pagePath, picture.src, { ...options, ..._ })),
+    [picture].concat(sources).map((_) => transformImg(pagePath, src, { ...options, ..._ })),
   );
   return {
     ...picture,

package/src/icons/IconName.ts

@@ -1,82 +1,9 @@
+
 // Generated. Do not touch
 /* eslint-disable max-lines */
 
 export enum IconMap {
-  ActualBalanceIcon = 'ActualBalanceIcon',
-  AppleIcon = 'AppleIcon',
-  ArrowDownIcon = 'ArrowDownIcon',
-  ArrowsRewindRight = 'ArrowsRewindRight',
-  ArrowUpIcon = 'ArrowUpIcon',
-  AtmIcon = 'AtmIcon',
-  BankIcon = 'BankIcon',
-  BurgerIcon = 'BurgerIcon',
-  BurgerIconWhite = 'BurgerIconWhite',
-  Calendar2Icon = 'Calendar2Icon',
-  CalendarCircleIcon = 'CalendarCircleIcon',
-  CalendarIcon = 'CalendarIcon',
-  CalendarTickIcon = 'CalendarTickIcon',
-  CalendarWhiteIcon = 'CalendarWhiteIcon',
-  CardIcon = 'CardIcon',
-  CardPosIcon = 'CardPosIcon',
-  CardTickIcon = 'CardTickIcon',
-  CardWithGemIcon = 'CardWithGemIcon',
-  ChartSquareIcon = 'ChartSquareIcon',
-  ClockIcon = 'ClockIcon',
-  CloseIcon = 'CloseIcon',
-  ComfortableCompIcon = 'ComfortableCompIcon',
-  CreditCardsIcon = 'CreditCardsIcon',
-  DiscountShapeIcon = 'DiscountShapeIcon',
-  DocIcon = 'DocIcon',
-  DocIconMonoColor = 'DocIconMonoColor',
-  DocumentTextIcon = 'DocumentTextIcon',
-  DollarIcon = 'DollarIcon',
-  EarthIcon = 'EarthIcon',
-  EmptyWalletChangeIcon = 'EmptyWalletChangeIcon',
-  EmptyWalletIcon = 'EmptyWalletIcon',
-  EmptyWalletWhiteIcon = 'EmptyWalletWhiteIcon',
-  EuroIcon = 'EuroIcon',
-  GeolocationIcon = 'GeolocationIcon',
-  GlassIcon = 'GlassIcon',
-  GlobalIcon = 'GlobalIcon',
-  GpsIcon = 'GpsIcon',
-  GridIcon = 'GridIcon',
-  GridIconWhite = 'GridIconWhite',
-  InterestGrowthIcon = 'InterestGrowthIcon',
-  InterestIcon = 'InterestIcon',
-  JCBIcon = 'JCBIcon',
-  LoupeIcon = 'LoupeIcon',
-  MasterCardIcon = 'MasterCardIcon',
-  MinusIcon = 'MinusIcon',
-  MirIcon = 'MirIcon',
-  MoneyIcon = 'MoneyIcon',
-  MoneyInsuranceIcon = 'MoneyInsuranceIcon',
-  MonitorMobileIcon = 'MonitorMobileIcon',
-  NewDocIcon = 'NewDocIcon',
-  OfficeIcon = 'OfficeIcon',
-  OkIcon = 'OkIcon',
-  PassSendIcon = 'PassSendIcon',
-  PercentageRoundIcon = 'PercentageRoundIcon',
-  PercentageSquareIcon = 'PercentageSquareIcon',
-  PercentageSquareWhiteIcon = 'PercentageSquareWhiteIcon',
-  PersonalCardIcon = 'PersonalCardIcon',
-  PlayMarketIcon = 'PlayMarketIcon',
-  PlusIcon = 'PlusIcon',
-  Profile2UserIcon = 'Profile2UserIcon',
-  ProfileIcon = 'ProfileIcon',
-  RoundRubleIcon = 'RoundRubleIcon',
-  SafeIcon = 'SafeIcon',
-  ShieldTickIcon = 'ShieldTickIcon',
-  SignDocsIcon = 'SignDocsIcon',
-  SmallClockIcon = 'SmallClockIcon',
-  TelegramIcon = 'TelegramIcon',
-  UnionPayIcon = 'UnionPayIcon',
-  UserTickIcon = 'UserTickIcon',
-  VisaIcon = 'VisaIcon',
-  VKIcon = 'VKIcon',
-  WalletAdd2Icon = 'WalletAdd2Icon',
-  WalletAddIcon = 'WalletAddIcon',
-  WalletIcon = 'WalletIcon',
-  WalletWithMoneyIcon = 'WalletWithMoneyIcon',
+  ActualBalanceIcon = "ActualBalanceIcon", AppleIcon = "AppleIcon", ArrowDownIcon = "ArrowDownIcon", ArrowsRewindRight = "ArrowsRewindRight", ArrowUpIcon = "ArrowUpIcon", AtmIcon = "AtmIcon", BankIcon = "BankIcon", BurgerIcon = "BurgerIcon", BurgerIconWhite = "BurgerIconWhite", Calendar2Icon = "Calendar2Icon", CalendarCircleIcon = "CalendarCircleIcon", CalendarIcon = "CalendarIcon", CalendarTickIcon = "CalendarTickIcon", CalendarWhiteIcon = "CalendarWhiteIcon", CardIcon = "CardIcon", CardPosIcon = "CardPosIcon", CardTickIcon = "CardTickIcon", CardWithGemIcon = "CardWithGemIcon", ChartSquareIcon = "ChartSquareIcon", ClockIcon = "ClockIcon", CloseIcon = "CloseIcon", ComfortableCompIcon = "ComfortableCompIcon", CreditCardsIcon = "CreditCardsIcon", DiscountShapeIcon = "DiscountShapeIcon", DocIcon = "DocIcon", DocIconMonoColor = "DocIconMonoColor", DocumentTextIcon = "DocumentTextIcon", DollarIcon = "DollarIcon", EarthIcon = "EarthIcon", EmptyWalletChangeIcon = "EmptyWalletChangeIcon", EmptyWalletIcon = "EmptyWalletIcon", EmptyWalletWhiteIcon = "EmptyWalletWhiteIcon", EuroIcon = "EuroIcon", GeolocationIcon = "GeolocationIcon", GlassIcon = "GlassIcon", GlobalIcon = "GlobalIcon", GpsIcon = "GpsIcon", GridIcon = "GridIcon", GridIconWhite = "GridIconWhite", InterestGrowthIcon = "InterestGrowthIcon", InterestIcon = "InterestIcon", JCBIcon = "JCBIcon", LoupeIcon = "LoupeIcon", MasterCardIcon = "MasterCardIcon", MinusIcon = "MinusIcon", MirIcon = "MirIcon", MoneyIcon = "MoneyIcon", MoneyInsuranceIcon = "MoneyInsuranceIcon", MonitorMobileIcon = "MonitorMobileIcon", NewDocIcon = "NewDocIcon", OfficeIcon = "OfficeIcon", OkIcon = "OkIcon", PassSendIcon = "PassSendIcon", PercentageRoundIcon = "PercentageRoundIcon", PercentageSquareIcon = "PercentageSquareIcon", PercentageSquareWhiteIcon = "PercentageSquareWhiteIcon", PersonalCardIcon = "PersonalCardIcon", PlayMarketIcon = "PlayMarketIcon", PlusIcon = "PlusIcon", Profile2UserIcon = "Profile2UserIcon", ProfileIcon = "ProfileIcon", RoundRubleIcon = "RoundRubleIcon", SafeIcon = "SafeIcon", ShieldTickIcon = "ShieldTickIcon", SignDocsIcon = "SignDocsIcon", SmallClockIcon = "SmallClockIcon", TelegramIcon = "TelegramIcon", UnionPayIcon = "UnionPayIcon", UserTickIcon = "UserTickIcon", VisaIcon = "VisaIcon", VKIcon = "VKIcon", WalletAdd2Icon = "WalletAdd2Icon", WalletAddIcon = "WalletAddIcon", WalletIcon = "WalletIcon", WalletWithMoneyIcon = "WalletWithMoneyIcon"
 }
 
 export enum IconTitleMap {
@@ -165,80 +92,4 @@ export enum IconTitleMap {
  *   "Деньги", "Лого «Apple»", "ArrowDownIcon", "ArrowsRewindRight", "ArrowUpIcon", "Банкомат", "Банк", "Бургер", "Бургер (белый)", "Календарь 2", "Скруглённый календарь", "Календарь", "Календарь с галочкой", "Календарь белый", "Кред. карта", "Кред. карта под наклоном", "Кред. карта с галочкой", "Карта с драгоценностями", "Деньги внутри кошелька", "Часы", "Крестик", "Кресло", "Кредитные карты", "Скидка", "Документ", "Документ (одноцветный)", "Документ с текстом", "Доллар", "Земля", "Пустой кошелёк с возвратом", "Пустой кошелёк", "Пустой кошелёк (белый)", "Евро", "Геолокация", "Зеркало", "Глобус", "Gps", "Сетка", "Сетка (белая)", "Диаграмма роста", "Скидка", "JCB", "Лупа", "MasterCard", "Минус", "МИР", "Деньги", "Денежное страхование", "Монитор и мобильный", "Новый документ", "Офис", "Лого «Одноклассники»", "Бизнес", "Проценты (круг.)", "Проценты", "Проценты белые", "Персональная карта", "Лого «PlayMarket»", "Плюс", "Профиль, 2 персоны", "Профиль", "Рубль (круг.)", "Сейф", "Безопасность", "Подписанные документы", "Маленькие часы", "Лого «Telegram»", "UnionPay", "Пользователь", "Visa", "Лого «VK»", "Пополнение карты", "Кошелёк с плюсом", "Кошелёк", "Кошелёк с деньгами"
  * ]
  */
-export type IconName =
-  | ''
-  | 'ActualBalanceIcon'
-  | 'AppleIcon'
-  | 'ArrowDownIcon'
-  | 'ArrowsRewindRight'
-  | 'ArrowUpIcon'
-  | 'AtmIcon'
-  | 'BankIcon'
-  | 'BurgerIcon'
-  | 'BurgerIconWhite'
-  | 'Calendar2Icon'
-  | 'CalendarCircleIcon'
-  | 'CalendarIcon'
-  | 'CalendarTickIcon'
-  | 'CalendarWhiteIcon'
-  | 'CardIcon'
-  | 'CardPosIcon'
-  | 'CardTickIcon'
-  | 'CardWithGemIcon'
-  | 'ChartSquareIcon'
-  | 'ClockIcon'
-  | 'CloseIcon'
-  | 'ComfortableCompIcon'
-  | 'CreditCardsIcon'
-  | 'DiscountShapeIcon'
-  | 'DocIcon'
-  | 'DocIconMonoColor'
-  | 'DocumentTextIcon'
-  | 'DollarIcon'
-  | 'EarthIcon'
-  | 'EmptyWalletChangeIcon'
-  | 'EmptyWalletIcon'
-  | 'EmptyWalletWhiteIcon'
-  | 'EuroIcon'
-  | 'GeolocationIcon'
-  | 'GlassIcon'
-  | 'GlobalIcon'
-  | 'GpsIcon'
-  | 'GridIcon'
-  | 'GridIconWhite'
-  | 'InterestGrowthIcon'
-  | 'InterestIcon'
-  | 'JCBIcon'
-  | 'LoupeIcon'
-  | 'MasterCardIcon'
-  | 'MinusIcon'
-  | 'MirIcon'
-  | 'MoneyIcon'
-  | 'MoneyInsuranceIcon'
-  | 'MonitorMobileIcon'
-  | 'NewDocIcon'
-  | 'OfficeIcon'
-  | 'OkIcon'
-  | 'PassSendIcon'
-  | 'PercentageRoundIcon'
-  | 'PercentageSquareIcon'
-  | 'PercentageSquareWhiteIcon'
-  | 'PersonalCardIcon'
-  | 'PlayMarketIcon'
-  | 'PlusIcon'
-  | 'Profile2UserIcon'
-  | 'ProfileIcon'
-  | 'RoundRubleIcon'
-  | 'SafeIcon'
-  | 'ShieldTickIcon'
-  | 'SignDocsIcon'
-  | 'SmallClockIcon'
-  | 'TelegramIcon'
-  | 'UnionPayIcon'
-  | 'UserTickIcon'
-  | 'VisaIcon'
-  | 'VKIcon'
-  | 'WalletAdd2Icon'
-  | 'WalletAddIcon'
-  | 'WalletIcon'
-  | 'WalletWithMoneyIcon';
+export type IconName = "" | "ActualBalanceIcon" | "AppleIcon" | "ArrowDownIcon" | "ArrowsRewindRight" | "ArrowUpIcon" | "AtmIcon" | "BankIcon" | "BurgerIcon" | "BurgerIconWhite" | "Calendar2Icon" | "CalendarCircleIcon" | "CalendarIcon" | "CalendarTickIcon" | "CalendarWhiteIcon" | "CardIcon" | "CardPosIcon" | "CardTickIcon" | "CardWithGemIcon" | "ChartSquareIcon" | "ClockIcon" | "CloseIcon" | "ComfortableCompIcon" | "CreditCardsIcon" | "DiscountShapeIcon" | "DocIcon" | "DocIconMonoColor" | "DocumentTextIcon" | "DollarIcon" | "EarthIcon" | "EmptyWalletChangeIcon" | "EmptyWalletIcon" | "EmptyWalletWhiteIcon" | "EuroIcon" | "GeolocationIcon" | "GlassIcon" | "GlobalIcon" | "GpsIcon" | "GridIcon" | "GridIconWhite" | "InterestGrowthIcon" | "InterestIcon" | "JCBIcon" | "LoupeIcon" | "MasterCardIcon" | "MinusIcon" | "MirIcon" | "MoneyIcon" | "MoneyInsuranceIcon" | "MonitorMobileIcon" | "NewDocIcon" | "OfficeIcon" | "OkIcon" | "PassSendIcon" | "PercentageRoundIcon" | "PercentageSquareIcon" | "PercentageSquareWhiteIcon" | "PersonalCardIcon" | "PlayMarketIcon" | "PlusIcon" | "Profile2UserIcon" | "ProfileIcon" | "RoundRubleIcon" | "SafeIcon" | "ShieldTickIcon" | "SignDocsIcon" | "SmallClockIcon" | "TelegramIcon" | "UnionPayIcon" | "UserTickIcon" | "VisaIcon" | "VKIcon" | "WalletAdd2Icon" | "WalletAddIcon" | "WalletIcon" | "WalletWithMoneyIcon";

package/src/model/Picture.ts

@@ -1,6 +1,6 @@
 export interface Img {
   /** @title Картинка */
-  src: string;
+  src?: string;
   /** @title Альтернативный текст (alt) */
   alt?: string;
   /** @title Текст подсказки (title) */
@@ -9,7 +9,7 @@ export interface Img {
 
 export interface ImgSource {
   /** @title Картинка */
-  src: string;
+  src?: string;
   /** @title Формат */
   format?: 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
   /** @hidden */

package/src/ui-kit/BlocksList/BlocksListProps.ts

@@ -8,6 +8,13 @@ import type { ProductTileContent } from '../../components/ProductTile/ProductTil
 import type { TextBlockContent } from '../../components/TextBlock/TextBlockContent';
 import type { TileContent } from '../../components/Tile/TileContent';
 import type { LinkListContent } from '../../components/LinkList/LinkListContent';
+import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+
+export interface ActiveHandler {
+  context: ContentPageContext;
+  blocks?: BlockDef[];
+  initialState?: boolean;
+}
 
 /**
  * @title Количество колонок
@@ -15,74 +22,65 @@ import type { LinkListContent } from '../../components/LinkList/LinkListContent'
  */
 export type ColumnsCount = 1 | 2;
 
-/**
- * @title Тип блока
- */
-export type BlockDefType =
-  | 'Headline'
-  | 'LinkDocs'
-  | 'TextBlock'
-  | 'PictureText'
-  | 'Tile'
-  | 'ProductTile'
-  | 'ProductBlock'
-  | 'Gallery'
-  | 'MiniGallery'
-  | 'LinkList';
-
-interface BaseBlockDef {
-  blockListType: BlockDefType;
-}
-
 /**
  * @title Заголовок
+ * @default {"blockListType": "Headline"}
  */
-export type HeadlineBlockListDef = HeadlineContent & BaseBlockDef;
+export type HeadlineBlockListDef = HeadlineContent & { blockListType: 'Headline' };
 
 /**
  * @title Список документов
+ * @default {"blockListType": "LinkDocs"}
  */
-export type LinkDocsBlockListDef = LinkDocsContent & BaseBlockDef;
+export type LinkDocsBlockListDef = LinkDocsContent & { blockListType: 'LinkDocs' };
 
 /**
  * @title Текстовый блок
+ * @default {"blockListType": "TextBlock"}
  */
-export type TextBlockBlockListDef = TextBlockContent & BaseBlockDef;
+export type TextBlockBlockListDef = TextBlockContent & { blockListType: 'TextBlock' };
 
 /**
  * @title Картинка с текстом
+ * @default {"blockListType": "PictureText"}
  */
-export type PictureTextBlockListDef = PictureTextContent & BaseBlockDef;
+export type PictureTextBlockListDef = PictureTextContent & { blockListType: 'PictureText' };
 
 /**
  * @title Продуктовый блок
+ * @default {"blockListType": "ProductBlock"}
  */
-export type ProductBlockBlockListDef = ProductBlockContent & BaseBlockDef;
+export type ProductBlockBlockListDef = ProductBlockContent & { blockListType: 'ProductBlock' };
 
 /**
  * @title Плитка
+ * @default {"blockListType": "Tile"}
  */
-export type TileBlockListDef = TileContent & BaseBlockDef;
+export type TileBlockListDef = TileContent & { blockListType: 'Tile' };
 
 /**
  * @title Продуктовая плитка
+ * @default {"blockListType": "ProductTile"}
  */
-export type ProductTileBlockListDef = ProductTileContent & BaseBlockDef;
+export type ProductTileBlockListDef = ProductTileContent & { blockListType: 'ProductTile' };
 
 /**
  * @title Галлерея
+ * @default {"blockListType": "Gallery"}
  */
-export type GalleryBlockListDef = GalleryContent & BaseBlockDef;
+export type GalleryBlockListDef = GalleryContent & { blockListType: 'Gallery' };
 
 /**
  * @title Мини-галлерея
+ * @default {"blockListType": "MiniGallery"}
  */
-export type MiniGalleryBlockListDef = MiniGalleryContent & BaseBlockDef;
+export type MiniGalleryBlockListDef = MiniGalleryContent & { blockListType: 'MiniGallery' };
 
 /**
  * @title Список ссылок
+ * @default {"blockListType": "LinkList"}
  */
-export type LinkListBlockListDef = LinkListContent & BaseBlockDef;
+export type LinkListBlockListDef = LinkListContent & { blockListType: 'LinkList' };
 
 /**
  * @title Выберите блок

package/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -2,19 +2,27 @@ import type { JSXBlock } from '../../components/ContentPage/ContentPage';
 import type { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
 import type { BlockDef, ColumnsCount } from './BlocksListProps';
 import { EmbeddableBlocks } from './EmbeddableBlocks';
+import { BlockVersion } from '../../model/BlockVersion';
 
 type EmbeddableBlocksProps = {
   blocks?: BlockDef[];
   context: ContentPageContext;
   columns?: ColumnsCount;
   className?: string;
+  version?: BlockVersion;
 };
 
-export const renderBlocksList = ({ blocks, context, className, columns }: EmbeddableBlocksProps) =>
-  blocks?.length ? blocks.map(renderBlock({ context, className, columns })) : null;
+export const renderBlocksList = ({
+  blocks,
+  context,
+  className,
+  columns,
+  version,
+}: EmbeddableBlocksProps) =>
+  blocks?.length ? blocks.map(renderBlock({ context, className, columns, version })) : null;
 
 export const renderBlock =
-  ({ context, columns, className }: EmbeddableBlocksProps) =>
+  ({ context, columns, className, version }: EmbeddableBlocksProps) =>
   (block: BlockDef, i: number) => {
     const type = block?.blockListType;
     if (!type || !(type in EmbeddableBlocks)) {
@@ -24,7 +32,7 @@ export const renderBlock =
     const EmbeddedBlock: JSXBlock = EmbeddableBlocks[type];
     return (
       <div className={`${className} ${columnsCountClass}`} key={`block_${i}`}>
-        <EmbeddedBlock context={context} {...block} className="!p-0" />
+        <EmbeddedBlock context={context} {...block} blockVersion={version} className="!p-0" />
       </div>
     );
   };

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

@@ -31,7 +31,7 @@ export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
         placeholder="some search"
       />
       <button
-        className="visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer"
+        className="visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
         onClick={(e) => {
           e.preventDefault();
           setTerm('');

package/dist/components/Accordion/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "MinusIcon" | "PlusIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/dist/components/Accordion/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/Accordion/utils/useActiveHandler.ts"],"names":[],"mappings":";;AAEO,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3D,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;IAEzE,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B"}

package/dist/components/OtherProducts/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "ArrowDownIcon" | "ArrowUpIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/dist/components/OtherProducts/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/OtherProducts/utils/useActiveHandler.ts"],"names":[],"mappings":";;AAEO,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;IAElE,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;IAE7E,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B"}

package/lib/components/Accordion/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "MinusIcon" | "PlusIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/lib/components/Accordion/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/Accordion/utils/useActiveHandler.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3D,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;IAEzE,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC"}

package/lib/components/OtherProducts/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "ArrowDownIcon" | "ArrowUpIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/lib/components/OtherProducts/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/OtherProducts/utils/useActiveHandler.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;IAElE,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;IAE7E,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC"}

package/mobile/dist/components/Accordion/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "MinusIcon" | "PlusIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/mobile/dist/components/Accordion/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/Accordion/utils/useActiveHandler.ts"],"names":[],"mappings":";;AAEO,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3D,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;IAEzE,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B"}

package/mobile/dist/components/OtherProducts/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "ArrowDownIcon" | "ArrowUpIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/mobile/dist/components/OtherProducts/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/OtherProducts/utils/useActiveHandler.ts"],"names":[],"mappings":";;AAEO,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;IAElE,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;IAE7E,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B"}

package/mobile/lib/components/Accordion/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "MinusIcon" | "PlusIcon";
-    handleToggle: (e: MouseEvent) => void;
-};

package/mobile/lib/components/Accordion/utils/useActiveHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveHandler.js","sourceRoot":"","sources":["../../../../src/components/Accordion/utils/useActiveHandler.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,EAAE,MAAM,CAAC;IAClC,MAAM,IAAI,GAAa,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3D,MAAM,eAAe,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;IAEzE,MAAM,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QACrC,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS;YACzD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,YAAY,CAAC,YAAY,IAAI,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACtD,CAAC,CAAC"}

package/mobile/lib/components/OtherProducts/utils/useActiveHandler.d.ts

@@ -1,9 +0,0 @@
-export declare const useActiveHandler: ({ context, blocks }: {
-    context: any;
-    blocks: any;
-}) => {
-    isActive: any;
-    hasContent: any;
-    icon: "ArrowDownIcon" | "ArrowUpIcon";
-    handleToggle: (e: MouseEvent) => void;
-};