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

package/mobile/lib/ui-kit/SearchDialog/SearchDialog.js

@@ -2,24 +2,23 @@ import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useSearch } from '../../services/search/useSearch.js';
+import { useSitemap } from '../../services/sitemap/useSitemap.js';
 import { joinPath } from '../../utils/url.js';
 import { zip } from '../../utils/zip.js';
-import { Dialog } from '../Dialog/Dialog.js';
-import { useDialogProps } from '../Dialog/useDialogProps.js';
+import { Dialog } from '../DialogManager/Dialog.js';
 import { Sitemap } from '../Sitemap/Sitemap.js';
 import { SearchInput } from './SearchInput.js';
-export const SEARCH_DIALOG_ID = 'search';
-export const SearchDialog = JSX(({ topItems }) => {
-    const dialogProps = useDialogProps(SEARCH_DIALOG_ID);
+export const SearchDialog = JSX(({ initialQuery }) => {
+    const { topItems } = useSitemap();
     const basePathList = useMemo(() => topItems?.map((_) => _.href || '/'), [topItems]);
     const [searchResult, searchInputProps] = useSearch({
         basePathList,
-        initialQuery: dialogProps.message,
-        wasOpened: dialogProps.wasOpened,
+        initialQuery,
+        wasOpened: false,
     });
     const searchItems = useMemo(() => combineTopItemsAndSearchResult(topItems)(searchResult), [topItems, searchResult]);
     useEffect(() => printSearchItems(searchItems), [searchItems]); // Temp
-    return (_jsx(Dialog, { ...dialogProps, head: _jsx(SearchInput, { autoFocus: true, ...searchInputProps }), children: _jsx(Sitemap, { topItems: searchItems }) }));
+    return (_jsx(Dialog, { head: _jsx(SearchInput, { autoFocus: true, ...searchInputProps }), children: _jsx(Sitemap, { topItems: searchItems }) }));
 });
 const combineTopItemsAndSearchResult = (topItems) => (searchResult) => topItems?.length && searchResult?.length
     ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({

package/mobile/lib/ui-kit/SearchDialog/SearchDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAqB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACjD,YAAY;QACZ,YAAY;QACZ,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAC5D,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO;IAEtE,OAAO,CACL,KAAC,MAAM,IAAC,IAAI,EAAE,KAAC,WAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,KAAC,OAAO,IAAC,QAAQ,EAAE,WAAW,GAAI,GAC3B,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AAEX,OAAO;AACP,SAAS,gBAAgB,CAAC,QAA4B;IACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;KACpB;AACH,CAAC"}

package/mobile/lib/ui-kit/SearchDialog/useSearchDialog.d.ts

@@ -0,0 +1,6 @@
+import { DialogOptions } from '../DialogManager/useDialogManager';
+import { SearchDialogProps } from './SearchDialog';
+export declare const useSearchDialog: () => {
+    open: (props?: SearchDialogProps, options?: DialogOptions) => void;
+    close: () => void;
+};

package/mobile/lib/ui-kit/SearchDialog/useSearchDialog.js

@@ -0,0 +1,11 @@
+import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { useDialogManager } from '../DialogManager/useDialogManager.js';
+import { SearchDialog } from './SearchDialog.js';
+export const useSearchDialog = () => {
+    const { open, close } = useDialogManager();
+    return {
+        open: (props = {}, options = {}) => open(_jsx(SearchDialog, { ...props }), options),
+        close,
+    };
+};
+//# sourceMappingURL=useSearchDialog.js.map

package/mobile/lib/ui-kit/SearchDialog/useSearchDialog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/useSearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAiB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,YAAY,EAAqB,MAAM,gBAAgB,CAAC;AAEjE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAE3C,OAAO;QACL,IAAI,EAAE,CAAC,QAA2B,EAAE,EAAE,UAAyB,EAAE,EAAE,EAAE,CACnE,IAAI,CAAC,KAAC,YAAY,OAAK,KAAK,GAAI,EAAE,OAAO,CAAC;QAC5C,KAAK;KACN,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/ui-kit/SwipeListControl/SwipeListContainer.js

@@ -5,7 +5,7 @@ import { mapChildren } from '../../utils/mapChildren.js';
 import { style } from '../../utils/style.js';
 import { getContainerHeight } from './getContainerHeight.js';
 import { SwipeListItem } from './SwipeListItem.js';
-const childStyleMap = ['min-w-full', 'min-w-1/2', 'min-w-1/3', 'min-w-1/4'];
+const childStyleMap = ['min-w-full', '@lg:min-w-[50%]', '@lg:min-w-[33.3%]', '@lg:min-w-[25%]'];
 export const SwipeListContainer = JSX(({ className = '', containerRef, activeIndex, visibleItemCount = 0, gap = 0, padding = 0, listType = 'horizontal-list', snapAlign = 'snap-center', minHeight, children, onVisibleItemsChange, onVisibleIndicesChange, }) => {
     const observerOptions = {
         sensitivity: 1,

package/mobile/lib/ui-kit/SwipeListControl/SwipeListContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwipeListContainer.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SwipeListContainer.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListContainer.tsx"],"names":[],"mappings":"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"}

package/mobile/src/EventBus/defaultEventBus.ts

@@ -1,10 +1,12 @@
 import type { TabActivationEvent } from '../components/Tabs/TabActivationEvent';
-import type { DialogAction } from '../ui-kit/Dialog/DialogAction';
+import { RegionData } from '../hooks/useLocation';
+import type { DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { EventBus } from './EventBus';
 
 interface GlobalEventMap {
-  tab: TabActivationEvent;
+  location: RegionData;
   dialog: DialogAction;
+  tab: TabActivationEvent;
 }
 
 export const defaultEventBus = new EventBus<GlobalEventMap>();

package/mobile/src/EventBus/useLatestEvent.ts

@@ -0,0 +1,16 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { EventBus } from './EventBus';
+
+export const useLatestEvent = <EM extends Record<string, any>, K extends keyof EM>(
+  eventBus: EventBus<EM>,
+  type: K,
+  initialEvent?: EM[K],
+): [EM[K] | null, (_: EM[K]) => void] => {
+  const [latestEvent, setLatestEvent] = useState<EM[K] | null>(initialEvent || null);
+
+  useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
+
+  const fireEvent = useCallback((_: EM[K]) => eventBus.fire(type, _), [eventBus, type]);
+
+  return [latestEvent, fireEvent];
+};

package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -2,12 +2,12 @@ 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 { ButtonAdditionalProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Кнопка
  */
-export interface SubmitButtonProps extends ButtonAdditionalProps {
+export interface SubmitButtonProps extends ButtonContent {
   /** @title Текст */
   text?: string;
   version?: ButtonVersion;

package/mobile/src/components/Bonus/BonusContent.ts

@@ -1,8 +1,8 @@
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @title Изображение
@@ -32,14 +32,10 @@ export type BonusItemContentDef = EmptyOption | BonusImageDef | BonusCountDef;
 /**
  * @title Плитка
  */
-export type BonusItem = HeadlineCommonProps & {
-  bonusItemContent?: BonusItemContentDef;
-  /**
-   * @title Кнопка
-   * @maxItems 1
-   */
-  buttons?: ButtonWithIconProps[];
-};
+export type BonusItem = HeadlineCommonProps &
+  ButtonsSectionContent & {
+    bonusItemContent?: BonusItemContentDef;
+  };
 
 /**
  * @title Блок Бонусы

package/mobile/src/components/BusinessBlock/BusinessBlockContent.ts

@@ -1,8 +1,8 @@
-import type { ButtonCommonIconProps } from '../../model/Button';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 export type BusinessCardItemProps = IconProps & {
   /** @title Текст */
@@ -10,10 +10,10 @@ export type BusinessCardItemProps = IconProps & {
 };
 
 export type BusinessCardProps = TitleProps &
-  ImageContent &
-  ButtonCommonIconProps & {
+  ImageContent & {
     /** @title Список */
     cardItems?: BusinessCardItemProps[];
+    button?: ButtonContent;
   };
 
 /**

package/mobile/src/components/ButtonsBlock/ButtonsBlockContent.ts

@@ -1,9 +1,9 @@
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Блок кнопок
  */
 export interface ButtonsBlockContent {
   /** @title Кнопки */
-  buttons?: ButtonWithIconProps[];
+  buttons?: ButtonContent[];
 }

package/mobile/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -4,13 +4,13 @@ import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import type { BusinessDepositCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { BUSINESS_DEFAULT_DAYS, BUSINESS_DEFAULT_SUM } from './constants';
 import { Rate } from './Rate';
+import { UnknownRate } from './UnknownRate';
+import { BUSINESS_DEFAULT_DAYS, BUSINESS_DEFAULT_SUM } from './constants';
 import { renderDaysInput } from './renderDaysInput';
 import { renderFootnote } from './renderFootnote';
 import { renderInterestPayment } from './renderInterestPayment';
 import { renderWantedSumInput } from './renderWantedSumInput';
-import { UnknownRate } from './UnknownRate';
 import {
   BusinessDepositCalculatorParams,
   useBusinessDepositCalculatorParams,
@@ -111,7 +111,7 @@ const renderBusinessDepositParamsForm = (
     />
     <Checkbox
       className="mt-3"
-      text="Являюсь малым предприятием"
+      text="ИП / малое предприятие"
       {...field('isSmallBusiness')}
       value={calculatorParams.isSmallBusiness}
     />

package/mobile/src/components/Calculator/CalculatorContent.ts

@@ -2,10 +2,10 @@ import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { Footnote } from '../../model/Footnote';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 export type CommonCalculatorProps = Footnote &
-  ButtonContent & {
+  ButtonsSectionContent & {
     /** @title Адрес справочника */
     sourceBookDir?: string;
   };

package/mobile/src/components/CardTransfer/CardTransferContent.ts

@@ -1,6 +1,6 @@
 import type { LabelProps, 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 Перевод с карты на карту
@@ -10,5 +10,5 @@ export type CardTransferContent = UniBlockContent &
   TitleProps & {
     /** @title Плейсхолдер */
     placeholder?: string;
-    button?: ButtonProps;
+    button?: ButtonContent;
   };

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.tsx

@@ -10,7 +10,7 @@ export const CarouselBankHistoryCard = JSX<CarouselBankHistoryCardProps>(
   ({ title, description, className }) => (
     <BlockWrapper className={className} defaultPadding="p-6xl">
       <Headline
-        headlineVersion="S"
+        headlineVersion="XS"
         title={title}
         description={description}
         align="text-left"

package/mobile/src/components/CarouselCard/CarouselCardContent.ts

@@ -1,13 +1,13 @@
-import type { ButtonCommonIconProps } from '../../model/Button';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { SizeVersion } from '../../model/SizeVersion';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Карточка карусели
  */
 export type CarouselCardContent = UniBlockContent &
-  HeadlineCommonProps &
-  ButtonCommonIconProps & {
+  HeadlineCommonProps & {
+    button?: ButtonContent;
     carouselVersion?: SizeVersion;
   };

package/mobile/src/components/CarouselCatalogCard/CarouselCatalogCard.tsx

@@ -19,20 +19,21 @@ const cardStyleMap: Record<ProductColorVersion, string> = {
 export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
   ({ className = '', title, description, image, price, button, colors, ...rest }) => (
     <BlockWrapper
-      className={style('flex flex-col justify-left gap-m', className)}
-      defaultPadding="p-6xl sm:p-7"
+      className={style('flex flex-col justify-left', className)}
+      defaultPadding="p-2xl"
       {...rest}
     >
-      {image?.src ? <Img className="flex justify-center" image={image} /> : null}
+      {image?.src ? <Img className="flex justify-center mb-xl" image={image} /> : null}
       <Headline
         title={title}
         description={description}
         headlineVersion="XS"
         isPadding={false}
         align="text-left"
+        className="mb-m"
       />
       {colors?.length ? (
-        <div className="flex text-secondary-text">
+        <div className="flex text-secondary-text mb-m">
           <div className="mr-xs">
             <Text size="text-s" align="text-left" font="font-light">
               Цвета:
@@ -46,7 +47,7 @@ export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
           {price}&nbsp;₽
         </Text>
       ) : null}
-      {renderButtonsSection([button], { buttonClassName: 'w-full' })}
+      {renderButtonsSection([button], { buttonClassName: 'w-full mt-lg' })}
     </BlockWrapper>
   ),
 );
@@ -55,6 +56,6 @@ const renderColorOption = (color: ProductColorVersion, i: number) => (
   <div
     role="figure"
     key={String(i)}
-    className={`w-6 h-6 ml-1 sm:ml-3 border border-solid border-main-divider rounded-full ${cardStyleMap[color]}`}
+    className={`w-6 h-6 ml-s border border-solid border-main-divider rounded-full ${cardStyleMap[color]}`}
   />
 );

package/mobile/src/components/CarouselCatalogCard/CarouselCatalogCardContent.ts

@@ -1,18 +1,18 @@
-import type { ButtonCommonIconProps } from '../../model/Button';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Карточка каталога
  */
 export type CarouselCatalogCardContent = UniBlockContent &
   HeadlineCommonProps &
-  ImageContent &
-  ButtonCommonIconProps & {
+  ImageContent & {
     /** @title Цена в рублях */
     price?: number;
     /** @title Доступные цвета */
     colors?: ProductColorVersion[];
+    button?: ButtonContent;
   };

package/mobile/src/components/CarouselCatalogCard/CatalogCard.ts

@@ -1,9 +1,9 @@
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const colors: ProductColorVersion[] = ['black', 'white'];
 
-const buttonPrimary: ButtonWithIconProps = {
+const buttonPrimary: ButtonContent = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',

package/mobile/src/components/CarouselProductCard/CarouselProductCardContent.ts

@@ -1,10 +1,10 @@
 import type { BulletsProps } from '../../model/Bullets';
-import type { ButtonCommonIconProps } from '../../model/Button';
 import type { AdditionalDescriptionProps, HeadlineSmallProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Элемент списка
@@ -21,7 +21,6 @@ export type CarouselProductCardContent = UniBlockContent &
   HeadlineSmallProps &
   AdditionalDescriptionProps &
   IconProps &
-  ButtonCommonIconProps &
   BulletsProps &
   LinkCommonProps & {
     /** @title Список */
@@ -33,4 +32,5 @@ export type CarouselProductCardContent = UniBlockContent &
     isTopPosition?: boolean;
     /** @title Кнопка по всей ширине */
     isButtonFullWidth?: boolean;
+    button?: ButtonContent;
   };

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -2,11 +2,11 @@ import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-export type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonProps;
+export type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonContent;
 
 /**
  * @title Карточка рекомендаций

package/mobile/src/components/CarouselTariffsCard/CarouselTariffsCardContent.ts

@@ -1,15 +1,10 @@
-import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
-import { AlignProps } from '../../model/HeadlineType';
+import type { AlignProps, HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonProps, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 export type TariffsCardCellProps = HeadlineCommonProps & {
-  /**
-   * @title Кнопка
-   * @maxItems 1
-   */
-  buttons?: ButtonWithIconProps[];
+  buttons?: ButtonContent[];
 };
 
 /**
@@ -22,7 +17,7 @@ export type CarouselTariffsCardContent = UniBlockContent &
     /** @title Выделить карточку */
     isHighlighting?: boolean;
     /** @title Кнопка */
-    button?: ButtonProps;
+    button?: ButtonContent;
     /** @title Ячейка */
     cardCells?: TariffsCardCellProps[];
   };

package/mobile/src/components/ContactsBlock/ContactsBlockContent.ts

@@ -1,6 +1,6 @@
 import type { AdditionalDescriptionProps, HeadlineCommonProps } 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 Элемент плитки
@@ -8,7 +8,7 @@ import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 export type ContactBlockProps = HeadlineCommonProps &
   AdditionalDescriptionProps & {
     /** @title Кнопка */
-    button?: ButtonProps;
+    button?: ButtonContent;
   };
 
 /**

package/mobile/src/components/ContentPage/ContentPage.tsx

@@ -2,20 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
-import { useBool } from '../../hooks/useBool';
-import { useLocation } from '../../hooks/useLocation';
-import { useSWRResource } from '../../hooks/useSWRResource';
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
-import { projectSettings } from '../../ProjectSettings';
 import { useBlockRouterProvider } from '../../services/BlockRouter/useBlockRouterProvider';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { CookiePopup } from '../../ui-kit/CookiePopup/CookiePopup';
-import { useDialogHandlers } from '../../ui-kit/Dialog/useDialogHandlers';
-import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
-import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
+import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { style } from '../../utils/style';
 import { LikeControl } from '../LikeControl/LikeControl';
 
@@ -37,60 +30,31 @@ export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>(
       parent: data,
     };
 
-    const sitemap = useSWRResource<SitemapData>(
-      projectSettings.SITEMAP || 'sitemap',
-      data?.fallback,
-    );
-    const [location, onChangeLocation] = useLocation(sitemap?.defaultLocation);
-
     useBlockRouterProvider();
-    const [isSomeDialogOpened, { setTrue: setSomeDialogOpened, setFalse: resetSomeDialogOpened }] =
-      useBool();
-
-    useDialogHandlers({
-      onOpen: setSomeDialogOpened,
-      onClose: resetSomeDialogOpened,
-    });
 
     return (
-      <section
-        className={style(
-          'relative @container',
-          pageStyle,
-          className,
-          isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
-        )}
-        data-theme={colorPalette}
-      >
-        {slots?.header ? (
-          <div className="relative z-10 mb-5 shadow-[0_8px_32px_0px_#00000014]">
-            {renderBlocksList(slots?.header, {
-              ...options,
-              slotName: 'header',
-              extraProps: { sitemap, location },
-            })}
+      <div>
+        <section
+          className={style('relative @container', pageStyle, className)}
+          data-theme={colorPalette}
+        >
+          {slots?.header ? (
+            <div className="relative z-10 mb-5 shadow-[0_8px_32px_0px_#00000014]">
+              {renderBlocksList(slots?.header, { ...options, slotName: 'header' })}
+            </div>
+          ) : null}
+          <div className="container @lg:grid @lg:grid-cols-12 @lg:gap-1">
+            {renderChildren({ block: data, options, extraProps: { className: 'scroll-mt-12' } })}
+            {renderBlocksList(slots?.footer, { ...options, slotName: 'footer' })}
           </div>
-        ) : null}
-        <div className="container @lg:grid @lg:grid-cols-12 @lg:gap-1">
-          {renderChildren({ block: data, options, extraProps: { className: 'scroll-mt-12' } })}
-          {renderBlocksList(slots?.footer, {
-            ...options,
-            slotName: 'footer',
-            extraProps: { sitemap, location },
-          })}
-        </div>
-        {likeControl ? renderLikeControl() : null}
+          {likeControl ? renderLikeControl() : null}
+        </section>
+        <DialogManager />
         <CookiePopup
           termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
           personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
         />
-        <SearchDialog topItems={sitemap?.topItems} />
-        <LocationDialog
-          currentLocation={location}
-          foreignOffices={sitemap?.foreignOffices}
-          onChangeLocation={onChangeLocation}
-        />
-      </section>
+      </div>
     );
   },
 );

package/mobile/src/components/ContentPage/computeAPIFallback.ts

@@ -8,26 +8,18 @@ interface FallbackData {
 
 export const computeAPIFallback = async (blocksRegistry: BlocksRegistry): Promise<Fallback> => {
   const blocksFallbackMap = await Promise.all(Object.keys(blocksRegistry).map(loadBlockFallback));
+
   const pageFallbackMap = getPageFallbackMap(blocksFallbackMap);
   const fallbackData = await Promise.allSettled(
-    Object.entries(pageFallbackMap).map(async ([key, fetcher]) => {
-      const data = await fetcher();
-
-      return { key, data };
-    }),
+    Object.entries(pageFallbackMap).map(async ([key, fetcher]) => ({ key, data: await fetcher() })),
   );
 
   return fallbackData
-    .filter((d): d is PromiseFulfilledResult<FallbackData> => d.status === 'fulfilled')
-    .reduce((res, item) => {
-      return {
-        ...res,
-        [item.value.key]: item.value.data,
-      };
-    }, {});
+    .filter((_): _ is PromiseFulfilledResult<FallbackData> => _.status === 'fulfilled')
+    .reduce((result, { value }) => ({ ...result, [value.key]: value.data }), {});
 };
 
-export async function loadBlockFallback(blockName: string): Promise<FallbackMap | undefined> {
+export const loadBlockFallback = async (blockName: string): Promise<FallbackMap | undefined> => {
   try {
     const blockFallback = await import(`../${blockName}/${blockName}.fallback`);
 
@@ -37,18 +29,9 @@ export async function loadBlockFallback(blockName: string): Promise<FallbackMap
   } catch (error) {
     return undefined;
   }
-}
-
-export function getPageFallbackMap(blocksFallbackMap: Array<FallbackMap | undefined>): FallbackMap {
-  return blocksFallbackMap
-    .filter((m): m is FallbackMap => Boolean(m))
-    .reduce((result, fallbackMap) => {
-      for (const [key, fetcher] of Object.entries(fallbackMap)) {
-        if (!result[key]) {
-          result[key] = fetcher;
-        }
-      }
+};
 
-      return result;
-    }, {});
-}
+export const getPageFallbackMap = (fallbackMap: Array<FallbackMap | undefined>): FallbackMap =>
+  fallbackMap
+    .filter((_): _ is FallbackMap => Boolean(_))
+    .reduce((result, _) => ({ ...result, ..._ }), {});