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

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/CarouselLinks/CarouselLinks.tsx

@@ -3,18 +3,29 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
-import { style } from '../../utils/style';
 import { Carousel } from '../Carousel/Carousel';
 import { Headline } from '../Headline/Headline';
 import type { CarouselLinksContent } from './CarouselLinksContent';
+import { style } from '../../utils/style';
 
-export interface CarouselLinksProps extends CarouselLinksContent, UniBlockProps {}
-
-const MAX_LINKS_COUNT = 10;
+export interface CarouselLinksProps extends CarouselLinksContent, UniBlockProps {
+  maxLinksCount?: number;
+}
 
 export const CarouselLinks = JSX<CarouselLinksProps>(
-  ({ className, additionalDescription, description, links, title, ...rest }) => (
-    <BlockWrapper className={style('flex w-full overflow-hidden', className)} {...rest}>
+  ({
+    className,
+    additionalDescription,
+    description,
+    links,
+    title,
+    maxLinksCount = 10,
+    ...rest
+  }) => (
+    <BlockWrapper
+      className={style('flex flex-col sm:flex-row w-full overflow-hidden', className)}
+      {...rest}
+    >
       <div className="mr-xl flex-auto">
         <Headline
           isPadding={false}
@@ -32,18 +43,18 @@ export const CarouselLinks = JSX<CarouselLinksProps>(
           />
         ) : null}
       </div>
-      {links?.length ? renderLinks(links) : null}
+      {links?.length ? renderLinks(links, maxLinksCount) : null}
     </BlockWrapper>
   ),
 );
 
-const renderLinks = (links: LinkProps[]) => {
-  const itemCount = Math.ceil(links.length / MAX_LINKS_COUNT);
+const renderLinks = (links: LinkProps[], maxLinksCount: number) => {
+  const itemCount = Math.ceil(links.length / maxLinksCount);
 
   return (
     <Carousel
-      className="min-w-[832px] w-[832px]"
-      version=""
+      className="sm:w-2/3 w-full p-0 sm:p-2xl"
+      version="secondary"
       itemCount={itemCount}
       arrowsPadded={false}
       showDots={true}
@@ -51,12 +62,12 @@ const renderLinks = (links: LinkProps[]) => {
       {new Array(itemCount).fill(null).map((_, groupIndex) => (
         <div
           key={String(groupIndex)}
-          className="w-[672px] min-w-[672px] ml-10 mr-10 flex flex-wrap self-start"
+          className={style('flex flex-wrap self-start sm:w-[672px] w-full sm:mx-5xl')}
         >
           {links
-            .slice(groupIndex * MAX_LINKS_COUNT, (groupIndex + 1) * MAX_LINKS_COUNT)
+            .slice(groupIndex * maxLinksCount, (groupIndex + 1) * maxLinksCount)
             .map((link, index) => (
-              <LinkButton key={String(index)} className="m-1" {...link} />
+              <LinkButton key={String(index)} className="sm:m-2xs" {...link} />
             ))}
         </div>
       ))}

package/mobile/src/components/CarouselLinks/CarouselLinksContent.ts

@@ -8,4 +8,6 @@ export type CarouselLinksContent = UniBlockContent &
   AdditionalDescriptionProps & {
     /** @title Ссылки */
     links?: LinkProps[];
+    /** @title Отступы вложенных компонентов */
+    isInnerPadding?: boolean;
   };

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',
-          pageStyle,
-          className,
-          isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
-        )}
-        data-theme={colorPalette}
-      >
-        {slots?.header ? (
-          <div className="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 grid grid-cols-12 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, ..._ }), {});

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/Contacts.tsx

@@ -2,45 +2,41 @@ import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
 import { Text } from '../../ui-kit/Text/Text';
 import type { ContactGroup, ContactInfo } from './FooterContent';
-import { style } from '../../utils/style';
 
 export interface ContactsProps {
   className?: string;
   items?: ContactGroup[];
-  hasButton?: boolean;
 }
 
-export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton }) => (
-  <div className={style('space-y-xl', className)}>
+export const Contacts = JSX<ContactsProps>(({ className = '', items }) => (
+  <div className={className}>
     {items?.length ? items.map(renderContactsGroup) : null}
-    {hasButton ? (
-      <Button
-        version="primary"
-        className="mb-6 w-full"
-        href="https://www.rshb.ru/feedback/question/"
-        target="_blank"
-        ariaLabel="Обратная связь"
-        text="Обратная связь"
-      />
-    ) : null}
+    <Button
+      version="primary"
+      className="w-full"
+      href="https://www.rshb.ru/feedback/question/"
+      target="_blank"
+      ariaLabel="Обратная связь"
+      text="Обратная связь"
+    />
   </div>
 ));
 
 const renderContactsGroup = (item: ContactGroup, i: number) => (
-  <div className="space-y-m" key={String(i)}>
-    <div className="">
+  <div className="mb-m" key={String(i)}>
+    <div className="mb-m">
       <Text size="text-l" font="font-medium">
         {item?.title}
       </Text>
     </div>
-    <div className="space-y-m">{item.items?.map(renderContact)}</div>
+    <div>{item.items?.map(renderContact)}</div>
   </div>
 );
 
 const renderContact = (item: ContactInfo, index: number) => (
-  <div className="space-y-2xs" key={String(index)}>
+  <div className="mb-m" key={String(index)}>
     <div>{renderText(item.type, item.text)}</div>
-    <div className="text-s font-light text-secondary-text">{item.description}</div>
+    <div className="mt-2xs text-s font-light text-secondary-text">{item.description}</div>
   </div>
 );
 

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';
@@ -14,31 +16,43 @@ import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
 
-export const Footer = JSX<FooterProps>(({ className, sitemap, ...rest }) => {
-  const { relatedEnterprises, contacts, socialMedia, mobileApps, horizontalNavigationTitle } =
-    useSWRResource<FooterDataProps>(
-      projectSettings.FOOTER || 'footer',
-      rest.options?.page?.fallback,
-    );
+export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
+  const fallback = rest.options?.page?.fallback;
+  const { topItems } = useSitemap(fallback);
+  const {
+    relatedEnterprises,
+    contacts,
+    socialMedia,
+    mobileApps,
+    horizontalNavigationTitle,
+    documents,
+  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
 
   return (
-    <BlockWrapper tag="footer" className={className} defaultPadding="px-4 py-6" {...rest}>
-      <div className="mb-4 pb-5 border-b border-main-divider">
-        {sitemap?.topItems?.map((item, i) => (
+    <BlockWrapper tag="footer" className={className} {...rest}>
+      <div className="mb-lg pb-xs border-b border-main-divider">
+        {topItems?.map((item, i) => (
           <RollupItem key={String(i)} label={item?.text} labelIcon={item?.icon}>
-            <LinkList items={item.items} className="my-3" />
+            <LinkList items={item.items} />
           </RollupItem>
         ))}
       </div>
       <Contacts className="overflow-hidden" items={contacts} />
-      <SocialMedia className="mb-4" media={socialMedia} />
-      {mobileApps?.map(renderButton)}
+      <div className="mt-xl">
+        <SocialMedia className="mb-xl" media={socialMedia} buttonSize="stretched">
+          Соцсети
+        </SocialMedia>
+        <Text size="text-s" font="font-light" color="text-secondary-text">
+          Мобильное приложение
+        </Text>
+        <div className="mt-xs">{mobileApps?.map(renderButton)}</div>
+      </div>
       <HorizontalNavigation
-        className="pt-m pb-2xl border-y border-main-divider"
+        className="py-lg border-y border-main-divider"
         title={horizontalNavigationTitle}
         links={relatedEnterprises}
       />
-      <TextInformation />
+      <TextInformation links={documents} />
     </BlockWrapper>
   );
 });
@@ -49,7 +63,7 @@ const renderButton = ({ href = '/' }: LinkCommonProps, i: number) => {
   return (
     <Button
       key={String(i)}
-      className="w-full mb-4"
+      className="w-full mb-lg"
       text={label}
       version="secondary"
       href={href}

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 {}