@redneckz/wildless-cms-uni-blocks 0.7.9 → 0.8.0

package/mobile/src/hooks/useLink.ts

@@ -1,7 +1,7 @@
 import type { LinkProps, Target } from '../model/LinkProps';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
 import { adjustHref } from '../utils/adjustHref';
-import { isHash, isURL } from '../utils/url';
+import { isHash, isLocalURL } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
 
@@ -15,8 +15,24 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
   const router = useRouter();
   const blockRouter = useBlockRouter();
 
+  const handleLocalURL =
+    (href: string | undefined, target?: Target) => (ev?: { preventDefault: () => void }) => {
+      if (!isLocalURL(href, target)) {
+        // Proceed with native handle
+        return;
+      }
+
+      // Client routing
+      ev?.preventDefault();
+      if (isHash(href)) {
+        blockRouter.goto(href);
+      } else if (href) {
+        router.push(href);
+      }
+    };
+
   return (props) => {
-    const href = adjustHref(props.href, router);
+    const href = adjustHref(props.href);
 
     return {
       ...props,
@@ -25,20 +41,8 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
       onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
         props.onClick && props.onClick(ev);
 
-        if (isRemoteHref(href, props.target)) {
-          return;
-        }
-
-        ev?.preventDefault();
-        if (isHash(href)) {
-          blockRouter.goto(href);
-        } else {
-          href && router.push(href);
-        }
+        handleLocalURL(href, props.target)(ev);
       }, props),
     };
   };
 }
-
-const isRemoteHref = (href?: string, target?: Target) =>
-  isURL(href) || (target && target !== '_self') || href?.startsWith('/');

package/mobile/src/icons/IconName.ts

@@ -3,15 +3,15 @@
 /* eslint-disable max-len, max-lines */
 
 export const IconsWithoutInversion = new Set([
-  'ActualBalanceIcon', 'AirPlaneIcon', 'CardWithGemIcon', 'CarIcon', 'CinemaIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PowerIcon', 'PumpkinIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
+  'ActualBalanceIcon', 'AirPlaneIcon', 'CardWithGemIcon', 'CarIcon', 'CinemaIcon', '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', ArrowLeftIcon = 'ArrowLeftIcon', ArrowRightIcon = 'ArrowRightIcon', ArrowTopRightIcon = 'ArrowTopRightIcon', ArrowUpIcon = 'ArrowUpIcon', AtmIcon = 'AtmIcon', BankIcon = 'BankIcon', 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', CinemaIcon = 'CinemaIcon', 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', 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', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', 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', ArrowLeftIcon = 'ArrowLeftIcon', ArrowRightIcon = 'ArrowRightIcon', ArrowTopRightIcon = 'ArrowTopRightIcon', ArrowUpIcon = 'ArrowUpIcon', AtmIcon = 'AtmIcon', BankIcon = 'BankIcon', 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', CinemaIcon = 'CinemaIcon', 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 = 'Стрелка \'Вниз\'', ArrowLeftIcon = 'Стрелка \'Влево\'', ArrowRightIcon = 'Стрелка \'Вправо\'', ArrowTopRightIcon = 'Стрелка \'Вверх-право\'', ArrowUpIcon = 'Стрелка \'Вверх\'', AtmIcon = 'Банкомат', BankIcon = 'Банк', BuildingIcon = 'Здание с деревом', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', Car2Icon = 'Машина2', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', CinemaIcon = 'Кинотеатр', 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 = 'Лупа', MapMarkerClusterIcon = 'Маркер карты', MapMarkerSingleIcon = 'Маркер карты РСХБ', MasterCardIcon = 'MasterCard', MetroIcon = 'Лого Метро', MinusIcon = 'Минус', MirIcon = 'МИР', MoneyIcon = 'Деньги', MoneyInsuranceIcon = 'Денежное страхование', MoneysIcon = 'Купюры', MonitorMobileIcon = 'Монитор и мобильный', NewDocIcon = 'Новый документ', OfficeIcon = 'Офис', OkIcon = 'Лого «Одноклассники»', PackA4Icon = 'Пачка бумаги А4', PassSendIcon = 'Бизнес', PercentageRoundIcon = 'Проценты (круг.)', PercentageSquareIcon = 'Проценты', PercentIcon = 'PercentIcon', PersonalCardIcon = 'Персональная карта', PlayMarketIcon = 'Лого «PlayMarket»', PlusIcon = 'Плюс', PowerIcon = 'Щит', Profile2UserIcon = 'Профиль, 2 персоны', ProfileIcon = 'Профиль', PumpkinIcon = 'Тыква', 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 = 'Стрелка \'Вниз\'', ArrowLeftIcon = 'Стрелка \'Влево\'', ArrowRightIcon = 'Стрелка \'Вправо\'', ArrowTopRightIcon = 'Стрелка \'Вверх-право\'', ArrowUpIcon = 'Стрелка \'Вверх\'', AtmIcon = 'Банкомат', BankIcon = 'Банк', BuildingIcon = 'Здание с деревом', BurgerIcon = 'Бургер', Calendar2Icon = 'Календарь 2', CalendarCircleIcon = 'Скруглённый календарь', CalendarIcon = 'Календарь', CalendarTickIcon = 'Календарь с галочкой', Car2Icon = 'Машина2', CardIcon = 'Кред. карта', CardPosIcon = 'Кред. карта под наклоном', CardTickIcon = 'Кред. карта с галочкой', CardWithGemIcon = 'Карта с драгоценностями', CarIcon = 'Машина', ChartSquareIcon = 'Деньги внутри кошелька', CinemaIcon = 'Кинотеатр', 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»'
 }
 
 /**
@@ -19,7 +19,7 @@ export enum IconTitleMap {
  * @title Иконка
  * @enumNames [
  *   "",
- *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Банкомат', 'Банк', 'Здание с деревом', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Машина2', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Кинотеатр', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Скачать документ', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документы-2', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\' в круге', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'FullScreenIcon', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'HeadphonesIcon', 'Сердце', 'Лого «Huawei»', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'Маркер карты', 'Маркер карты РСХБ', 'MasterCard', 'Лого Метро', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Купюры', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Пачка бумаги А4', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'PercentIcon', 'Персональная карта', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Ящик с замочной скважиной', 'Лого «Telegram»', 'UnionPay', 'UserGeoLocationIcon', 'Пользователь в рамке', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт', 'Лого «Youtube»'
+ *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Банкомат', 'Банк', 'Здание с деревом', 'Бургер', 'Календарь 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' | 'ArrowLeftIcon' | 'ArrowRightIcon' | 'ArrowTopRightIcon' | 'ArrowUpIcon' | 'AtmIcon' | 'BankIcon' | 'BuildingIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'Car2Icon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'CinemaIcon' | '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' | 'MapMarkerClusterIcon' | 'MapMarkerSingleIcon' | 'MasterCardIcon' | 'MetroIcon' | 'MinusIcon' | 'MirIcon' | 'MoneyIcon' | 'MoneyInsuranceIcon' | 'MoneysIcon' | 'MonitorMobileIcon' | 'NewDocIcon' | 'OfficeIcon' | 'OkIcon' | 'PackA4Icon' | 'PassSendIcon' | 'PercentageRoundIcon' | 'PercentageSquareIcon' | 'PercentIcon' | 'PersonalCardIcon' | 'PlayMarketIcon' | 'PlusIcon' | 'PowerIcon' | 'Profile2UserIcon' | 'ProfileIcon' | 'PumpkinIcon' | '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' | 'ArrowLeftIcon' | 'ArrowRightIcon' | 'ArrowTopRightIcon' | 'ArrowUpIcon' | 'AtmIcon' | 'BankIcon' | 'BuildingIcon' | 'BurgerIcon' | 'Calendar2Icon' | 'CalendarCircleIcon' | 'CalendarIcon' | 'CalendarTickIcon' | 'Car2Icon' | 'CardIcon' | 'CardPosIcon' | 'CardTickIcon' | 'CardWithGemIcon' | 'CarIcon' | 'ChartSquareIcon' | 'CinemaIcon' | '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/icons/MailIcon.svg

@@ -0,0 +1 @@
+<svg title="E-mail" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M22 12.98v2.52c0 3.5-2 5-5 5H7c-3 0-5-1.5-5-5v-7c0-3.5 2-5 5-5h10c3 0 5 1.5 5 5"/><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="m17 9-3.13 2.5c-1.03.82-2.72.82-3.75 0L7 9"/></svg>

package/mobile/src/icons/PhoneIcon.svg

@@ -0,0 +1 @@
+<svg title="Телефон" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M9.39 6.01c.18.25.31.48.4.7.09.21.14.42.14.61 0 .24-.07.48-.21.71-.13.23-.32.47-.56.71l-.76.79c-.11.11-.16.24-.16.4 0 .08.01.15.03.23.03.08.06.14.08.2.18.33.49.76.93 1.28.45.52.93 1.05 1.45 1.58.54.53 1.06 1.02 1.59 1.47.52.44.95.74 1.29.92.05.02.11.05.18.08.08.03.16.04.25.04.17 0 .3-.06.41-.17l.76-.75c.25-.25.49-.44.72-.56.23-.14.46-.21.71-.21.19 0 .39.04.61.13.22.09.45.22.7.39l3.31 2.35c.26.18.44.39.55.64.1.25.16.5.16.78 0 .36-.08.73-.25 1.09-.17.36-.39.7-.68 1.02-.49.54-1.03.93-1.64 1.18-.6.25-1.25.38-1.95.38-1.02 0-2.11-.24-3.26-.73s-2.3-1.15-3.44-1.98a28.75 28.75 0 0 1-3.28-2.8 28.414 28.414 0 0 1-2.79-3.27c-.82-1.14-1.48-2.28-1.96-3.41C2.24 8.67 2 7.58 2 6.54c0-.68.12-1.33.36-1.93.24-.61.62-1.17 1.15-1.67C4.15 2.31 4.85 2 5.59 2c.28 0 .56.06.81.18.26.12.49.3.67.56"/></svg>

package/mobile/src/icons/ResponceFailIcon.svg

@@ -0,0 +1 @@
+<svg title="Ошибка" xmlns="http://www.w3.org/2000/svg" width="38" height="34" fill="none"><mask id="a" width="38" height="34" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#898989" d="M20.494.178h-2.987C8.144.178.557 7.706.557 16.999c0 9.293 7.587 16.822 16.95 16.822h2.987c9.363 0 16.949-7.529 16.949-16.822S29.85.178 20.493.178Z"/></mask><g mask="url(#a)"><path fill="#FA552D" d="M20.494.178h-2.987C8.144.178.557 7.706.557 16.999c0 9.293 7.587 16.822 16.95 16.822h2.987c9.363 0 16.949-7.529 16.949-16.822S29.85.178 20.493.178Z"/><path fill="#542C4B" d="M37.447.178H15.39V33.82h22.057V.178Z"/><path fill="url(#b)" d="M37.447.178H15.39V33.82h22.057V.178Z"/></g><path fill="#FFECEC" d="M17.502 33.82c9.36 0 16.949-7.531 16.949-16.822C34.45 7.708 26.862.177 17.5.177 8.142.177.554 7.708.554 16.998c0 9.29 7.588 16.822 16.949 16.822Z"/><mask id="c" width="35" height="33" x="0" y="1" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#898989" d="M34.445 16.997c0-1.14-.115-2.254-.332-3.33-2.05-7-8.56-12.115-16.273-12.115C8.477 1.552.89 9.08.89 18.373c0 1.14.115 2.255.332 3.331 2.05 7 8.56 12.115 16.274 12.115 9.363-.006 16.949-7.535 16.949-16.822Z"/></mask><g mask="url(#c)"><path fill="#FA552D" d="M34.445 16.997c0-1.14-.115-2.254-.332-3.33-2.05-7-8.56-12.115-16.273-12.115C8.477 1.552.89 9.08.89 18.373c0 1.14.115 2.255.332 3.331 2.05 7 8.56 12.115 16.274 12.115 9.363-.006 16.949-7.535 16.949-16.822Z"/><path fill="url(#d)" d="M34.445 16.997c0-1.14-.115-2.254-.332-3.33-2.05-7-8.56-12.115-16.273-12.115C8.477 1.552.89 9.08.89 18.373c0 1.14.115 2.255.332 3.331 2.05 7 8.56 12.115 16.274 12.115 9.363-.006 16.949-7.535 16.949-16.822Z"/></g><path fill="#542C4B" d="m21.56 17.679 4.777-4.777c.63-.63.63-1.656 0-2.293a1.602 1.602 0 0 0-1.096-.472h-2.267a1.591 1.591 0 0 0-1.21.472l-3.638 3.637-3.637-3.637a1.602 1.602 0 0 0-1.159-.472h-2.267c-.414 0-.828.16-1.147.472-.63.63-.63 1.656 0 2.293l4.777 4.777-4.777 4.777c-.63.63-.63 1.656 0 2.293a1.61 1.61 0 0 0 1.147.471h2.28c.414 0 .828-.16 1.146-.471l3.637-3.637 3.637 3.637a1.61 1.61 0 0 0 1.147.471h.064l2.267-.006c.395-.013.79-.166 1.096-.472.63-.63.63-1.656 0-2.293l-4.777-4.77Z"/><path fill="url(#e)" d="m21.56 17.679 4.777-4.777c.63-.63.63-1.656 0-2.293a1.602 1.602 0 0 0-1.096-.472h-2.267a1.591 1.591 0 0 0-1.21.472l-3.638 3.637-3.637-3.637a1.602 1.602 0 0 0-1.159-.472h-2.267c-.414 0-.828.16-1.147.472-.63.63-.63 1.656 0 2.293l4.777 4.777-4.777 4.777c-.63.63-.63 1.656 0 2.293a1.61 1.61 0 0 0 1.147.471h2.28c.414 0 .828-.16 1.146-.471l3.637-3.637 3.637 3.637a1.61 1.61 0 0 0 1.147.471h.064l2.267-.006c.395-.013.79-.166 1.096-.472.63-.63.63-1.656 0-2.293l-4.777-4.77Z"/><path fill="#fff" d="m19.28 17.679 4.776-4.777c.63-.63.63-1.656 0-2.293a1.626 1.626 0 0 0-2.293 0l-4.777 4.777-4.777-4.777a1.626 1.626 0 0 0-2.293 0c-.63.63-.63 1.656 0 2.293l4.777 4.777-4.777 4.777c-.63.63-.63 1.656 0 2.293a1.61 1.61 0 0 0 1.147.471c.414 0 .828-.16 1.146-.471l4.777-4.777 4.777 4.777a1.61 1.61 0 0 0 1.147.471c.414 0 .828-.16 1.146-.471.63-.63.63-1.656 0-2.293l-4.777-4.777Z"/><defs><linearGradient id="b" x1="31.96" x2="31.96" y1="33.821" y2="16.999" gradientUnits="userSpaceOnUse"><stop stop-color="#FA552D"/><stop offset=".472" stop-color="#0057D6"/><stop offset="1" stop-color="#0057D6" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="6.357" x2="17.668" y1="5.974" y2="17.685" gradientUnits="userSpaceOnUse"><stop stop-color="#FFB571"/><stop offset="1" stop-color="#FFB571" stop-opacity="0"/></linearGradient><linearGradient id="e" x1="25.214" x2="25.214" y1="25.22" y2="22.692" gradientUnits="userSpaceOnUse"><stop stop-color="#0057D6"/><stop offset="1" stop-color="#0057D6" stop-opacity="0"/></linearGradient></defs></svg>

package/mobile/src/icons/ResponceOKIcon.svg

@@ -0,0 +1 @@
+<svg title="Ок" xmlns="http://www.w3.org/2000/svg" width="42" height="42" fill="none"><mask id="a" width="38" height="34" x="2" y="0" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#fff" d="M22.507.254h-2.988c-9.363 0-16.954 7.533-16.954 16.82 0 9.287 7.59 16.821 16.954 16.821h2.988c9.363 0 16.953-7.534 16.953-16.82C39.46 7.786 31.87.253 22.507.253Z"/></mask><g mask="url(#a)"><path fill="#42AB44" d="M22.507.254h-2.988c-9.363 0-16.954 7.533-16.954 16.82 0 9.287 7.59 16.821 16.954 16.821h2.988c9.363 0 16.953-7.534 16.953-16.82C39.46 7.786 31.87.253 22.507.253Z"/><path fill="#44384D" d="M39.45.356H17.393V34H39.45V.356Z"/><path fill="url(#b)" d="M39.45.356H17.393V34H39.45V.356Z"/></g><path fill="#E2F6E2" d="M19.518 33.897c9.363 0 16.953-7.53 16.953-16.82S28.881.255 19.518.255 2.564 7.786 2.564 17.076s7.59 16.82 16.954 16.82Z"/><mask id="c" width="35" height="33" x="2" y="1" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#fff" d="M36.478 17.07c0-1.14-.114-2.254-.335-3.33-2.051-7.002-8.56-12.117-16.276-12.117-9.364 0-16.954 7.534-16.954 16.82 0 1.14.114 2.254.336 3.337 2.05 7.002 8.559 12.117 16.276 12.117 9.363-.007 16.953-7.54 16.953-16.827Z"/></mask><g mask="url(#c)"><path fill="#7DC15D" d="M36.478 17.07c0-1.14-.114-2.254-.335-3.33-2.051-7.002-8.56-12.117-16.276-12.117-9.364 0-16.954 7.534-16.954 16.82 0 1.14.114 2.254.336 3.337 2.05 7.002 8.559 12.117 16.276 12.117 9.363-.007 16.953-7.54 16.953-16.827Z"/><path fill="url(#d)" d="M36.478 17.07c0-1.14-.114-2.254-.335-3.33-2.051-7.002-8.56-12.117-16.276-12.117-9.364 0-16.954 7.534-16.954 16.82 0 1.14.114 2.254.336 3.337 2.05 7.002 8.559 12.117 16.276 12.117 9.363-.007 16.953-7.54 16.953-16.827Z"/></g><path fill="#44384D" d="M30.659 10.89a1.502 1.502 0 0 0-.918-.323h-2.298c-.45-.007-.906.17-1.241.506l-8.857 8.933-4.59-4.654a1.567 1.567 0 0 0-1.152-.468H9.337c-.45 0-.893.19-1.21.57-.531.64-.423 1.595.16 2.184l7.457 7.565c.12.12.272.177.43.184l2.298.006a.628.628 0 0 0 .45-.19l11.863-11.971a1.572 1.572 0 0 0-.126-2.343Z"/><path fill="#fff" d="m15.744 25.2-7.458-7.564c-.582-.589-.69-1.545-.158-2.184a1.579 1.579 0 0 1 2.348-.102l5.546 5.622c.101.101.26.101.361 0l9.819-9.908c.582-.588 1.538-.702 2.177-.183.741.601.786 1.69.133 2.349L16.65 25.2a.634.634 0 0 1-.905 0Z"/><path fill="#582B4C" d="M36.386 38.591c0-.11-.105-.22-.31-.324-1.88-.689-7.86-1.187-14.946-1.187-8.598 0-15.571.741-15.571 1.65 0 .11.105.22.309.325 1.888.689 7.861 1.187 14.946 1.187 8.599 0 15.572-.741 15.572-1.65Z"/><path fill="url(#e)" d="M36.386 38.591c0-.11-.105-.22-.31-.324-1.88-.689-7.86-1.187-14.946-1.187-8.598 0-15.571.741-15.571 1.65 0 .11.105.22.309.325 1.888.689 7.861 1.187 14.946 1.187 8.599 0 15.572-.741 15.572-1.65Z"/><defs><linearGradient id="b" x1="33.963" x2="33.963" y1="33.999" y2="17.178" gradientUnits="userSpaceOnUse"><stop stop-color="#42AB44"/><stop offset=".472" stop-color="#0057D6"/><stop offset="1" stop-color="#0057D6" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="6.863" x2="19.696" y1="4.815" y2="17.76" gradientUnits="userSpaceOnUse"><stop stop-color="#FFCA42"/><stop offset="1" stop-color="#FFCA42" stop-opacity="0"/></linearGradient><linearGradient id="e" x1="5.559" x2="36.386" y1="38.661" y2="38.661" gradientUnits="userSpaceOnUse"><stop stop-color="#FA552D"/><stop offset=".31" stop-color="#FA552D" stop-opacity="0"/><stop offset=".666" stop-color="#7DC15D" stop-opacity="0"/><stop offset="1" stop-color="#7DC15D"/></linearGradient></defs></svg>

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

@@ -1,13 +1,7 @@
-import { normalizeURLPath } from '../../utils/normalizeURLPath';
+import { adjustHref } from '../../utils/adjustHref';
 import { getPathname, isURL, withoutQuery } from '../../utils/url';
 
-export const isHrefActive = (
-  href: string | undefined,
-  router: { pathname?: string; href?: string },
-  cmp: (targetHref: string, baseHref: string) => boolean = (targetHref, baseHref) =>
-    baseHref.startsWith(targetHref),
-) =>
-  cmp(
-    withoutQuery(normalizeURLPath(href)),
-    withoutQuery(isURL(href) ? router.href : getPathname(router.href)),
+export const isHrefActive = (href: string | undefined, router: { href?: string }) =>
+  withoutQuery(isURL(href) ? router.href : getPathname(router.href)).startsWith(
+    withoutQuery(adjustHref(href)),
   );

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

@@ -1,8 +1,7 @@
-import type { Router } from '../../hooks/useRouter';
 import type { LinkProps } from '../../model/LinkProps';
 import { isHrefActive } from './isHrefActive';
 
 export const isSubItemActive =
-  (router: Router) =>
+  (router: { href?: string }) =>
   (subItem: LinkProps): boolean =>
     isHrefActive(subItem.href, router);

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

@@ -1,14 +1,8 @@
-import type { Router } from '../../hooks/useRouter';
-import { projectSettings } from '../../ProjectSettings';
-import { checkIsHrefSameOrigin } from './checkIsHrefSameOrigin';
 import { isHrefActive } from './isHrefActive';
 import { isSubItemActive } from './isSubItemActive';
 import { TopMenuItem } from './SitemapProps';
 
 export const isTopItemActive =
-  (router: Router) =>
+  (router: { href?: string }) =>
   (topItem: TopMenuItem): boolean =>
-    topItem.items?.some(isSubItemActive(router)) ||
-    isHrefActive(topItem.href, router) ||
-    checkIsHrefSameOrigin(topItem.href, router) ||
-    Boolean(projectSettings.BASE_PATH?.startsWith(topItem.href || '/'));
+    topItem.items?.some(isSubItemActive(router)) || isHrefActive(topItem.href, router);

package/mobile/src/setup-fixture.ts

@@ -1,5 +1,5 @@
 import '@redneckz/uni-jsx/lib/setup.react';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { handlerDecorator } from './hooks/handlerDecorator';
 import { useRouter } from './hooks/useRouter';
 import { projectSettings } from './ProjectSettings';
@@ -8,24 +8,36 @@ import wlc from './wlc.json';
 projectSettings.setup(wlc);
 
 useRouter.setup(() => {
-  const [, setHref] = useState<string>(globalThis.location.href);
+  const [href, setHref] = useState<string>(
+    `${globalThis.location.origin}${projectSettings.BASE_PATH}cards-credit`,
+  );
+
+  useEffect(() => {
+    const handleHistoryChange = () => {
+      setHref(globalThis.location.href);
+    };
+
+    globalThis.addEventListener('popstate', handleHistoryChange);
+
+    return () => {
+      globalThis.removeEventListener('popstate', handleHistoryChange);
+    };
+  }, []);
 
   return {
-    href: `${globalThis.location.origin}${projectSettings.BASE_PATH}cards-credit`, //for header active links
-    pathname: '/cards-credit',
+    href,
+    pathname: '',
     query: {},
     push: (url: string) => {
       globalThis.history.pushState(null, '', url);
-      setHref(globalThis.location.href);
     },
     replace: (url: string) => {
       globalThis.history.replaceState(null, '', url);
-      setHref(globalThis.location.href);
     },
   };
 });
 
-handlerDecorator.setup((handler, targetContent): any => (ev) => {
+handlerDecorator.setup((handler): any => (ev) => {
   ev.preventDefault();
   handler(ev);
 });

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

@@ -12,14 +12,19 @@ export const HeaderItem = JSX<TopItemProps>(
 
     return (
       <a
-        className={`relative inline-block bg-transparent text-center no-underline ${className}`}
+        className={style(
+          'relative inline-block bg-transparent text-center no-underline',
+          className,
+        )}
         href={href}
         target={target}
         data-item-name={dataItemName}
         onClick={onClick}
       >
         <span className={getTextStyle(active)}>{text || children}</span>
-        {active ? <div className={getBorderStyle(active)} /> : null}
+        {active ? (
+          <div className="absolute left-0 -bottom-3 w-full h-0.5 bg-primary-main group-data-transparent:bg-transparent" />
+        ) : null}
       </a>
     );
   },
@@ -31,9 +36,3 @@ const getTextStyle = (active = false) =>
     active ? 'text-primary-main' : 'text-secondary-text hover:text-primary-main',
     'group-data-transparent:text-white group-data-transparent:hover:text-primary-hover',
   );
-
-const getBorderStyle = (active = false) =>
-  style(
-    'absolute left-0 -bottom-3 w-full h-0.5',
-    active ? 'bg-primary-main group-data-transparent:bg-transparent' : '',
-  );

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

@@ -10,30 +10,27 @@ export interface TopItemContent extends LinkProps {
 export interface TopItemProps extends TopItemContent {
   className?: string;
   flat?: boolean;
-  ariaLabel?: string;
   dataItemName?: string;
   onClick?: () => void;
 }
 
-export const TopItem = JSX<TopItemProps>(
-  ({ className = '', active, flat, ariaLabel, children, ...rest }) => {
-    const link = useLink();
-    const { href, target, text, onClick } = link(rest);
+export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {
+  const link = useLink();
+  const { href, target, text, onClick } = link(rest);
 
-    return (
-      <a
-        className={`${getLinkStyle(active, flat)} ${className}`}
-        href={href}
-        target={target}
-        onClick={onClick}
-        rel="noopener noreferrer"
-        aria-label={ariaLabel}
-      >
-        <span className={getTextStyle(active, flat)}>{text || children}</span>
-      </a>
-    );
-  },
-);
+  return (
+    <a
+      className={style(getLinkStyle(active, flat), className)}
+      href={href}
+      target={target}
+      onClick={onClick}
+      rel="noopener noreferrer"
+      aria-label={text}
+    >
+      <span className={getTextStyle(active, flat)}>{text || children}</span>
+    </a>
+  );
+});
 
 const getLinkStyle = (active = false, flat = false) =>
   style(

package/mobile/src/utils/adjustHref.ts

@@ -1,15 +1,7 @@
-import { getOrigin } from './url';
+import { projectSettings } from '../ProjectSettings';
+import { isURL } from './url';
 
-export const adjustHref = (
-  href: string | undefined,
-  router: { pathname: string; href?: string },
-) => {
-  if (!href) {
-    return href;
-  }
-
-  const origin = getOrigin(router?.href);
-
-  // Relative URL
-  return origin ? href.replace(origin, '') || '/' : href;
-};
+export const adjustHref = (href: string | undefined) =>
+  href && projectSettings.BASE_PATH && !(isURL(href) || href.startsWith('/'))
+    ? `${projectSettings.BASE_PATH}${href}`
+    : href;

package/mobile/src/utils/url.ts

@@ -1,38 +1,23 @@
-export const isURL = (href?: string) => href?.includes('//');
+import type { Target } from '../model/LinkProps';
+import { projectSettings } from '../ProjectSettings';
 
-export const withoutQuery = (href?: string) => (href || '').replace(/\/?\?.*/, '');
+export const isURL = (href?: string): href is `${string}//${string}` =>
+  Boolean(href?.includes('//'));
 
-export const getOrigin = (href?: string) => {
-  if (!href || !isURL(href)) {
-    return undefined;
-  }
+export const isLocalURL = (href: string | undefined, target?: Target) =>
+  Boolean(
+    href &&
+      !isURL(href) &&
+      (projectSettings.BASE_PATH
+        ? href.startsWith(projectSettings.BASE_PATH)
+        : !href.startsWith('/')) &&
+      (!target || target === '_self'),
+  );
 
-  const url = href;
-  const protoSeparator = '//';
-  const endOfProto = url.indexOf(protoSeparator);
-  const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
+export const isHash = (href?: string): href is `#${string}` => Boolean(href?.startsWith('#'));
 
-  return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
-};
+export const withoutQuery = (href?: string): string => (href || '').replace(/\/?\?.*/, '');
 
-export const getPathname = (href?: string) => {
-  if (!href || !isURL(href)) {
-    return undefined;
-  }
-
-  const url = new URL(href);
-
-  return url.pathname;
-};
-
-export const getHash = (href?: string) => {
-  if (!href || !isURL(href)) {
-    return undefined;
-  }
-
-  const hashIndex = href.indexOf('#');
-
-  return hashIndex !== -1 ? href.substring(hashIndex, href.length) : undefined;
-};
-
-export const isHash = (href?: string) => href?.startsWith('#');
+export const getOrigin = (href?: string) => (isURL(href) ? new URL(href).origin : undefined);
+export const getPathname = (href?: string) => (isURL(href) ? new URL(href).pathname : undefined);
+export const getHash = (href?: string) => (isURL(href) ? new URL(href).hash : undefined);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.7.9",
+  "version": "0.8.0",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -188,7 +188,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "47 kB",
+      "limit": "50 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/ProjectSettings.ts

@@ -1,8 +1,8 @@
 export interface ProjectSettings {
   TEST_BRANCH?: string;
   RC_BRANCH?: string;
-  PROD_BRANCH: string;
-  FORCED_DRAFT_FLOW: boolean;
+  PROD_BRANCH?: string;
+  FORCED_DRAFT_FLOW?: boolean;
   ASSIST_PROJECT_ID?: string;
   SITEMAP?: string;
   FOOTER?: string;
@@ -12,11 +12,10 @@ export interface ProjectSettings {
   YANDEX_METRIKA_ID?: string;
 }
 
+const DEFAULT_PROJECT_SETTINGS: ProjectSettings = { PROD_BRANCH: 'master' };
+
 export const projectSettings = new (class implements ProjectSettings {
-  _: ProjectSettings = {
-    PROD_BRANCH: 'master',
-    FORCED_DRAFT_FLOW: false,
-  };
+  _: ProjectSettings = DEFAULT_PROJECT_SETTINGS;
 
   setup(_: ProjectSettings) {
     this._ = _;
@@ -29,7 +28,7 @@ export const projectSettings = new (class implements ProjectSettings {
     return this._.RC_BRANCH;
   }
   get PROD_BRANCH() {
-    return this._.PROD_BRANCH;
+    return this._.PROD_BRANCH || DEFAULT_PROJECT_SETTINGS.PROD_BRANCH;
   }
   get FORCED_DRAFT_FLOW() {
     return this._.FORCED_DRAFT_FLOW;

package/src/api/CorporateLeadAPI.ts

@@ -0,0 +1,36 @@
+interface DaDataSuggestion<T> {
+  value?: string;
+  unrestricted_value?: string;
+  data?: T;
+}
+
+interface DaDataAddress {
+  city?: string | null;
+}
+
+export interface DaDataResult {
+  suggestions?: DaDataSuggestion<DaDataAddress>[];
+}
+
+export function CorporateLeadAPI() {
+  async function send(body: any) {
+    try {
+      const response = await fetch('/api/v1/sendCorporateLead', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        mode: 'cors',
+        body: JSON.stringify(body),
+      });
+
+      const data = (await response.json()) as any;
+
+      return data;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  return {
+    send,
+  };
+}

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -0,0 +1,43 @@
+import '../../setup-fixture';
+import { ApplicationForm } from './ApplicationForm';
+import type { ApplicationFormContent } from './ApplicationFormContent';
+
+export const ApplicationFormProps: ApplicationFormContent = {
+  title: 'Форма заявки',
+  button: {
+    text: 'Отправить заявку',
+    version: 'primary',
+  },
+  link: {
+    text: 'условиями передачи данных',
+    href: '#',
+  },
+};
+
+export default {
+  credit: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm className="col-span-12" {...ApplicationFormProps} typeForm="credit" />
+    </div>
+  ),
+  acquiring: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm className="col-span-12" {...ApplicationFormProps} typeForm="acquiring" />
+    </div>
+  ),
+  'business-card': (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm className="col-span-12" {...ApplicationFormProps} typeForm="business-card" />
+    </div>
+  ),
+  deposit: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm className="col-span-12" {...ApplicationFormProps} typeForm="deposit" />
+    </div>
+  ),
+  wed: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm className="col-span-12" {...ApplicationFormProps} typeForm="wed" />
+    </div>
+  ),
+};

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -0,0 +1,45 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
+import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
+import type { ApplicationFormContent } from './ApplicationFormContent';
+import { ApplicationFormCredit } from './ApplicationFormCredit';
+import { ApplicationFormDeposit } from './ApplicationFormDeposit';
+import { ApplicationFormsProps } from './ApplicationFormsProps';
+import { ApplicationFormWed } from './ApplicationFormWed';
+import { ResponseNotification } from './ResponseNotification';
+
+export interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
+
+const COMPONENTS_MAP = {
+  credit: (props: ApplicationFormsProps) => <ApplicationFormCredit {...props} />,
+  acquiring: (props: ApplicationFormsProps) => <ApplicationFormAcquiring {...props} />,
+  'business-card': (props: ApplicationFormsProps) => <ApplicationFormBusinessCard {...props} />,
+  deposit: (props: ApplicationFormsProps) => <ApplicationFormDeposit {...props} />,
+  wed: (props: ApplicationFormsProps) => <ApplicationFormWed {...props} />,
+};
+
+export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
+  const { className = '', title, typeForm = 'credit', button, link, ...rest } = props;
+
+  const [responceType, setResponceType] = useState<'OK' | 'Fail' | ''>('');
+
+  const handleSubmit = useCallback(() => {
+    setResponceType('OK');
+
+    return 'OK';
+  }, []);
+
+  return (
+    <BlockWrapper className={`font-sans bg-white p-[50px] pb-9 ${className}`} {...rest}>
+      <div className="container max-w-[978px]">
+        {title ? <Heading headingType="h3" title={title} className="text-center mb-8" /> : null}
+        {COMPONENTS_MAP[typeForm]({ button, link, handleSubmit })}
+        {responceType ? <ResponseNotification responceType={responceType} /> : null}
+      </div>
+    </BlockWrapper>
+  );
+});