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

package/mobile/src/components/ErrorBlock/ErrorBlockContent.ts

@@ -1,7 +1,7 @@
 import type { SubtitleProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Изображение
@@ -45,5 +45,5 @@ export type ErrorBlockContent = UniBlockContent &
   SubtitleProps & {
     error?: ErrorContentDef;
     /** @title Кнопка */
-    button?: ButtonProps;
+    button?: ButtonContent;
   };

package/mobile/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { calculateResult, formatValue } from './calculateResult';
 import { callbackCurrencySelect } from './callbackCurrencySelect';
 import { Currency } from './CurrencyProps';
 import { renderInput } from './renderInput';
+import type { ButtonCommonContent } from '../../ui-kit/Button/ButtonContent';
 
 export interface ExchangeCurrencyItem {
   currency?: {
@@ -20,7 +20,7 @@ export interface ExchangeCurrencyCalculatorProps {
   className?: string;
   currencyRatesBuy: ExchangeCurrencyItem[];
   currencyRatesSell: ExchangeCurrencyItem[];
-  button?: ButtonProps;
+  button?: ButtonCommonContent;
 }
 export interface CalcState {
   inputSell: string;

package/mobile/src/components/ExchangeRateTile/ExchangeRateTileContent.ts

@@ -1,11 +1,11 @@
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Курсы обмена валют
  */
 export type ExchangeRateTileContent = UniBlockContent &
   TitleProps & {
-    button?: ButtonProps;
+    button?: ButtonContent;
   };

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

@@ -1,10 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useSWRResource } from '../../hooks/useSWRResource';
-import { LinkCommonProps } from '../../model/LinkProps';
+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';
 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';
@@ -13,9 +15,10 @@ import type { FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
-import { Text } from '../../ui-kit/Text/Text';
 
-export const Footer = JSX<FooterProps>(({ className, sitemap, ...rest }) => {
+export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
+  const fallback = rest.options?.page?.fallback;
+  const { topItems } = useSitemap(fallback);
   const {
     relatedEnterprises,
     contacts,
@@ -23,15 +26,12 @@ export const Footer = JSX<FooterProps>(({ className, sitemap, ...rest }) => {
     mobileApps,
     horizontalNavigationTitle,
     documents,
-  } = useSWRResource<FooterDataProps>(
-    projectSettings.FOOTER || 'footer',
-    rest.options?.page?.fallback,
-  );
+  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
 
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>
       <div className="mb-lg pb-xs border-b border-main-divider">
-        {sitemap?.topItems?.map((item, i) => (
+        {topItems?.map((item, i) => (
           <RollupItem key={String(i)} label={item?.text} labelIcon={item?.icon}>
             <LinkList items={item.items} />
           </RollupItem>

package/mobile/src/components/Footer/FooterProps.ts

@@ -1,7 +1,4 @@
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import type { FooterContent } from './FooterContent';
 
-export interface FooterProps extends FooterContent, UniBlockProps {
-  sitemap?: SitemapData;
-}
+export interface FooterProps extends FooterContent, UniBlockProps {}

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { Text } from '../../ui-kit/Text/Text';
 import { MediaButton } from './MediaButton';
 import type { ButtonSize } from './MediaButton';
@@ -7,7 +7,7 @@ import { style } from '../../utils/style';
 
 export interface SocialMediaProps {
   className?: string;
-  media?: ButtonWithIconProps[];
+  media?: ButtonContent[];
   buttonSize?: ButtonSize;
 }
 

package/mobile/src/components/Header/Header.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { BlockVersion } from '../../model/BlockVersion';
+import { useSitemap } from '../../services/sitemap/useSitemap';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { HeaderProps } from './HeaderProps';
 import { HeaderTop } from './HeaderTop';
@@ -11,8 +12,8 @@ const BG_COLOR_TO_BLOCK_VERSION: Record<BgColorVersion, BlockVersion> = {
 };
 
 export const Header = JSX<HeaderProps>(
-  ({ bgColor = 'bg-white', version = BG_COLOR_TO_BLOCK_VERSION[bgColor], sitemap, ...rest }) => {
-    const { logo, internetBankUrl } = sitemap || {};
+  ({ bgColor = 'bg-white', version = BG_COLOR_TO_BLOCK_VERSION[bgColor], ...rest }) => {
+    const { logo, internetBankUrl } = useSitemap(rest.options?.page?.fallback);
 
     return (
       <BlockWrapper tag="header" defaultPadding="" version={version} {...rest}>

package/mobile/src/components/Header/HeaderProps.ts

@@ -1,9 +1,4 @@
-import { RegionData } from '../../hooks/useLocation';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import type { HeaderContent } from './HeaderContent';
 
-export interface HeaderProps extends HeaderContent, UniBlockProps {
-  sitemap?: SitemapData;
-  location?: RegionData;
-}
+export interface HeaderProps extends HeaderContent, UniBlockProps {}

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,18 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useLocation } from '../../hooks/useLocation';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
-import { useDialog } from '../../ui-kit/Dialog/useDialog';
-import { LOCATION_DIALOG_ID } from '../../ui-kit/LocationDialog/LocationDialog';
-import { SEARCH_DIALOG_ID } from '../../ui-kit/SearchDialog/SearchDialog';
+import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
+import { useSearchDialog } from '../../ui-kit/SearchDialog/useSearchDialog';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
 import { HeaderSecondaryMenuButton } from './HeaderSecondaryMenuButton';
 
 interface HeaderSecondaryMenuContent {
   version?: BlockVersion;
-  locationName?: string;
   officesLink?: string;
+  defaultLocation?: string;
 }
 
 export interface HeaderSecondaryMenuProps extends HeaderSecondaryMenuContent {
@@ -20,23 +20,25 @@ export interface HeaderSecondaryMenuProps extends HeaderSecondaryMenuContent {
 }
 
 export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
-  ({ className, version, locationName: location, officesLink }) => {
+  ({ className, version, officesLink, defaultLocation }) => {
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
-    const { open: openLocationModal } = useDialog(LOCATION_DIALOG_ID);
-    const handleOpenLocationModal = useCallback(() => openLocationModal(), []);
+    const [currentLocation] = useLocation(defaultLocation);
 
-    const { open: openSearchModal } = useDialog(SEARCH_DIALOG_ID);
-    const handleOpenSearchModal = useCallback(() => openSearchModal(), []);
+    const searchDialog = useSearchDialog();
+    const openSearchDialog = useCallback(() => searchDialog.open(), []);
+
+    const locationDialog = useLocationDialog();
+    const openLocationDialog = useCallback(() => locationDialog.open(), []);
 
     return (
       <div className={style('flex items-center gap-5', className)}>
-        <TopItem flat={true} href="#" text={location} onClick={handleOpenLocationModal} />
+        <TopItem flat={true} href="#" text={currentLocation?.name} onClick={openLocationDialog} />
         {officesLink ? <TopItem flat={true} href={officesLink} text="Офисы и банкоматы" /> : null}
         <HeaderSecondaryMenuButton
           image={{ icon: 'LoupeIcon', iconVersion }}
           ariaLabel="Поиск"
-          onClick={handleOpenSearchModal}
+          onClick={openSearchDialog}
         />
       </div>
     );

package/mobile/src/components/Header/HeaderSubMenu.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useRouter } from '../../hooks/useRouter';
-import { findActiveSubItem } from '../../services/sitemap/findActiveSubItem';
+import { findActiveSubItem } from './findActiveSubItem';
 import { style } from '../../utils/style';
 import { DropdownMenu } from './DropdownMenu';
 import { HeaderSubMenuItem } from './HeaderSubMenuItem';

package/mobile/src/components/InsuranceAmountBlock/InsuranceAmountBlockContent.ts

@@ -1,7 +1,7 @@
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Кнопка выбора программы
@@ -31,5 +31,5 @@ export type InsuranceAmountBlockContent = UniBlockContent &
     /** @title Список вкладок */
     insuranceTabs?: InsuranceAmountBlockTab[];
     /** @title Кнопка */
-    button?: ButtonProps;
+    button?: ButtonContent;
   };

package/mobile/src/components/InsuranceAmountBlock/InsuranceAmountBlockInner.tsx

@@ -2,15 +2,15 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
 import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import type { CardItem, InsuranceAmountBlockTab } from './InsuranceAmountBlockContent';
+import type { ButtonCommonContent } from '../../ui-kit/Button/ButtonContent';
 
 export interface InsuranceAmountBlockInnerProps extends InsuranceAmountBlockTab {
   className?: string;
-  button?: ButtonProps;
+  button?: ButtonCommonContent;
 }
 
 type InsuranceGalleryProps = {

package/mobile/src/components/MobileAppTile/MobileAppTileContent.ts

@@ -2,10 +2,10 @@ import type { AlignType } from '../../model/AlignType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @title Мобильное приложение
@@ -13,7 +13,7 @@ import type { ListContent } from '../../ui-kit/List/ListContent';
 export type MobileAppTileContent = UniBlockContent &
   HeadlineCommonProps &
   HeadingCommonProps &
-  ButtonContent &
+  ButtonsSectionContent &
   ListContent &
   ImageContent & {
     /** @title Выравнивание заголовка */

package/mobile/src/components/ProductBlock/ProductBlockContent.ts

@@ -1,6 +1,6 @@
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { BaseProductTileContent } from '../../ui-kit/BaseProductTile/BaseProductTileContent';
-import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Продуктовый блок
@@ -8,5 +8,5 @@ import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
 export type ProductBlockContent = UniBlockContent &
   BaseProductTileContent & {
     /** @title Кнопка возврата */
-    backwardButton?: BackwardButtonProps;
+    backwardButton?: ButtonContent;
   };

package/mobile/src/components/ProductBlock/renderBackwardButton.tsx

@@ -1,10 +1,10 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import { Button } from '../../ui-kit/Button/Button';
-import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 export function renderBackwardButton(
-  { text, href, target, icon }: BackwardButtonProps,
+  { text, href, target, icon }: ButtonContent,
   version: ButtonVersion,
 ) {
   const iconVersion = version === 'primary' ? 'white' : 'black';

package/mobile/src/components/PromoTile/PromoTileContent.ts

@@ -1,6 +1,6 @@
 import type { DescriptionProps, HeadlineProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @title Акции
@@ -8,7 +8,7 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 export type PromoTileContent = UniBlockContent &
   HeadlineProps &
   DescriptionProps &
-  ButtonContent & {
+  ButtonsSectionContent & {
     /** @title Дата публикации */
     date?: string;
   };

package/mobile/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfoContent.ts

@@ -1,8 +1,8 @@
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { IconProps } from '../../model/Picture';
 import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Блок с информацией о представительстве
@@ -18,5 +18,5 @@ export type RepresentativeOfficeInfoContent = UniBlockContent &
     /** @title E-mail */
     email?: string;
     /** @title Кнопка */
-    button?: ButtonWithIconProps;
+    button?: ButtonContent;
   };

package/mobile/src/components/StepsBlock/StepsBlockContent.ts

@@ -1,7 +1,7 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { BulletsProps } from '../../model/Bullets';
-import type { ButtonCommonIconProps } from '../../model/Button';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 import type { DefaultListItemType } from '../../model/DefaultListItemType';
 import type { DescriptionProps, HeadlineCommonProps, LabelProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
@@ -10,7 +10,11 @@ import type { RichTextItem } from '../../model/RichTextItem';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
-type StepCommonProps = IconProps & ButtonCommonIconProps & BulletsProps & ListContent;
+type StepCommonProps = IconProps &
+  BulletsProps &
+  ListContent & {
+    button?: ButtonContent;
+  };
 
 /**
  * @title Стандартный
@@ -34,7 +38,8 @@ export type Step = DefaultStep | RichTextStep;
  * @title Блок шаги
  */
 export type StepsBlockContent = UniBlockContent &
-  HeadlineCommonProps & {
+  HeadlineCommonProps &
+  ButtonsSectionContent & {
     /** @title Линии */
     showLines?: boolean;
     /**
@@ -49,9 +54,4 @@ export type StepsBlockContent = UniBlockContent &
     stepVersion?: BlockVersion;
     /** @title Размер шагов */
     size?: SizeVersion; // TODO: mobile content
-    /**
-     * @title Кнопки
-     * @maxItems 2
-     */
-    buttons?: ButtonWithIconProps[];
   };

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

@@ -1,10 +1,11 @@
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import { List } from '../../ui-kit/List/List';
 import type { ListProps } from '../../ui-kit/List/ListProps';
 import type { LabelDescriptionCell } from './TariffsTableContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 export type EmbeddableCellDataType =
   | ButtonContent
@@ -12,7 +13,7 @@ export type EmbeddableCellDataType =
   | ImageContent
   | ListProps;
 
-const renderButtonsCellData = ({ buttons }: ButtonContent) =>
+const renderButtonsCellData = ({ buttons }: ButtonsSectionContent) =>
   renderButtonsSection(buttons, {
     className: 'mt-3',
     buttonClassName: 'w-12 h-12',

package/mobile/src/components/TariffsTable/TariffsTableContent.ts

@@ -3,10 +3,10 @@ import type { DescriptionProps, LabelProps, TitleProps } from '../../model/Headl
 import type { UniBlockContent, UniBlockProps } from '../../model/JSXBlock';
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import type { ListProps } from '../../ui-kit/List/ListProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @hidden
@@ -56,7 +56,7 @@ export type ImageCellDef = ImageContent & {
 /**
  * @title Кнопки
  */
-export type ButtonsCellDef = ButtonContent & {
+export type ButtonsCellDef = ButtonsSectionContent & {
   /** @default Buttons */
   tableCellType: 'Buttons';
 };

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/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/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;