@redneckz/wildless-cms-uni-blocks 0.13.12 → 0.13.14

package/mobile/src/hooks/useSWRResource.ts

@@ -1,20 +1,33 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { projectSettings } from '../ProjectSettings';
 import type { Fallback } from '../model/Fallback';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { joinPath } from '../utils/url';
 
 const EMPTY_VALUE = {};
 const DEFAULT_FOLDER_NAME = 'wcms-resources';
 
+interface SWRResourceOptions {
+  fallback?: Fallback;
+  folderName?: string;
+  setBasePath?: boolean;
+}
+
 export function useSWRResource<Data>(
   filename: string | null | undefined,
-  fallback: Fallback = EMPTY_VALUE,
-  folderName: string = DEFAULT_FOLDER_NAME,
+  options: SWRResourceOptions = {},
 ): Data {
-  const { data } = useAsyncData<Data, any, string | null>(
-    filename ? `/${folderName}/${filename}.json` : null,
-    fetchJSONUnsafe,
-    { fallback },
+  const { fallback = EMPTY_VALUE, folderName = DEFAULT_FOLDER_NAME, setBasePath = false } = options;
+
+  const path = joinPath(
+    setBasePath ? projectSettings.BASE_PATH : '',
+    folderName,
+    `${filename}.json`,
   );
 
+  const { data } = useAsyncData<Data, any, string | null>(filename ? path : null, fetchJSONUnsafe, {
+    fallback,
+  });
+
   return data || (EMPTY_VALUE as Data);
 }

package/mobile/src/icons/HouseIcon.svg

@@ -0,0 +1,9 @@
+<svg title="Ипотека" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 22H22" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 9.97121C3 9.36121 3.29 8.78126 3.77 8.40126L10.77 2.95125C11.49 2.39125 12.5 2.39125 13.23 2.95125L20.23 8.39125C20.72 8.77125 21 9.35121 21 9.97121V22.0012" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.94922 22.0012L2.97922 14.0312" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 17H11C10.17 17 9.5 17.67 9.5 18.5V22H14.5V18.5C14.5 17.67 13.83 17 13 17Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M9.5 13.75H7.5C6.95 13.75 6.5 13.3 6.5 12.75V11.25C6.5 10.7 6.95 10.25 7.5 10.25H9.5C10.05 10.25 10.5 10.7 10.5 11.25V12.75C10.5 13.3 10.05 13.75 9.5 13.75Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M16.5 13.75H14.5C13.95 13.75 13.5 13.3 13.5 12.75V11.25C13.5 10.7 13.95 10.25 14.5 10.25H16.5C17.05 10.25 17.5 10.7 17.5 11.25V12.75C17.5 13.3 17.05 13.75 16.5 13.75Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M19.0003 7L18.9703 4H14.5703" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</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', 'ChartIcon', 'ChevronLeftIcon', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MailIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MapOpenedIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PhoneIcon', 'PowerIcon', 'PumpkinIcon', 'ResponseFailIcon', 'ResponseOKIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
+  'ActualBalanceIcon', 'AirPlaneIcon', 'BagIcon', 'BelarusianFlag', 'BriefcaseIcon', 'CardWithGemIcon', 'CarIcon', 'ChartIcon', 'ChevronLeftIcon', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HouseIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MailIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MapOpenedIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PhoneIcon', 'PowerIcon', 'PumpkinIcon', 'ResponseFailIcon', 'ResponseOKIcon', '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', ChartIcon = 'ChartIcon', ChartSquareIcon = 'ChartSquareIcon', ChevronLeftIcon = 'ChevronLeftIcon', CinemaIcon = 'CinemaIcon', ClientIcon = 'ClientIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CourtHouseIcon = 'CourtHouseIcon', 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', MapOpenedIcon = 'MapOpenedIcon', 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', ResponseFailIcon = 'ResponseFailIcon', ResponseOKIcon = 'ResponseOKIcon', 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', ChartIcon = 'ChartIcon', ChartSquareIcon = 'ChartSquareIcon', ChevronLeftIcon = 'ChevronLeftIcon', CinemaIcon = 'CinemaIcon', ClientIcon = 'ClientIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CourtHouseIcon = 'CourtHouseIcon', 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', HouseIcon = 'HouseIcon', HuaweiIcon = 'HuaweiIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', LogoIcon = 'LogoIcon', LoupeIcon = 'LoupeIcon', MailIcon = 'MailIcon', MapMarkerClusterIcon = 'MapMarkerClusterIcon', MapMarkerSingleIcon = 'MapMarkerSingleIcon', MapOpenedIcon = 'MapOpenedIcon', 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', ResponseFailIcon = 'ResponseFailIcon', ResponseOKIcon = 'ResponseOKIcon', 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 = 'Машина', ChartIcon = 'Инвестиции', ChartSquareIcon = 'Деньги внутри кошелька', ChevronLeftIcon = 'Стрелка \'Влево\'', CinemaIcon = 'Кинотеатр', ClientIcon = 'Клиент', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CourtHouseIcon = 'Здание суда', 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 = 'Маркер карты РСХБ', MapOpenedIcon = 'Иконка Развёрнутая карта', 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 = 'Тыква', ResponseFailIcon = 'Ошибка', ResponseOKIcon = 'Ок', 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 = 'Машина', ChartIcon = 'Инвестиции', ChartSquareIcon = 'Деньги внутри кошелька', ChevronLeftIcon = 'Стрелка \'Влево\'', CinemaIcon = 'Кинотеатр', ClientIcon = 'Клиент', ClockIcon = 'Часы', CloseIcon = 'Крестик', ComfortableCompIcon = 'Кресло', CourtHouseIcon = 'Здание суда', 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 = 'Сердце', HouseIcon = 'Ипотека', HuaweiIcon = 'Лого «Huawei»', InterestGrowthIcon = 'Диаграмма роста', InterestIcon = 'Скидка', JCBIcon = 'JCB', LogoIcon = 'Logo', LoupeIcon = 'Лупа', MailIcon = 'E-mail', MapMarkerClusterIcon = 'Маркер карты', MapMarkerSingleIcon = 'Маркер карты РСХБ', MapOpenedIcon = 'Иконка Развёрнутая карта', 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 = 'Тыква', ResponseFailIcon = 'Ошибка', ResponseOKIcon = 'Ок', 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»'
 }
 
 /**
@@ -19,7 +19,7 @@ export enum IconTitleMap {
  * @title Иконка
  * @enumNames [
  *   "",
- *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка сплошная \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Стрелка сплошная \'Вверх\'', 'Банкомат', 'Сумка', 'Банк', 'Белорусский флаг', 'BriefcaseIcon', 'Здание с деревом', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Машина2', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Инвестиции', 'Деньги внутри кошелька', 'Стрелка \'Влево\'', 'Кинотеатр', 'Клиент', 'Часы', 'Крестик', 'Кресло', 'Здание суда', 'Кредитные карты', 'Скидка', 'Скачать документ', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документы-2', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\' в круге', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'FullScreenIcon', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'HeadphonesIcon', 'Сердце', 'Лого «Huawei»', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'E-mail', 'Маркер карты', 'Маркер карты РСХБ', 'Иконка Развёрнутая карта', 'MasterCard', 'Лого Метро', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Купюры', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Пачка бумаги А4', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'PercentIcon', 'Персональная карта', 'Телефон', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Ошибка', 'Ок', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Ящик с замочной скважиной', 'Лого «Telegram»', 'UnionPay', 'UserGeoLocationIcon', 'Пользователь в рамке', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт', 'Лого «Youtube»'
+ *   'Деньги', 'Самолёт', 'Лого «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' | 'ChartIcon' | 'ChartSquareIcon' | 'ChevronLeftIcon' | 'CinemaIcon' | 'ClientIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CourtHouseIcon' | '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' | 'MapOpenedIcon' | 'MasterCardIcon' | 'MetroIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MoneysIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PackA4Icon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PercentIcon' | 'PersonalCardIcon' | 'PhoneIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'ResponseFailIcon' | 'ResponseOKIcon' | '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' | 'ChartIcon' | 'ChartSquareIcon' | 'ChevronLeftIcon' | 'CinemaIcon' | 'ClientIcon' | 'ClockIcon' | 'CloseIcon' | 'ComfortableCompIcon' | 'CourtHouseIcon' | 'CreditCardsIcon' | 'DiscountShapeIcon' | 'DocDownloadIcon' | 'DocIcon' | 'DocIconMonoColor' | 'DocsIcon' | 'DocumentText2Icon' | 'DocumentTextIcon' | 'DollarIcon' | 'DoneIcon' | 'DoneSimpleIcon' | 'EarthIcon' | 'EmptyWalletChangeIcon' | 'EmptyWalletIcon' | 'EuroIcon' | 'FullScreenIcon' | 'GeolocationIcon' | 'GlassIcon' | 'GlobalIcon' | 'GpsIcon' | 'GridIcon' | 'HeadphonesIcon' | 'HeartIcon' | 'HouseIcon' | 'HuaweiIcon' | 'InterestGrowthIcon' | 'InterestIcon' | 'JCBIcon' | 'LogoIcon' | 'LoupeIcon' | 'MailIcon' | 'MapMarkerClusterIcon' | 'MapMarkerSingleIcon' | 'MapOpenedIcon' | 'MasterCardIcon' | 'MetroIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MoneysIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PackA4Icon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PercentIcon' | 'PersonalCardIcon' | 'PhoneIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | 'ResponseFailIcon' | 'ResponseOKIcon' | '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

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

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

@@ -70,9 +70,13 @@ export const useSwipeListScroll = <E extends HTMLElement>({
   }, [itemCount, canScrollRight]);
 
   const scrollTo = useCallback(
-    (idx) => {
+    (idx: number) => {
       if (containerRef?.current) {
-        containerRef.current.children[idx]?.scrollIntoView();
+        containerRef.current.children[idx]?.scrollIntoView({
+          behavior: 'smooth',
+          block: 'nearest',
+          inline: 'center',
+        });
       }
     },
     [containerRef],

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1,9 +1,12 @@
 {
   "content": {
-    "button": {
-      "text": "Отправить заявку"
+    "formBlock": {
+      "button": {
+        "text": "Отправить заявку",
+        "version": "primary"
+      },
+      "formType": "ApplicationFormBusinessCard"
     },
-    "typeForm": "credit",
     "version": "primary"
   }
 }

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -2,12 +2,11 @@ import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Кнопка
  */
-export interface SubmitButtonProps extends ButtonContent {
+export interface SubmitButtonProps {
   /** @title Текст */
   text?: string;
   version?: ButtonVersion;
@@ -19,64 +18,73 @@ export type CommonApplicationFormProps = TitleProps & {
   link?: LinkProps;
 };
 
-export type ApplicationFormBlockDef =
-  | BusinessCardFormParamsDef
-  | WedFormParamsDef
-  | DepositFormParamsDef
-  | CreditFormParamsDef
-  | AcquiringFormParamsDef
-  | GrantSupportFormParamsDef;
-
 /**
  * @title Бизнес-карта
- * @default {"formType": "ApplicationFormBusinessCard"}
  */
-export type BusinessCardFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormBusinessCard';
-};
+export type BusinessCardFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormBusinessCard */
+    formType: 'ApplicationFormBusinessCard';
+  };
 
 /**
  * @title ВЭД
- * @default {"formType": "ApplicationFormWed"}
  */
-export type WedFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormWed';
-};
+export type WedFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormWed */
+    formType: 'ApplicationFormWed';
+  };
 
 /**
  * @title Депозит
- * @default {"formType": "ApplicationFormDeposit"}
  */
-export type DepositFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormDeposit';
-};
+export type DepositFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormDeposit */
+    formType: 'ApplicationFormDeposit';
+  };
 
 /**
  * @title Кредит
- * @default {"formType": "ApplicationFormCredit"}
  */
-export type CreditFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormCredit';
-};
+export type CreditFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormCredit */
+    formType: 'ApplicationFormCredit';
+  };
 
 /**
  * @title Эквайринг
- * @default {"formType": "ApplicationFormAcquiring"}
  */
-export type AcquiringFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormAcquiring';
-};
+export type AcquiringFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormAcquiring */
+    formType: 'ApplicationFormAcquiring';
+  };
 
 /**
  * @title Грантовая поддержка
- * @default {"formType": "ApplicationFormGrantSupport"}
  */
-export type GrantSupportFormParamsDef = CommonApplicationFormProps & {
+export type GrantSupportFormParamsDef = TitleProps & {
+  /** @default ApplicationFormGrantSupport */
   formType: 'ApplicationFormGrantSupport';
+  button?: SubmitButtonProps;
   /** @title Адрес справочника */
   sourceBookDir?: string;
 };
 
+/**
+ * @title Настройки формы
+ */
+export type ApplicationFormBlockDef =
+  | BusinessCardFormParamsDef
+  | WedFormParamsDef
+  | DepositFormParamsDef
+  | CreditFormParamsDef
+  | AcquiringFormParamsDef
+  | GrantSupportFormParamsDef;
+
 /**
  * @title Форма заявки
  */

package/src/components/Footer/Footer.mobile.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { projectSettings } from '../../ProjectSettings';
 import { useSWRResource } from '../../hooks/useSWRResource';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import { projectSettings } from '../../ProjectSettings';
 import { useSitemap } from '../../services/sitemap/useSitemap';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
@@ -9,12 +9,12 @@ import { LinkList } from '../../ui-kit/LinkList/LinkList';
 import { Text } from '../../ui-kit/Text/Text';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
-import { findIconByHref } from './findIconByHref';
 import type { FooterDataProps } from './FooterDataProps';
 import type { FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
+import { findIconByHref } from './findIconByHref';
 
 export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
   const fallback = rest.options?.page?.fallback;
@@ -26,7 +26,7 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
     mobileApps,
     horizontalNavigationTitle,
     documents,
-  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
+  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', { fallback });
 
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>

package/src/components/Footer/Footer.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useSWRResource } from '../../hooks/useSWRResource';
 import { projectSettings } from '../../ProjectSettings';
+import { useSWRResource } from '../../hooks/useSWRResource';
 import { useSitemap } from '../../services/sitemap/useSitemap';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Logo } from '../../ui-kit/Logo/Logo';
@@ -18,10 +18,9 @@ const LEFT_COL_WIDTH = 'w-52';
 export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
   const { topItems } = useSitemap(rest.options?.page?.fallback);
   const { documents, relatedEnterprises, contacts, socialMedia, mobileApps, logo } =
-    useSWRResource<FooterDataProps>(
-      projectSettings.FOOTER || 'footer',
-      rest.options?.page?.fallback,
-    );
+    useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', {
+      fallback: rest.options?.page?.fallback,
+    });
 
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>

package/src/components/Header/Header.tsx

@@ -28,8 +28,7 @@ export const Header = JSX<HeaderProps>(
 
     const { internetBankUrl } = useSWRResource<SitemapData>(
       projectSettings.PORTAL_DATA || 'portal-data',
-      {},
-      'portal-resources',
+      { folderName: 'portal-resources', setBasePath: true },
     );
 
     return (

package/src/components/StickyBottomMenu/ActiveSubMenu.tsx

@@ -4,12 +4,13 @@ import { ActiveSubMenuItem } from './ActiveSubMenuItem';
 
 interface ActiveSubMenuProps {
   activeMenuSubItems?: LinkProps[];
+  basePath?: string;
 }
-export const ActiveSubMenu = JSX<ActiveSubMenuProps>(({ activeMenuSubItems }) => {
+export const ActiveSubMenu = JSX<ActiveSubMenuProps>(({ activeMenuSubItems, basePath }) => {
   return activeMenuSubItems ? (
     <div className="mb-5">
       {activeMenuSubItems.map((_, i) => (
-        <ActiveSubMenuItem item={_} i={i} />
+        <ActiveSubMenuItem item={_} key={String(i)} basePath={basePath} />
       ))}
     </div>
   ) : null;

package/src/components/StickyBottomMenu/ActiveSubMenuItem.tsx

@@ -1,20 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkProps } from '../../model/LinkProps';
+import { projectSettings } from '../../ProjectSettings';
 import { useLink } from '../../hooks/useLink';
+import type { LinkProps } from '../../model/LinkProps';
 import { Img } from '../../ui-kit/Img/Img';
 
 interface ActiveSubMenuItemProps {
   item: LinkProps;
-  i: number;
+  basePath?: string;
 }
 
-export const ActiveSubMenuItem = JSX<ActiveSubMenuItemProps>(({ item, i }) => {
-  const link = useLink();
+export const ActiveSubMenuItem = JSX<ActiveSubMenuItemProps>(({ item, basePath }) => {
+  const isAnotherPortal =
+    projectSettings.BASE_PATH && basePath ? !projectSettings.BASE_PATH.startsWith(basePath) : false;
+
+  const link = useLink({ isRemote: isAnotherPortal, basePath });
   const { href, target, onClick } = link(item);
 
   return (
     <a
-      key={`subItems-${String(i)}`}
       className="py-3 text-h5 font-light flex justify-between cursor-pointer"
       href={href}
       target={target}

package/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -1,20 +1,20 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { RefObject } from 'react';
+import { useActiveRoute } from '../../hooks/useActiveRoute';
 import { useLocation } from '../../hooks/useLocation';
-import { Img } from '../../ui-kit/Img/Img';
-import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
-import { Text } from '../../ui-kit/Text/Text';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { useSitemap } from '../../services/sitemap/useSitemap';
+import { Dialog } from '../../ui-kit/DialogManager/Dialog';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
+import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { SwipeListContainer } from '../../ui-kit/SwipeListControl/SwipeListContainer';
 import { useSwipeListScroll } from '../../ui-kit/SwipeListControl/useSwipeListScroll';
-import { useSitemap } from '../../services/sitemap/useSitemap';
-import { TopItemMobile } from './TopItemMobile';
+import { Text } from '../../ui-kit/Text/Text';
 import { ActiveSubMenu } from './ActiveSubMenu';
-import { Dialog } from '../../ui-kit/DialogManager/Dialog';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RefObject } from 'react';
-import { useActiveRoute } from '../../hooks/useActiveRoute';
+import { TopItemMobile } from './TopItemMobile';
 
 interface BurgerMenuDialogProps extends UniBlockProps {
   containerRef?: RefObject<HTMLDivElement>;
@@ -25,19 +25,26 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>((props) => {
   const [location] = useLocation(defaultLocation);
   const locationDialog = useLocationDialog();
   const openLocationDialog = useCallback(() => locationDialog.open(), []);
-  const itemCount = Array.isArray(topItems) ? topItems.length : 0;
   const [containerRef, scroll] = useSwipeListScroll<HTMLDivElement>({
-    itemCount,
+    itemCount: topItems?.length ?? 0,
   });
-  const [activeTopItemIndex, activeRoute] = useActiveRoute(topItems);
+  const [activeIndex] = useActiveRoute(topItems);
+  const [activeTopItemIndex, setActiveTopItemIndex] = useState(activeIndex);
+  const activeRoute = useMemo(() => topItems?.[activeTopItemIndex], [topItems, activeTopItemIndex]);
   const activeMenuSubItems = activeRoute?.items || [];
 
+  useEffect(() => {
+    setActiveTopItemIndex(activeIndex);
+  }, [activeIndex]);
+
   useEffect(() => {
     if (activeTopItemIndex > 0) {
       scroll.scrollTo(activeTopItemIndex);
     }
   }, [activeTopItemIndex, scroll]);
 
+  const handleTopItemClick = useCallback((idx: number) => setActiveTopItemIndex(idx), []);
+
   return (
     <Dialog
       head={
@@ -55,12 +62,17 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>((props) => {
             className="pb-3"
           >
             {topItems?.map((item, i) => (
-              <TopItemMobile item={item} i={i} isActive={activeTopItemIndex === i} />
+              <TopItemMobile
+                item={item}
+                key={String(i)}
+                isActive={activeTopItemIndex === i}
+                onClick={() => handleTopItemClick(i)}
+              />
             ))}
           </SwipeListContainer>
         </div>
         <div className="relative grow overflow-auto">
-          <ActiveSubMenu activeMenuSubItems={activeMenuSubItems} />
+          <ActiveSubMenu activeMenuSubItems={activeMenuSubItems} basePath={activeRoute?.href} />
           <SearchBar className="grow mb-5" />
           {renderOfficeLink(officesLink)}
           <div className="flex items-center text-s cursor-pointer" onClick={openLocationDialog}>

package/src/components/StickyBottomMenu/RenderItem.tsx

@@ -0,0 +1,48 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { projectSettings } from '../../ProjectSettings';
+import { useLink } from '../../hooks/useLink';
+import { Img } from '../../ui-kit/Img/Img';
+import { style } from '../../utils/style';
+import type { MenuItemProps } from './StickyBottomMenuProps';
+
+interface RenderItemProps {
+  item: MenuItemProps;
+  onClick?: () => void;
+}
+
+export const RenderItem = JSX<RenderItemProps>(({ item, onClick }) => {
+  const isAnotherPortal = projectSettings?.BASE_PATH
+    ? !item.url?.startsWith(projectSettings?.BASE_PATH)
+    : true;
+
+  const link = useLink({ isRemote: isAnotherPortal });
+  const {
+    href,
+    target,
+    onClick: handleClick,
+  } = link({
+    href: item.url,
+    target: '_self',
+  });
+
+  return (
+    <a
+      className={style(
+        item.isActive ? 'text-primary-main' : 'text-primary-text',
+        `w-10 m-4 flex justify-center items-center flex-col text-[10px] cursor-pointer`,
+      )}
+      onClick={() => (item?.icon?.icon === 'BurgerIcon' && onClick ? onClick() : handleClick())}
+      href={href}
+      target={target}
+    >
+      <Img
+        className="w-6 h-6"
+        image={{
+          icon: item?.icon?.icon,
+          iconVersion: item?.icon?.iconVersion || 'black',
+        }}
+      />
+      {item.title}
+    </a>
+  );
+});

package/src/components/StickyBottomMenu/StickyBottomMenu.mobile.tsx

@@ -10,8 +10,7 @@ import { useBurgerMenuDialog } from './useBurgerMenuDialog';
 export const StickyBottomMenu = JSX<StickyBottomMenuProps>(({ ...rest }) => {
   const { menuItems = [] } = useSWRResource<StickyBottomMenuProps>(
     projectSettings.STICKY_MOBILE_MENU || 'sticky-mobile-menu',
-    rest.options?.page?.fallback,
-    'portal-resources',
+    { fallback: rest.options?.page?.fallback, folderName: 'portal-resources', setBasePath: true },
   );
 
   const [isBurgerMenuDialogOpen, { toggle }] = useBurgerMenuDialog();

package/src/components/StickyBottomMenu/TopItemMobile.tsx

@@ -1,32 +1,20 @@
 import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
+import { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { style } from '../../utils/style';
-import { useLink } from '../../hooks/useLink';
 
 interface TopItemProps {
   item: TopMenuItemProps;
-  i: number;
   isActive: boolean;
+  onClick: (ev?: PreventableEvent) => void;
 }
 
-export const TopItemMobile = ({ item, i, isActive }: TopItemProps) => {
-  const link = useLink();
-  const { href, target, onClick } = link(item);
-
-  return (
-    <a
-      key={String(i)}
-      href={href}
-      target={target}
-      onClick={onClick}
-      className="relative"
-      aria-label={item.text}
-    >
-      <span className={style('whitespace-nowrap', isActive ? 'text-primary-main' : '')}>
-        {item.text}
-      </span>
-      {isActive ? (
-        <div className="absolute left-0 right-0 -bottom-3 h-0.5 bg-primary-main group-data-transparent:bg-transparent" />
-      ) : null}
-    </a>
-  );
-};
+export const TopItemMobile = ({ item, isActive, onClick }: TopItemProps) => (
+  <button type="button" onClick={onClick}>
+    <span className={style('whitespace-nowrap', isActive ? 'text-primary-main' : '')}>
+      {item.text}
+    </span>
+    {isActive ? (
+      <div className="absolute left-0 right-0 -bottom-3 h-0.5 bg-primary-main group-data-transparent:bg-transparent" />
+    ) : null}
+  </button>
+);