@redneckz/wildless-cms-uni-blocks 0.12.13 → 0.13.0

package/mobile/src/hooks/useLink.ts

@@ -1,5 +1,5 @@
 import type { LinkProps } from '../model/LinkProps';
-import { useDialog } from '../ui-kit/Dialog/useDialog';
+import { useDialogManager } from '../ui-kit/DialogManager/useDialogManager';
 import type { PreventableEvent } from '../ui-kit/PreventableEvent';
 import { adjustHref } from '../utils/adjustHref';
 import { isLocalURL } from '../utils/url';
@@ -19,7 +19,7 @@ export function useLink(params: UseLinkParams = {}) {
   const { isRemote, basePath } = params;
 
   const router = useRouter();
-  const { close } = useDialog();
+  const { closeAll } = useDialogManager();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
@@ -37,7 +37,7 @@ export function useLink(params: UseLinkParams = {}) {
         return;
       }
 
-      close();
+      closeAll();
 
       // Client routing
       ev?.preventDefault();

package/mobile/src/hooks/useList.ts

@@ -0,0 +1,24 @@
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+
+export function useList<T>(initialList: T[] = []): [
+  T[],
+  {
+    setList: (_: T[]) => void;
+    push: (item: T) => void;
+    pop: () => void;
+    remove: (item: T) => void;
+    clear: () => void;
+  },
+] {
+  const [list, setList] = useState<T[]>(initialList);
+
+  const push = useCallback((item: T) => setList((_) => [..._, item]), []);
+  const pop = useCallback(() => setList((_) => _.slice(0, -1)), []);
+  const remove = useCallback(
+    (item: T) => setList((_) => _.filter((currentItem) => currentItem !== item)),
+    [],
+  );
+  const clear = useCallback(() => setList([]), []);
+
+  return [list, { setList, push, pop, remove, clear }];
+}

package/mobile/src/hooks/useLocation.ts

@@ -1,6 +1,8 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { defaultEventBus } from '../EventBus/defaultEventBus';
+import { useLatestEvent } from '../EventBus/useLatestEvent';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
-import { useCachedAsyncData } from './useCachedAsyncData';
 
 const REGION_URL = '/api/v1/region';
 
@@ -10,42 +12,46 @@ export interface RegionData {
   name?: string;
 }
 
-interface LocationStorageData {
-  manual?: boolean;
-  region: RegionData;
-}
+const LOCATION_STORAGE_KEY = 'location';
 
-export function useLocation(
-  defaultLocation = 'Москва',
-): [RegionData, (newLocation: RegionData) => void] {
-  const currentLocation = getLocalStorageLocation();
-  const [location, setLocation] = useState<RegionData>(
-    currentLocation?.region ?? { name: defaultLocation },
+export function useLocation(defaultLocation = 'Москва'): [RegionData, (_: RegionData) => void] {
+  const [currentLocation, fireCurrentLocation] = useLatestEvent(
+    defaultEventBus,
+    'location',
+    restoreLocation() ?? { name: defaultLocation },
   );
-  const { data } = useCachedAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
 
+  const selectCurrentLocation = useCallback((_: RegionData) => {
+    storeLocation(_);
+    fireCurrentLocation(_);
+  }, []);
+
+  const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
   useEffect(() => {
-    setLocation(
-      currentLocation?.region && currentLocation?.manual
-        ? currentLocation.region
-        : data || { name: defaultLocation },
-    );
+    if (data && !hasStoredLocation()) {
+      fireCurrentLocation(data);
+    }
   }, [data]);
 
-  const onChangeLocation = useCallback((region: RegionData) => {
-    globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
-    setLocation(region);
-  }, []);
-
-  return [location, onChangeLocation];
+  return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
 }
 
-const getLocalStorageLocation = (): LocationStorageData | null => {
-  const localStorageLocation = globalThis.localStorage?.getItem('location');
+const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
 
+const restoreLocation = (): RegionData | null => {
   try {
-    return localStorageLocation ? JSON.parse(localStorageLocation) : null;
-  } catch (_) {
+    const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+
+    return data && JSON.parse(data);
+  } catch (ex) {
     return null;
   }
 };
+
+const storeLocation = (_: RegionData) => {
+  try {
+    globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+  } catch (ex) {
+    // Do nothing
+  }
+};

package/mobile/src/hooks/useSWRResource.ts

@@ -4,10 +4,15 @@ import { fetchJSONUnsafe } from '../utils/fetchJSON';
 
 const EMPTY_VALUE = {};
 
-export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
-  const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
-    fallback,
-  });
+export function useSWRResource<Data>(
+  filename: string | null | undefined,
+  fallback: Fallback = EMPTY_VALUE,
+): Data {
+  const { data } = useAsyncData<Data, any, string | null>(
+    filename ? `/wcms-resources/${filename}.json` : null,
+    fetchJSONUnsafe,
+    { fallback },
+  );
 
   return data || (EMPTY_VALUE as Data);
 }

package/mobile/src/icons/ArrowDownSolidIcon.svg

@@ -1 +1 @@
-<svg title="Стрелка сплошная 'Вниз'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="#C8CCD0" d="M6.293 9.457a1 1 0 0 1 1.414 0L12 13.75l4.293-4.293a1 1 0 1 1 1.414 1.414l-5 5a1 1 0 0 1-1.414 0l-5-5a1 1 0 0 1 0-1.414Z"/></svg>
+<svg title="Стрелка сплошная 'Вниз'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="currentColor" d="M6.293 9.457a1 1 0 0 1 1.414 0L12 13.75l4.293-4.293a1 1 0 1 1 1.414 1.414l-5 5a1 1 0 0 1-1.414 0l-5-5a1 1 0 0 1 0-1.414Z"/></svg>

package/mobile/src/icons/ArrowUpSolidIcon.svg

@@ -1 +1 @@
-<svg title="Стрелка сплошная 'Вверх'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="#C8CCD0" d="M17.707 14.871a1 1 0 0 1-1.414 0L12 10.578l-4.293 4.293a1 1 0 0 1-1.414-1.414l5-5a1 1 0 0 1 1.414 0l5 5a1 1 0 0 1 0 1.414Z"/></svg>
+<svg title="Стрелка сплошная 'Вверх'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="currentColor" d="M17.707 14.871a1 1 0 0 1-1.414 0L12 10.578l-4.293 4.293a1 1 0 0 1-1.414-1.414l5-5a1 1 0 0 1 1.414 0l5 5a1 1 0 0 1 0 1.414Z"/></svg>

package/mobile/src/icons/IconName.ts

@@ -3,15 +3,15 @@
 /* eslint-disable max-len, max-lines */
 
 export const IconsWithoutInversion = new Set([
-  'ActualBalanceIcon', 'AirPlaneIcon', 'BagIcon', 'BelarusianFlag', 'BriefcaseIcon', 'CardWithGemIcon', 'CarIcon', 'ChevronLeft', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MailIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PhoneIcon', 'PowerIcon', 'PumpkinIcon', 'ResponceFailIcon', 'ResponceOKIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
+  'ActualBalanceIcon', 'AirPlaneIcon', 'BagIcon', 'BelarusianFlag', 'BriefcaseIcon', 'CardWithGemIcon', 'CarIcon', 'ChevronLeftIcon', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MailIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PhoneIcon', 'PowerIcon', 'PumpkinIcon', 'ResponceFailIcon', 'ResponceOKIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
 ]);
 
 export enum IconMap {
-  ActualBalanceIcon = 'ActualBalanceIcon', AirPlaneIcon = 'AirPlaneIcon', AppleIcon = 'AppleIcon', ArrowDownIcon = 'ArrowDownIcon', ArrowDownSolidIcon = 'ArrowDownSolidIcon', ArrowLeftIcon = 'ArrowLeftIcon', ArrowRightIcon = 'ArrowRightIcon', ArrowTopRightIcon = 'ArrowTopRightIcon', ArrowUpIcon = 'ArrowUpIcon', ArrowUpSolidIcon = 'ArrowUpSolidIcon', AtmIcon = 'AtmIcon', BagIcon = 'BagIcon', BankIcon = 'BankIcon', BelarusianFlag = 'BelarusianFlag', BriefcaseIcon = 'BriefcaseIcon', BuildingIcon = 'BuildingIcon', BurgerIcon = 'BurgerIcon', Calendar2Icon = 'Calendar2Icon', CalendarCircleIcon = 'CalendarCircleIcon', CalendarIcon = 'CalendarIcon', CalendarTickIcon = 'CalendarTickIcon', Car2Icon = 'Car2Icon', CardIcon = 'CardIcon', CardPosIcon = 'CardPosIcon', CardTickIcon = 'CardTickIcon', CardWithGemIcon = 'CardWithGemIcon', CarIcon = 'CarIcon', ChartSquareIcon = 'ChartSquareIcon', ChevronLeft = 'ChevronLeft', CinemaIcon = 'CinemaIcon', ClientIcon = 'ClientIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CreditCardsIcon = 'CreditCardsIcon', DiscountShapeIcon = 'DiscountShapeIcon', DocDownloadIcon = 'DocDownloadIcon', DocIcon = 'DocIcon', DocIconMonoColor = 'DocIconMonoColor', DocsIcon = 'DocsIcon', DocumentText2Icon = 'DocumentText2Icon', DocumentTextIcon = 'DocumentTextIcon', DollarIcon = 'DollarIcon', DoneIcon = 'DoneIcon', DoneSimpleIcon = 'DoneSimpleIcon', EarthIcon = 'EarthIcon', EmptyWalletChangeIcon = 'EmptyWalletChangeIcon', EmptyWalletIcon = 'EmptyWalletIcon', EuroIcon = 'EuroIcon', FullScreenIcon = 'FullScreenIcon', GeolocationIcon = 'GeolocationIcon', GlassIcon = 'GlassIcon', GlobalIcon = 'GlobalIcon', GpsIcon = 'GpsIcon', GridIcon = 'GridIcon', HeadphonesIcon = 'HeadphonesIcon', HeartIcon = 'HeartIcon', HuaweiIcon = 'HuaweiIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', LogoIcon = 'LogoIcon', LoupeIcon = 'LoupeIcon', MailIcon = 'MailIcon', MapMarkerClusterIcon = 'MapMarkerClusterIcon', MapMarkerSingleIcon = 'MapMarkerSingleIcon', MasterCardIcon = 'MasterCardIcon', MetroIcon = 'MetroIcon', MinusIcon = 'MinusIcon', MirIcon = 'MirIcon', MoneyIcon = 'MoneyIcon', MoneyInsuranceIcon = 'MoneyInsuranceIcon', MoneysIcon = 'MoneysIcon', MonitorMobileIcon = 'MonitorMobileIcon', NewDocIcon = 'NewDocIcon', OfficeIcon = 'OfficeIcon', OkIcon = 'OkIcon', PackA4Icon = 'PackA4Icon', PassSendIcon = 'PassSendIcon', PercentageRoundIcon = 'PercentageRoundIcon', PercentageSquareIcon = 'PercentageSquareIcon', PercentIcon = 'PercentIcon', PersonalCardIcon = 'PersonalCardIcon', PhoneIcon = 'PhoneIcon', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', ResponceFailIcon = 'ResponceFailIcon', ResponceOKIcon = 'ResponceOKIcon', RoundRubleIcon = 'RoundRubleIcon', SafeIcon = 'SafeIcon', ShieldTickIcon = 'ShieldTickIcon', SignDocsIcon = 'SignDocsIcon', SmallClockIcon = 'SmallClockIcon', SoundIcon = 'SoundIcon', StrongBoxIcon = 'StrongBoxIcon', TelegramIcon = 'TelegramIcon', UnionPayIcon = 'UnionPayIcon', UserGeoLocationIcon = 'UserGeoLocationIcon', UserSquareIcon = 'UserSquareIcon', UserTickIcon = 'UserTickIcon', VisaIcon = 'VisaIcon', VKIcon = 'VKIcon', WalletAdd2Icon = 'WalletAdd2Icon', WalletAddIcon = 'WalletAddIcon', WalletIcon = 'WalletIcon', WalletWithMoneyIcon = 'WalletWithMoneyIcon', WateringCanIcon = 'WateringCanIcon', YoutubeIcon = 'YoutubeIcon'
+  ActualBalanceIcon = 'ActualBalanceIcon', AirPlaneIcon = 'AirPlaneIcon', AppleIcon = 'AppleIcon', ArrowDownIcon = 'ArrowDownIcon', ArrowDownSolidIcon = 'ArrowDownSolidIcon', ArrowLeftIcon = 'ArrowLeftIcon', ArrowRightIcon = 'ArrowRightIcon', ArrowTopRightIcon = 'ArrowTopRightIcon', ArrowUpIcon = 'ArrowUpIcon', ArrowUpSolidIcon = 'ArrowUpSolidIcon', AtmIcon = 'AtmIcon', BagIcon = 'BagIcon', BankIcon = 'BankIcon', BelarusianFlag = 'BelarusianFlag', BriefcaseIcon = 'BriefcaseIcon', BuildingIcon = 'BuildingIcon', BurgerIcon = 'BurgerIcon', Calendar2Icon = 'Calendar2Icon', CalendarCircleIcon = 'CalendarCircleIcon', CalendarIcon = 'CalendarIcon', CalendarTickIcon = 'CalendarTickIcon', Car2Icon = 'Car2Icon', CardIcon = 'CardIcon', CardPosIcon = 'CardPosIcon', CardTickIcon = 'CardTickIcon', CardWithGemIcon = 'CardWithGemIcon', CarIcon = 'CarIcon', ChartSquareIcon = 'ChartSquareIcon', ChevronLeftIcon = 'ChevronLeftIcon', CinemaIcon = 'CinemaIcon', ClientIcon = 'ClientIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CreditCardsIcon = 'CreditCardsIcon', DiscountShapeIcon = 'DiscountShapeIcon', DocDownloadIcon = 'DocDownloadIcon', DocIcon = 'DocIcon', DocIconMonoColor = 'DocIconMonoColor', DocsIcon = 'DocsIcon', DocumentText2Icon = 'DocumentText2Icon', DocumentTextIcon = 'DocumentTextIcon', DollarIcon = 'DollarIcon', DoneIcon = 'DoneIcon', DoneSimpleIcon = 'DoneSimpleIcon', EarthIcon = 'EarthIcon', EmptyWalletChangeIcon = 'EmptyWalletChangeIcon', EmptyWalletIcon = 'EmptyWalletIcon', EuroIcon = 'EuroIcon', FullScreenIcon = 'FullScreenIcon', GeolocationIcon = 'GeolocationIcon', GlassIcon = 'GlassIcon', GlobalIcon = 'GlobalIcon', GpsIcon = 'GpsIcon', GridIcon = 'GridIcon', HeadphonesIcon = 'HeadphonesIcon', HeartIcon = 'HeartIcon', HuaweiIcon = 'HuaweiIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', LogoIcon = 'LogoIcon', LoupeIcon = 'LoupeIcon', MailIcon = 'MailIcon', MapMarkerClusterIcon = 'MapMarkerClusterIcon', MapMarkerSingleIcon = 'MapMarkerSingleIcon', MasterCardIcon = 'MasterCardIcon', MetroIcon = 'MetroIcon', MinusIcon = 'MinusIcon', MirIcon = 'MirIcon', MoneyIcon = 'MoneyIcon', MoneyInsuranceIcon = 'MoneyInsuranceIcon', MoneysIcon = 'MoneysIcon', MonitorMobileIcon = 'MonitorMobileIcon', NewDocIcon = 'NewDocIcon', OfficeIcon = 'OfficeIcon', OkIcon = 'OkIcon', PackA4Icon = 'PackA4Icon', PassSendIcon = 'PassSendIcon', PercentageRoundIcon = 'PercentageRoundIcon', PercentageSquareIcon = 'PercentageSquareIcon', PercentIcon = 'PercentIcon', PersonalCardIcon = 'PersonalCardIcon', PhoneIcon = 'PhoneIcon', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', ResponceFailIcon = 'ResponceFailIcon', ResponceOKIcon = 'ResponceOKIcon', RoundRubleIcon = 'RoundRubleIcon', SafeIcon = 'SafeIcon', ShieldTickIcon = 'ShieldTickIcon', SignDocsIcon = 'SignDocsIcon', SmallClockIcon = 'SmallClockIcon', SoundIcon = 'SoundIcon', StrongBoxIcon = 'StrongBoxIcon', TelegramIcon = 'TelegramIcon', UnionPayIcon = 'UnionPayIcon', UserGeoLocationIcon = 'UserGeoLocationIcon', UserSquareIcon = 'UserSquareIcon', UserTickIcon = 'UserTickIcon', VisaIcon = 'VisaIcon', VKIcon = 'VKIcon', WalletAdd2Icon = 'WalletAdd2Icon', WalletAddIcon = 'WalletAddIcon', WalletIcon = 'WalletIcon', WalletWithMoneyIcon = 'WalletWithMoneyIcon', WateringCanIcon = 'WateringCanIcon', YoutubeIcon = 'YoutubeIcon'
 }
 
 export enum IconTitleMap {
-  ActualBalanceIcon = 'Деньги', AirPlaneIcon = 'Самолёт', AppleIcon = 'Лого «Apple»', ArrowDownIcon = 'Стрелка \'Вниз\'', ArrowDownSolidIcon = 'Стрелка сплошная \'Вниз\'', ArrowLeftIcon = 'Стрелка \'Влево\'', ArrowRightIcon = 'Стрелка \'Вправо\'', ArrowTopRightIcon = 'Стрелка \'Вверх-право\'', ArrowUpIcon = 'Стрелка \'Вверх\'', ArrowUpSolidIcon = 'Стрелка сплошная \'Вверх\'', AtmIcon = 'Банкомат', BagIcon = 'Сумка', BankIcon = 'Банк', BelarusianFlag = 'Белорусский флаг', BriefcaseIcon = 'BriefcaseIcon', BuildingIcon = 'Здание с деревом', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', Car2Icon = 'Машина2', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', ChevronLeft = 'Стрелка \'Влево\'', CinemaIcon = 'Кинотеатр', ClientIcon = 'Клиент', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CreditCardsIcon = 'Кредитные карты', DiscountShapeIcon = 'Скидка', DocDownloadIcon = 'Скачать документ', DocIcon = 'Документ', DocIconMonoColor = 'Документ (одноцветный)', DocsIcon = 'Документы', DocumentText2Icon = 'Документы-2', DocumentTextIcon = 'Документ с текстом', DollarIcon = 'Доллар', DoneIcon = 'Зелёная \'галочка\' в круге', DoneSimpleIcon = 'Зелёная \'галочка\'', EarthIcon = 'Земля', EmptyWalletChangeIcon = 'Пустой кошелёк с возвратом', EmptyWalletIcon = 'Пустой кошелёк', EuroIcon = 'Евро', FullScreenIcon = 'FullScreenIcon', GeolocationIcon = 'Геолокация', GlassIcon = 'Зеркало', GlobalIcon = 'Глобус', GpsIcon = 'Gps', GridIcon = 'Сетка (белая)', HeadphonesIcon = 'HeadphonesIcon', HeartIcon = 'Сердце', HuaweiIcon = 'Лого «Huawei»', InterestGrowthIcon = 'Диаграмма роста', InterestIcon = 'Скидка', JCBIcon = 'JCB', LogoIcon = 'Logo', LoupeIcon = 'Лупа', MailIcon = 'E-mail', MapMarkerClusterIcon = 'Маркер карты', MapMarkerSingleIcon = 'Маркер карты РСХБ', MasterCardIcon = 'MasterCard', MetroIcon = 'Лого Метро', MinusIcon = 'Минус', MirIcon = 'МИР', MoneyIcon = 'Деньги', MoneyInsuranceIcon = 'Денежное страхование', MoneysIcon = 'Купюры', MonitorMobileIcon = 'Монитор и мобильный', NewDocIcon = 'Новый документ', OfficeIcon = 'Офис', OkIcon = 'Лого «Одноклассники»', PackA4Icon = 'Пачка бумаги А4', PassSendIcon = 'Бизнес', PercentageRoundIcon = 'Проценты (круг.)', PercentageSquareIcon = 'Проценты', PercentIcon = 'PercentIcon', PersonalCardIcon = 'Персональная карта', PhoneIcon = 'Телефон', PlayMarketIcon = 'Лого «PlayMarket»', PlusIcon = 'Плюс', PowerIcon = 'Щит', Profile2UserIcon = 'Профиль, 2 персоны', ProfileIcon = 'Профиль', PumpkinIcon = 'Тыква', ResponceFailIcon = 'Ошибка', ResponceOKIcon = 'Ок', RoundRubleIcon = 'Рубль (круг.)', SafeIcon = 'Сейф', ShieldTickIcon = 'Безопасность', SignDocsIcon = 'Подписанные документы', SmallClockIcon = 'Маленькие часы', SoundIcon = 'Звук', StrongBoxIcon = 'Ящик с замочной скважиной', TelegramIcon = 'Лого «Telegram»', UnionPayIcon = 'UnionPay', UserGeoLocationIcon = 'UserGeoLocationIcon', UserSquareIcon = 'Пользователь в рамке', UserTickIcon = 'Пользователь', VisaIcon = 'Visa', VKIcon = 'Лого «VK»', WalletAdd2Icon = 'Пополнение карты', WalletAddIcon = 'Кошелёк с плюсом', WalletIcon = 'Кошелёк', WalletWithMoneyIcon = 'Кошелёк с деньгами', WateringCanIcon = 'Добавить продукт', YoutubeIcon = 'Лого «Youtube»'
+  ActualBalanceIcon = 'Деньги', AirPlaneIcon = 'Самолёт', AppleIcon = 'Лого «Apple»', ArrowDownIcon = 'Стрелка \'Вниз\'', ArrowDownSolidIcon = 'Стрелка сплошная \'Вниз\'', ArrowLeftIcon = 'Стрелка \'Влево\'', ArrowRightIcon = 'Стрелка \'Вправо\'', ArrowTopRightIcon = 'Стрелка \'Вверх-право\'', ArrowUpIcon = 'Стрелка \'Вверх\'', ArrowUpSolidIcon = 'Стрелка сплошная \'Вверх\'', AtmIcon = 'Банкомат', BagIcon = 'Сумка', BankIcon = 'Банк', BelarusianFlag = 'Белорусский флаг', BriefcaseIcon = 'BriefcaseIcon', BuildingIcon = 'Здание с деревом', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', Car2Icon = 'Машина2', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', ChevronLeftIcon = 'Стрелка \'Влево\'', CinemaIcon = 'Кинотеатр', ClientIcon = 'Клиент', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CreditCardsIcon = 'Кредитные карты', DiscountShapeIcon = 'Скидка', DocDownloadIcon = 'Скачать документ', DocIcon = 'Документ', DocIconMonoColor = 'Документ (одноцветный)', DocsIcon = 'Документы', DocumentText2Icon = 'Документы-2', DocumentTextIcon = 'Документ с текстом', DollarIcon = 'Доллар', DoneIcon = 'Зелёная \'галочка\' в круге', DoneSimpleIcon = 'Зелёная \'галочка\'', EarthIcon = 'Земля', EmptyWalletChangeIcon = 'Пустой кошелёк с возвратом', EmptyWalletIcon = 'Пустой кошелёк', EuroIcon = 'Евро', FullScreenIcon = 'FullScreenIcon', GeolocationIcon = 'Геолокация', GlassIcon = 'Зеркало', GlobalIcon = 'Глобус', GpsIcon = 'Gps', GridIcon = 'Сетка (белая)', HeadphonesIcon = 'HeadphonesIcon', HeartIcon = 'Сердце', HuaweiIcon = 'Лого «Huawei»', InterestGrowthIcon = 'Диаграмма роста', InterestIcon = 'Скидка', JCBIcon = 'JCB', LogoIcon = 'Logo', LoupeIcon = 'Лупа', MailIcon = 'E-mail', MapMarkerClusterIcon = 'Маркер карты', MapMarkerSingleIcon = 'Маркер карты РСХБ', MasterCardIcon = 'MasterCard', MetroIcon = 'Лого Метро', MinusIcon = 'Минус', MirIcon = 'МИР', MoneyIcon = 'Деньги', MoneyInsuranceIcon = 'Денежное страхование', MoneysIcon = 'Купюры', MonitorMobileIcon = 'Монитор и мобильный', NewDocIcon = 'Новый документ', OfficeIcon = 'Офис', OkIcon = 'Лого «Одноклассники»', PackA4Icon = 'Пачка бумаги А4', PassSendIcon = 'Бизнес', PercentageRoundIcon = 'Проценты (круг.)', PercentageSquareIcon = 'Проценты', PercentIcon = 'PercentIcon', PersonalCardIcon = 'Персональная карта', PhoneIcon = 'Телефон', PlayMarketIcon = 'Лого «PlayMarket»', PlusIcon = 'Плюс', PowerIcon = 'Щит', Profile2UserIcon = 'Профиль, 2 персоны', ProfileIcon = 'Профиль', PumpkinIcon = 'Тыква', ResponceFailIcon = 'Ошибка', ResponceOKIcon = 'Ок', RoundRubleIcon = 'Рубль (круг.)', SafeIcon = 'Сейф', ShieldTickIcon = 'Безопасность', SignDocsIcon = 'Подписанные документы', SmallClockIcon = 'Маленькие часы', SoundIcon = 'Звук', StrongBoxIcon = 'Ящик с замочной скважиной', TelegramIcon = 'Лого «Telegram»', UnionPayIcon = 'UnionPay', UserGeoLocationIcon = 'UserGeoLocationIcon', UserSquareIcon = 'Пользователь в рамке', UserTickIcon = 'Пользователь', VisaIcon = 'Visa', VKIcon = 'Лого «VK»', WalletAdd2Icon = 'Пополнение карты', WalletAddIcon = 'Кошелёк с плюсом', WalletIcon = 'Кошелёк', WalletWithMoneyIcon = 'Кошелёк с деньгами', WateringCanIcon = 'Добавить продукт', YoutubeIcon = 'Лого «Youtube»'
 }
 
 /**
@@ -22,4 +22,4 @@ export enum IconTitleMap {
  *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка сплошная \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Стрелка сплошная \'Вверх\'', 'Банкомат', 'Сумка', 'Банк', 'Белорусский флаг', 'BriefcaseIcon', 'Здание с деревом', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Машина2', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Стрелка \'Влево\'', 'Кинотеатр', 'Клиент', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Скачать документ', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документы-2', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\' в круге', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'FullScreenIcon', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'HeadphonesIcon', 'Сердце', 'Лого «Huawei»', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'E-mail', 'Маркер карты', 'Маркер карты РСХБ', 'MasterCard', 'Лого Метро', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Купюры', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Пачка бумаги А4', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'PercentIcon', 'Персональная карта', 'Телефон', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Ошибка', 'Ок', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Ящик с замочной скважиной', 'Лого «Telegram»', 'UnionPay', 'UserGeoLocationIcon', 'Пользователь в рамке', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт', 'Лого «Youtube»'
  * ]
  */
-export type IconName = '' | 'ActualBalanceIcon' | 'AirPlaneIcon' | 'AppleIcon' | 'ArrowDownIcon' | 'ArrowDownSolidIcon' | 'ArrowLeftIcon' | 'ArrowRightIcon' | 'ArrowTopRightIcon' | 'ArrowUpIcon' | 'ArrowUpSolidIcon' | 'AtmIcon' | 'BagIcon' | 'BankIcon' | 'BelarusianFlag' | 'BriefcaseIcon' | 'BuildingIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'Car2Icon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'ChevronLeft' | 'CinemaIcon' | 'ClientIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CreditCardsIcon' | 'DiscountShapeIcon' | 'DocDownloadIcon' | 'DocIcon' | 'DocIconMonoColor' | 'DocsIcon' | 'DocumentText2Icon' | 'DocumentTextIcon' | 'DollarIcon' | 'DoneIcon' | 'DoneSimpleIcon' | 'EarthIcon' | 'EmptyWalletChangeIcon' | 'EmptyWalletIcon' | 'EuroIcon' | 'FullScreenIcon' | 'GeolocationIcon' | 'GlassIcon' | 'GlobalIcon' | 'GpsIcon' | 'GridIcon' | 'HeadphonesIcon' | 'HeartIcon' | 'HuaweiIcon' | 'InterestGrowthIcon' | 'InterestIcon' | 'JCBIcon' | 'LogoIcon' | 'LoupeIcon' | 'MailIcon' | 'MapMarkerClusterIcon' | 'MapMarkerSingleIcon' | 'MasterCardIcon' | 'MetroIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MoneysIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PackA4Icon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PercentIcon' | 'PersonalCardIcon' | 'PhoneIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'ResponceFailIcon' | 'ResponceOKIcon' | 'RoundRubleIcon' | 'SafeIcon' | 'ShieldTickIcon' | 'SignDocsIcon' | 'SmallClockIcon' | 'SoundIcon' | 'StrongBoxIcon' | 'TelegramIcon' | 'UnionPayIcon' | 'UserGeoLocationIcon' | 'UserSquareIcon' | 'UserTickIcon' | 'VisaIcon' | 'VKIcon' | 'WalletAdd2Icon' | 'WalletAddIcon' | 'WalletIcon' | 'WalletWithMoneyIcon' | 'WateringCanIcon' | 'YoutubeIcon';
+export type IconName = '' | 'ActualBalanceIcon' | 'AirPlaneIcon' | 'AppleIcon' | 'ArrowDownIcon' | 'ArrowDownSolidIcon' | 'ArrowLeftIcon' | 'ArrowRightIcon' | 'ArrowTopRightIcon' | 'ArrowUpIcon' | 'ArrowUpSolidIcon' | 'AtmIcon' | 'BagIcon' | 'BankIcon' | 'BelarusianFlag' | 'BriefcaseIcon' | 'BuildingIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'Car2Icon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'ChevronLeftIcon' | 'CinemaIcon' | 'ClientIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CreditCardsIcon' | 'DiscountShapeIcon' | 'DocDownloadIcon' | 'DocIcon' | 'DocIconMonoColor' | 'DocsIcon' | 'DocumentText2Icon' | 'DocumentTextIcon' | 'DollarIcon' | 'DoneIcon' | 'DoneSimpleIcon' | 'EarthIcon' | 'EmptyWalletChangeIcon' | 'EmptyWalletIcon' | 'EuroIcon' | 'FullScreenIcon' | 'GeolocationIcon' | 'GlassIcon' | 'GlobalIcon' | 'GpsIcon' | 'GridIcon' | 'HeadphonesIcon' | 'HeartIcon' | 'HuaweiIcon' | 'InterestGrowthIcon' | 'InterestIcon' | 'JCBIcon' | 'LogoIcon' | 'LoupeIcon' | 'MailIcon' | 'MapMarkerClusterIcon' | 'MapMarkerSingleIcon' | 'MasterCardIcon' | 'MetroIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MoneysIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PackA4Icon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PercentIcon' | 'PersonalCardIcon' | 'PhoneIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'ResponceFailIcon' | 'ResponceOKIcon' | 'RoundRubleIcon' | 'SafeIcon' | 'ShieldTickIcon' | 'SignDocsIcon' | 'SmallClockIcon' | 'SoundIcon' | 'StrongBoxIcon' | 'TelegramIcon' | 'UnionPayIcon' | 'UserGeoLocationIcon' | 'UserSquareIcon' | 'UserTickIcon' | 'VisaIcon' | 'VKIcon' | 'WalletAdd2Icon' | 'WalletAddIcon' | 'WalletIcon' | 'WalletWithMoneyIcon' | 'WateringCanIcon' | 'YoutubeIcon';

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

@@ -0,0 +1,7 @@
+import { useSWRResource } from '../../hooks/useSWRResource';
+import type { Fallback } from '../../model/Fallback';
+import { projectSettings } from '../../ProjectSettings';
+import type { SitemapData } from './SitemapData';
+
+export const useSitemap = (fallback?: Fallback) =>
+  useSWRResource<SitemapData>(projectSettings.SITEMAP || 'sitemap', fallback);

package/mobile/src/ui-kit/BaseFiltration/BaseFiltrationInner.tsx

@@ -35,14 +35,14 @@ export const BaseFiltrationInner = JSX<BaseFiltrationInnerProps>(
           {notFound ? renderNotFound(notFound) : null}
         </div>
         <div className={style(blocksToRender.length ? '' : 'hidden')}>
-          <div className={style('mb-1', resultsGridStyle)}>
+          <div className={style('mb-2xs', resultsGridStyle)}>
             {renderBlocksList(visibleBlocks, { ...rest.options, parent: block })}
           </div>
           <Foldable
             renderFoldableSection={({ isUnfolded }) => {
               return (
                 <FoldableSection
-                  className={style(resultsGridStyle, isUnfolded ? 'mb-1' : '')}
+                  className={style(resultsGridStyle, isUnfolded ? 'mb-2xs' : '')}
                   isUnfolded={isUnfolded}
                 >
                   {renderBlocksList(hiddenBlocks, { ...rest.options, parent: block })}

package/mobile/src/ui-kit/BaseFiltration/renderFiltrationForm.tsx

@@ -29,14 +29,14 @@ export const renderFiltrationForm = ({
   resetButton,
   children,
 }: RenderFiltrationFormProps) => (
-  <form className="flex justify-between bg-white p-9 mb-1">
-    <div className="flex gap-11">
+  <form className="flex justify-between bg-white p-4xl mb-2xs">
+    <div className="flex gap-5xl">
       {children}
       {Object.entries(filtrationSchema).map(renderFormItem(field))}
     </div>
     {resetButton ? (
       <div>
-        <Button className="w-72 ml-3" onClick={reset} {...resetButton} />
+        <Button className="w-72 ml-s" onClick={reset} {...resetButton} />
       </div>
     ) : null}
   </form>
@@ -63,7 +63,7 @@ const renderCheckboxes = (key: string, field: FormFieldRegisterer<any>) => (item
   return (
     <div key={key}>
       {item?.title ? (
-        <div className="mb-4">
+        <div className="mb-m">
           <Text size="text-m" font="font-light" color="text-secondary-text">
             {item.title}
           </Text>

package/mobile/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -1,12 +1,12 @@
 import type { Align } from '../../model/Align';
 import type { BulletsProps } from '../../model/Bullets';
 import type { HeadlineProps } from '../../model/HeadlineType';
-import type { ButtonContent } from '../Button/ButtonProps';
 import type { ImageContent } from '../Img/ImgProps';
 import type { ListContent } from '../List/ListContent';
 import type { RichTextProps } from '../RichText/RichTextProps';
 import type { TagsContent } from '../Tags/TagsContent';
 import type { BenefitsListContent } from '../BenefitsList/BenefitsListContent';
+import type { ButtonsSectionContent } from '../Button/ButtonsSectionContent';
 
 /** @title Доп. настройки картинки */
 export interface TileImageOptions {
@@ -24,7 +24,7 @@ export type BaseProductTileContent = HeadlineProps &
   ListContent &
   BulletsProps &
   TagsContent &
-  ButtonContent &
+  ButtonsSectionContent &
   ImageContent & {
     /** @title Лейбл (моб.) */
     label?: string;

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

@@ -42,7 +42,7 @@ export const BaseTile = JSX<BaseTileProps>(
       )}
     >
       {title ? <div className="relative">{title}</div> : null}
-      <div className="grow relative flex flex-wrap @xl:flex-nowrap justify-between items-stretch gap-3xl">
+      <div className="grow relative flex flex-wrap @xl:flex-nowrap justify-around @xl:justify-between items-stretch gap-3xl">
         {renderImageContainer(leftImage, { imageAlign })}
         <div
           className={style(

package/mobile/src/ui-kit/BenefitsList/DefaultBenefitsList.tsx

@@ -9,19 +9,24 @@ const MAX_BENEFITS_LEN_DEVIATION = 16;
 
 const benefitLength = (_: ComplexBenefitContent) =>
   _.type === 'rte'
-    ? _.__html?.length || 0
-    : Math.max(_.label?.length || 0, _.description?.length || 0);
+    ? _?.__html?.length || 0
+    : Math.max(_?.label?.length || 0, _?.description?.length || 0);
 
 const isDistortedBenefits = (benefits: ComplexBenefitContent[]) =>
   deviation(benefits.map(benefitLength)) > MAX_BENEFITS_LEN_DEVIATION;
 
+const hasIcon = (_: ComplexBenefitContent) =>
+  _ && 'icon' in _ && _.icon && (_.icon.icon || _.icon.src);
+
+const isTextualBenefits = (benefits: ComplexBenefitContent[]) => !benefits.some(hasIcon);
+
 export const DefaultBenefitsList = JSX<BenefitsListProps>(
   ({ className, benefitsVersion = 'normal', benefits }) =>
     benefits?.length ? (
       <div
         className={style(
           'flex gap-x-m gap-y-s',
-          isDistortedBenefits(benefits) ? 'flex-col' : 'flex-wrap',
+          isDistortedBenefits(benefits) || isTextualBenefits(benefits) ? 'flex-col' : 'flex-wrap',
           className,
         )}
       >

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

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import { ButtonInner } from './ButtonInner';
-import type { ButtonWithIconProps } from './ButtonProps';
 import { getDisabledButtonClasses } from './getDisabledButtonClasses';
 import { getRegularButtonClasses } from './getRegularButtonClasses';
+import type { ButtonProps } from './ButtonProps';
 
-export const Button = JSX<ButtonWithIconProps>(({ disabled, children, ...rest }) => {
+export const Button = JSX<ButtonProps>(({ disabled, children, ...rest }) => {
   const link = useLink();
   const adjustedProps = link(rest);
   const buttonInner = children ?? <ButtonInner {...adjustedProps} />;
@@ -17,7 +17,7 @@ export const Button = JSX<ButtonWithIconProps>(({ disabled, children, ...rest })
   );
 });
 
-const RegularButton = JSX<ButtonWithIconProps>(
+const RegularButton = JSX<ButtonProps>(
   ({ className = '', href, rel, target, ariaLabel, version, rounded, onClick, children }) => (
     <a
       className={getRegularButtonClasses({ className, version, rounded })}
@@ -33,16 +33,14 @@ const RegularButton = JSX<ButtonWithIconProps>(
   ),
 );
 
-const DisabledButton = JSX<ButtonWithIconProps>(
-  ({ className, ariaLabel, version, rounded, children }) => (
-    <div
-      role="button"
-      aria-disabled="true"
-      aria-label={ariaLabel}
-      tabIndex={-1}
-      className={getDisabledButtonClasses({ className, rounded, version })}
-    >
-      {children}
-    </div>
-  ),
-);
+const DisabledButton = JSX<ButtonProps>(({ className, ariaLabel, version, rounded, children }) => (
+  <div
+    role="button"
+    aria-disabled="true"
+    aria-label={ariaLabel}
+    tabIndex={-1}
+    className={getDisabledButtonClasses({ className, rounded, version })}
+  >
+    {children}
+  </div>
+));

package/mobile/src/ui-kit/Button/ButtonContent.ts

@@ -0,0 +1,21 @@
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { LinkProps } from '../../model/LinkProps';
+import type { Picture } from '../../model/Picture';
+
+export interface ButtonCommonContent extends LinkProps {
+  version?: ButtonVersion;
+}
+
+/**
+ * @title Кнопка
+ */
+export interface ButtonContent extends ButtonCommonContent {
+  /** @title Закругленные углы */
+  rounded?: boolean;
+  /** @title Иконка слева */
+  icon?: Picture;
+  /** @title Иконка справа */
+  iconRight?: Picture;
+  /** @title Верхний текст */
+  aboveText?: string;
+}

package/mobile/src/ui-kit/Button/ButtonInner.tsx

@@ -1,14 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonVersion } from '../../model/ButtonVersion';
 import { style } from '../../utils/style';
 import { iconStyleMap } from './buttonClassNameConstants';
-import type { ButtonWithIconProps } from './ButtonProps';
+import type { ButtonProps } from './ButtonProps';
+import type { ButtonContent } from './ButtonContent';
 
-interface ButtonInnerProps extends ButtonWithIconProps {
-  version?: ButtonVersion;
-}
-
-export const ButtonInner = JSX<ButtonInnerProps>((props) => {
+export const ButtonInner = JSX<ButtonProps>((props) => {
   const { text, aboveText, appendLeft, appendRight, version = 'primary' } = props;
 
   return (
@@ -25,7 +21,7 @@ export const ButtonInner = JSX<ButtonInnerProps>((props) => {
   );
 });
 
-const getButtonStyle = (props: ButtonInnerProps) => {
+const getButtonStyle = (props: ButtonContent) => {
   const { version, aboveText, rounded } = props;
 
   if (version === 'link') {
@@ -41,5 +37,5 @@ const getButtonStyle = (props: ButtonInnerProps) => {
   ].join(' ');
 };
 
-const isWithText = ({ text, aboveText, appendLeft }: ButtonInnerProps) =>
+const isWithText = ({ text, aboveText, appendLeft }: ButtonProps) =>
   Boolean(text || aboveText || !appendLeft);

package/mobile/src/ui-kit/Button/ButtonProps.ts

@@ -1,61 +1,16 @@
-import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { LinkProps } from '../../model/LinkProps';
-import type { IconProps, Picture } from '../../model/Picture';
 import type { VNode } from '../../model/VNode';
 import type { PreventableEvent } from '../PreventableEvent';
+import type { ButtonContent } from './ButtonContent';
 
 /**
- * @hidden
+ * @title Кнопка
  */
-export interface ButtonAdditionalProps {
+export interface ButtonProps extends ButtonContent {
   className?: string;
   disabled?: boolean;
   rel?: string;
   ariaLabel?: string;
-  onClick?: (ev?: PreventableEvent) => void;
-}
-
-/**
- * @title Кнопка
- */
-export interface ButtonProps extends ButtonAdditionalProps, LinkProps {
-  /** @title Текст */
-  text?: string;
-  /** @title Закругленные углы */
-  rounded?: boolean;
-  version?: ButtonVersion;
-}
-
-/**
- * @title Кнопка
- */
-export interface ButtonWithIconProps extends ButtonProps {
-  /** @title Иконка слева */
-  icon?: Picture;
-  /** @title Иконка справа */
-  iconRight?: Picture;
-  /** @title Верхний текст */
-  aboveText?: string;
-  /** @hidden */
   appendLeft?: VNode;
-  /** @hidden */
   appendRight?: VNode;
+  onClick?: (ev?: PreventableEvent) => void;
 }
-
-export interface ButtonContent {
-  /**
-   * @title Кнопки
-   * @maxItems 4
-   */
-  buttons?: ButtonWithIconProps[];
-}
-
-export type BackwardButtonProps = ButtonProps &
-  IconProps & {
-    /** @title Верхний текст */
-    aboveText?: string;
-    /** @hidden */
-    appendLeft?: VNode;
-    /** @title Закругленные углы */
-    rounded?: boolean;
-  };

package/mobile/src/ui-kit/Button/ButtonsSectionContent.ts

@@ -0,0 +1,8 @@
+import type { ButtonContent } from './ButtonContent';
+
+export interface ButtonsSectionContent {
+  /**
+   * @title Кнопки
+   */
+  buttons?: ButtonContent[];
+}

package/mobile/src/ui-kit/Button/renderButtonsSection.tsx

@@ -2,7 +2,7 @@ import type { Picture } from '../../model/Picture';
 import { style } from '../../utils/style';
 import { Img } from '../Img/Img';
 import { Button } from './Button';
-import type { ButtonWithIconProps } from './ButtonProps';
+import type { ButtonContent } from './ButtonContent';
 
 interface ButtonsSectionOptions {
   className?: string;
@@ -11,7 +11,7 @@ interface ButtonsSectionOptions {
 }
 
 export const renderButtonsSection = (
-  buttons?: (ButtonWithIconProps | undefined)[],
+  buttons?: (ButtonContent | undefined)[],
   { className, buttonClassName, isVertical }: ButtonsSectionOptions = {},
 ) =>
   buttons?.length && buttons.some((_) => _?.text || _?.icon?.icon) ? (
@@ -28,7 +28,7 @@ export const renderButtonsSection = (
 
 const renderButton =
   (buttonClassName = '') =>
-  (button?: ButtonWithIconProps, index?: number) => {
+  (button?: ButtonContent, index?: number) => {
     const { text, icon, iconRight, version, ...rest } = button || {};
     const iconVersionDefault = version === 'secondary' ? 'color' : 'white';
     const iconVersion = icon?.iconVersion ? icon?.iconVersion : iconVersionDefault;