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

package/mobile/src/icons/IconName.ts

@@ -1,8 +1,13 @@
 
 // Generated. Do not touch
+/* eslint-disable max-lines */
 
 export enum IconMap {
-  ActualBalanceIcon = "ActualBalanceIcon", AppleIcon = "AppleIcon", ArrowsRewindRight = "ArrowsRewindRight", 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 {
+  ActualBalanceIcon = "Деньги", AppleIcon = "Лого «Apple»", ArrowDownIcon = "ArrowDownIcon", ArrowsRewindRight = "ArrowsRewindRight", ArrowUpIcon = "ArrowUpIcon", AtmIcon = "Банкомат", BankIcon = "Банк", BurgerIcon = "Бургер", BurgerIconWhite = "Бургер (белый)", Calendar2Icon = "Календарь 2", 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 = "Gps", GridIcon = "Сетка", GridIconWhite = "Сетка (белая)", InterestGrowthIcon = "Диаграмма роста", InterestIcon = "Скидка", JCBIcon = "JCB", LoupeIcon = "Лупа", MasterCardIcon = "MasterCard", MinusIcon = "Минус", MirIcon = "МИР", MoneyIcon = "Деньги", MoneyInsuranceIcon = "Денежное страхование", MonitorMobileIcon = "Монитор и мобильный", NewDocIcon = "Новый документ", OfficeIcon = "Офис", OkIcon = "Лого «Одноклассники»", PassSendIcon = "Бизнес", PercentageRoundIcon = "Проценты (круг.)", PercentageSquareIcon = "Проценты", PercentageSquareWhiteIcon = "Проценты белые", PersonalCardIcon = "Персональная карта", PlayMarketIcon = "Лого «PlayMarket»", PlusIcon = "Плюс", Profile2UserIcon = "Профиль, 2 персоны", ProfileIcon = "Профиль", RoundRubleIcon = "Рубль (круг.)", SafeIcon = "Сейф", ShieldTickIcon = "Безопасность", SignDocsIcon = "Подписанные документы", SmallClockIcon = "Маленькие часы", TelegramIcon = "Лого «Telegram»", UnionPayIcon = "UnionPay", UserTickIcon = "Пользователь", VisaIcon = "Visa", VKIcon = "Лого «VK»", WalletAdd2Icon = "Пополнение карты", WalletAddIcon = "Кошелёк с плюсом", WalletIcon = "Кошелёк", WalletWithMoneyIcon = "Кошелёк с деньгами"
 }
 
 /**
@@ -10,7 +15,7 @@ export enum IconMap {
  * @title Иконка
  * @enumNames [
  *   "",
- *   "Деньги", "Лого «Apple»", "ArrowsRewindRight", "Банкомат", "Банк", "Бургер", "Бургер (белый)", "Календарь 2", "Скруглённый календарь", "Календарь", "Календарь с галочкой", "Календарь белый", "Кред. карта", "Кред. карта под наклоном", "Кред. карта с галочкой", "Карта с драгоценностями", "Деньги внутри кошелька", "Часы", "Крестик", "Кресло", "Кредитные карты", "Скидка", "Документ", "Документ (одноцветный)", "Документ с текстом", "Доллар", "Земля", "Пустой кошелёк с возвратом", "Пустой кошелёк", "Пустой кошелёк (белый)", "Евро", "Геолокация", "Зеркало", "Глобус", "Gps", "Сетка", "Сетка (белая)", "Диаграмма роста", "Скидка", "JCB", "Лупа", "MasterCard", "Минус", "МИР", "Деньги", "Денежное страхование", "Монитор и мобильный", "Новый документ", "Офис", "Лого «Одноклассники»", "Бизнес", "Проценты (круг.)", "Проценты", "Проценты белые", "Персональная карта", "Лого «PlayMarket»", "Плюс", "Профиль, 2 персоны", "Профиль", "Рубль (круг.)", "Сейф", "Безопасность", "Подписанные документы", "Маленькие часы", "Лого «Telegram»", "UnionPay", "Пользователь", "Visa", "Лого «VK»", "Пополнение карты", "Кошелёк с плюсом", "Кошелёк", "Кошелёк с деньгами"
+ *   "Деньги", "Лого «Apple»", "ArrowDownIcon", "ArrowsRewindRight", "ArrowUpIcon", "Банкомат", "Банк", "Бургер", "Бургер (белый)", "Календарь 2", "Скруглённый календарь", "Календарь", "Календарь с галочкой", "Календарь белый", "Кред. карта", "Кред. карта под наклоном", "Кред. карта с галочкой", "Карта с драгоценностями", "Деньги внутри кошелька", "Часы", "Крестик", "Кресло", "Кредитные карты", "Скидка", "Документ", "Документ (одноцветный)", "Документ с текстом", "Доллар", "Земля", "Пустой кошелёк с возвратом", "Пустой кошелёк", "Пустой кошелёк (белый)", "Евро", "Геолокация", "Зеркало", "Глобус", "Gps", "Сетка", "Сетка (белая)", "Диаграмма роста", "Скидка", "JCB", "Лупа", "MasterCard", "Минус", "МИР", "Деньги", "Денежное страхование", "Монитор и мобильный", "Новый документ", "Офис", "Лого «Одноклассники»", "Бизнес", "Проценты (круг.)", "Проценты", "Проценты белые", "Персональная карта", "Лого «PlayMarket»", "Плюс", "Профиль, 2 персоны", "Профиль", "Рубль (круг.)", "Сейф", "Безопасность", "Подписанные документы", "Маленькие часы", "Лого «Telegram»", "UnionPay", "Пользователь", "Visa", "Лого «VK»", "Пополнение карты", "Кошелёк с плюсом", "Кошелёк", "Кошелёк с деньгами"
  * ]
  */
-export type IconName = "" | "ActualBalanceIcon" | "AppleIcon" | "ArrowsRewindRight" | "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/mobile/src/model/BlockVersion.ts

@@ -6,6 +6,6 @@ export type BlockVersion = 'primary' | 'secondary';
 
 /**
  * @title Цвет блока
- * @enumNames ["Прозрачная", Основная", "Второстепенная"]
+ * @enumNames ["Прозрачная", "Основная", "Второстепенная"]
  */
 export type BlockVersionWithTransparent = 'transparent' | 'primary' | 'secondary';

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

@@ -0,0 +1,106 @@
+import type { GalleryContent } from '../../components/Gallery/GalleryContent';
+import type { HeadlineContent } from '../../components/Headline/HeadlineContent';
+import type { LinkDocsContent } from '../../components/LinkDocs/LinkDocsContent';
+import type { MiniGalleryContent } from '../../components/MiniGallery/MiniGalleryContent';
+import type { PictureTextContent } from '../../components/PictureText/PictureTextContent';
+import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
+import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
+import type { TextBlockContent } from '../../components/TextBlock/TextBlockContent';
+import type { TileContent } from '../../components/Tile/TileContent';
+import type { LinkListContent } from '../../components/LinkList/LinkListContent';
+
+/**
+ * @title Количество колонок
+ * @enumNames ["1 колонка", "2 колонки"]
+ */
+export type ColumnsCount = 1 | 2;
+
+/**
+ * @title Тип блока
+ */
+export type BlockDefType =
+  | 'Headline'
+  | 'LinkDocs'
+  | 'TextBlock'
+  | 'PictureText'
+  | 'Tile'
+  | 'ProductTile'
+  | 'ProductBlock'
+  | 'Gallery'
+  | 'MiniGallery'
+  | 'LinkList';
+
+interface BaseBlockDef {
+  blockListType: BlockDefType;
+}
+
+/**
+ * @title Заголовок
+ */
+export type HeadlineBlockListDef = HeadlineContent & BaseBlockDef;
+
+/**
+ * @title Список документов
+ */
+export type LinkDocsBlockListDef = LinkDocsContent & BaseBlockDef;
+
+/**
+ * @title Текстовый блок
+ */
+export type TextBlockBlockListDef = TextBlockContent & BaseBlockDef;
+
+/**
+ * @title Картинка с текстом
+ */
+export type PictureTextBlockListDef = PictureTextContent & BaseBlockDef;
+
+/**
+ * @title Продуктовый блок
+ */
+export type ProductBlockBlockListDef = ProductBlockContent & BaseBlockDef;
+
+/**
+ * @title Плитка
+ */
+export type TileBlockListDef = TileContent & BaseBlockDef;
+
+/**
+ * @title Продуктовая плитка
+ */
+export type ProductTileBlockListDef = ProductTileContent & BaseBlockDef;
+
+/**
+ * @title Галлерея
+ */
+export type GalleryBlockListDef = GalleryContent & BaseBlockDef;
+
+/**
+ * @title Мини-галлерея
+ */
+export type MiniGalleryBlockListDef = MiniGalleryContent & BaseBlockDef;
+
+/**
+ * @title Список ссылок
+ */
+export type LinkListBlockListDef = LinkListContent & BaseBlockDef;
+
+/**
+ * @title Выберите блок
+ */
+export type EmptyOption = null;
+
+/**
+ * @title Содержимое блока
+ */
+export type BlockDef =
+  | EmptyOption
+  | HeadlineBlockListDef
+  | LinkDocsBlockListDef
+  | TextBlockBlockListDef
+  | PictureTextBlockListDef
+  | ProductBlockBlockListDef
+  | TileBlockListDef
+  | ProductTileBlockListDef
+  | GalleryBlockListDef
+  | MiniGalleryBlockListDef
+  | LinkListBlockListDef;

package/mobile/src/ui-kit/BlocksList/EmbeddableBlocks.tsx

@@ -0,0 +1,23 @@
+import { Headline } from '../../components/Headline/Headline';
+import { LinkDocs } from '../../components/LinkDocs/LinkDocs';
+import { PictureText } from '../../components/PictureText/PictureText';
+import { ProductBlock } from '../../components/ProductBlock/ProductBlock';
+import { TextBlock } from '../../components/TextBlock/TextBlock';
+import { Tile } from '../../components/Tile/Tile';
+import { ProductTile } from '../../components/ProductTile/ProductTile';
+import { Gallery } from '../../components/Gallery/Gallery';
+import { MiniGallery } from '../../components/MiniGallery/MiniGallery';
+import { LinkList } from '../../components/LinkList/LinkList';
+
+export const EmbeddableBlocks = {
+  Headline,
+  LinkDocs,
+  TextBlock,
+  PictureText,
+  ProductBlock,
+  Tile,
+  ProductTile,
+  Gallery,
+  MiniGallery,
+  LinkList,
+};

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

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

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { projectSettings } from '../../ProjectSettings';
 import type { IconColor, IconProps } from './IconProps';
+import { IconTitleMap } from '../../icons/IconName';
 
 const svgColorsMap: Record<IconColor, string> = {
   none: '',
@@ -11,7 +12,7 @@ export const Icon = JSX<IconProps>(
   ({
     className = '',
     name,
-    alt = `Icon ${name}`,
+    alt = `Иконка ${IconTitleMap[name] || name}`,
     title = alt,
     asSVG,
     color = 'primary',

package/package.json

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

package/src/common.css

@@ -22,26 +22,6 @@
 }
 /* Ecosystem own | Yellow */
 [data-theme='eo'] {
-  --color-primary-main: 221, 182, 61;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
-[data-theme='eo2'] {
-  --color-primary-main: 255, 204, 0;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
-[data-theme='eo3'] {
   --color-primary-main: 225, 186, 30;
   --color-primary-hover: 187, 151, 39;
   --color-primary-active: 126, 99, 12;
@@ -51,16 +31,6 @@
   --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
 }
 
-[data-theme='eo4'] {
-  --color-primary-main: 233, 191, 23;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
 @tailwind components;
 @tailwind utilities;
 

package/src/components/Accordion/Accordion.example.json

@@ -5,12 +5,12 @@
       "label": "Аккордеон 1",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }
@@ -20,12 +20,12 @@
       "label": "Аккордеон 2",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }
@@ -35,12 +35,12 @@
       "label": "Аккордеон 3",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }

package/src/components/Accordion/Accordion.fixture.mobile.tsx

@@ -6,29 +6,29 @@ import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
 import type { AccordionProps } from './Accordion';
 import { Accordion } from './Accordion';
 import type {
-  HeadlineAccordionBlockDef,
-  LinkDocsAccordionBlockDef,
-  PictureTextAccordionBlockDef,
-  TextBlockAccordionBlockDef,
-} from './AccordionContent';
+  HeadlineBlockListDef,
+  LinkDocsBlockListDef,
+  PictureTextBlockListDef,
+  TextBlockBlockListDef,
+} from '../../ui-kit/BlocksList/BlocksListProps';
 
-const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockAccordionBlockDef = {
-  accordionBlockType: 'TextBlock',
+const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
+  blockListType: 'TextBlock',
   ...TEXT_BLOCK,
 };
 
-const HEADLINE_ACCORDION_BLOCK: HeadlineAccordionBlockDef = {
-  accordionBlockType: 'Headline',
+const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
+  blockListType: 'Headline',
   ...HEADLINE,
 };
 
-const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextAccordionBlockDef = {
-  accordionBlockType: 'PictureText',
+const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
+  blockListType: 'PictureText',
   ...PICTURE_TEXT,
 };
 
-const LINK_DOCS_ACCORDION_BLOCK: LinkDocsAccordionBlockDef = {
-  accordionBlockType: 'LinkDocs',
+const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
+  blockListType: 'LinkDocs',
   ...linkDocsContentExample,
   title: '',
 };

package/src/components/Accordion/Accordion.fixture.tsx

@@ -4,77 +4,60 @@ import { HEADLINE } from '../Headline/Headline.fixture';
 import { linkDocsContentExample } from '../LinkDocs/linkDocsContentExample';
 import { defaultProps as MINI_GALLERY } from '../MiniGallery/MiniGallery.fixture';
 import { PICTURE_TEXT } from '../PictureText/PictureText.fixture';
-import { PRODUCT_BLOCK } from '../ProductBlock/ProductBlock.fixture';
-import { PRODUCT_TILE, PRODUCT_PENSION_TILE } from '../ProductTile/ProductTile.fixture';
+import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
 import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
-import { TILE, TILE_PREMIUM } from '../Tile/Tile.fixture';
+import { TILE } from '../Tile/Tile.fixture';
 import type { AccordionProps } from './Accordion';
 import { Accordion } from './Accordion';
 import type {
-  GalleryAccordionBlockDef,
-  HeadlineAccordionBlockDef,
-  LinkDocsAccordionBlockDef,
-  MiniGalleryAccordionBlockDef,
-  PictureTextAccordionBlockDef,
-  ProductBlockAccordionBlockDef,
-  ProductTileAccordionBlockDef,
-  TextBlockAccordionBlockDef,
-  TileAccordionBlockDef,
-} from './AccordionContent';
-
-const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockAccordionBlockDef = {
-  accordionBlockType: 'TextBlock',
+  GalleryBlockListDef,
+  HeadlineBlockListDef,
+  LinkDocsBlockListDef,
+  MiniGalleryBlockListDef,
+  PictureTextBlockListDef,
+  ProductTileBlockListDef,
+  TextBlockBlockListDef,
+  TileBlockListDef,
+} from '../../ui-kit/BlocksList/BlocksListProps';
+
+const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
+  blockListType: 'TextBlock',
   ...TEXT_BLOCK,
 };
 
-const HEADLINE_ACCORDION_BLOCK: HeadlineAccordionBlockDef = {
-  accordionBlockType: 'Headline',
+const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
+  blockListType: 'Headline',
   ...HEADLINE,
 };
 
-const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextAccordionBlockDef = {
-  accordionBlockType: 'PictureText',
+const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
+  blockListType: 'PictureText',
   ...PICTURE_TEXT,
 };
 
-const PRODUCT_BLOCK_ACCORDION_BLOCK: ProductBlockAccordionBlockDef = {
-  accordionBlockType: 'ProductBlock',
-  ...PRODUCT_BLOCK,
-};
-
-const LINK_DOCS_ACCORDION_BLOCK: LinkDocsAccordionBlockDef = {
-  accordionBlockType: 'LinkDocs',
+const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
+  blockListType: 'LinkDocs',
   ...linkDocsContentExample,
   title: '',
 };
 
-const TILES_ACCORDION_BLOCK: TileAccordionBlockDef = {
-  accordionBlockType: 'Tile',
+const TILES_ACCORDION_BLOCK: TileBlockListDef = {
+  blockListType: 'Tile',
   ...TILE,
 };
 
-const TILES_PREMIUM_ACCORDION_BLOCK: TileAccordionBlockDef = {
-  accordionBlockType: 'Tile',
-  ...TILE_PREMIUM,
-};
-
-const PRODUCT_TILES_ACCORDION_BLOCK: ProductTileAccordionBlockDef = {
-  accordionBlockType: 'ProductTile',
+const PRODUCT_TILES_ACCORDION_BLOCK: ProductTileBlockListDef = {
+  blockListType: 'ProductTile',
   ...PRODUCT_TILE,
 };
 
-const PRODUCT_PENSION_TILES__ACCORDION_BLOCK: ProductTileAccordionBlockDef = {
-  accordionBlockType: 'ProductTile',
-  ...PRODUCT_PENSION_TILE,
-};
-
-const GALLERY_ACCORDION_BLOCK: GalleryAccordionBlockDef = {
-  accordionBlockType: 'Gallery',
+const GALLERY_ACCORDION_BLOCK: GalleryBlockListDef = {
+  blockListType: 'Gallery',
   ...GALLERY,
 };
 
-const MINI_GALLERY_ACCORDION_BLOCK: MiniGalleryAccordionBlockDef = {
-  accordionBlockType: 'MiniGallery',
+const MINI_GALLERY_ACCORDION_BLOCK: MiniGalleryBlockListDef = {
+  blockListType: 'MiniGallery',
   ...MINI_GALLERY,
 };
 
@@ -116,58 +99,10 @@ const propsBlock: AccordionProps = {
   ],
 };
 
-const propsTwoColumns: AccordionProps = {
-  context,
-  accordionItems: [
-    {
-      label: 'Другие продукты Россельхозбанка 1',
-      blocks: [
-        TILES_PREMIUM_ACCORDION_BLOCK,
-        TILES_PREMIUM_ACCORDION_BLOCK,
-        TILES_ACCORDION_BLOCK,
-        TILES_ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-    {
-      label: 'Другие продукты Россельхозбанка 2',
-      blocks: [
-        PRODUCT_TILES_ACCORDION_BLOCK,
-        PRODUCT_TILES_ACCORDION_BLOCK,
-        PRODUCT_PENSION_TILES__ACCORDION_BLOCK,
-        PRODUCT_PENSION_TILES__ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-    {
-      label: 'Другие продукты Россельхозбанка 3',
-      blocks: [PRODUCT_BLOCK_ACCORDION_BLOCK, PRODUCT_BLOCK_ACCORDION_BLOCK],
-      columns: 2,
-    },
-
-    {
-      label: 'Другие продукты Россельхозбанка 4',
-      blocks: [
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-  ],
-};
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
       <Accordion className="col-span-12" {...propsBlock} />
     </div>
   ),
-
-  'two columns': (
-    <div className="container grid grid-cols-12">
-      <Accordion className="col-span-12" {...propsTwoColumns} />
-    </div>
-  ),
 };