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

package/mobile/src/ui-kit/LocationDialog/renderForeignOffices.tsx

@@ -0,0 +1,37 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink';
+import type { ForeignOffice } from '../../services/sitemap/SitemapData';
+import { Img } from '../Img/Img';
+import { Text } from '../Text/Text';
+
+export const renderForeignOffices = (foreignOffices: ForeignOffice[] | undefined) =>
+  foreignOffices?.length ? (
+    <div className="border-t border-main-divider mt-2xs pt-2xs">
+      <div className="mb-m">
+        <Text size="text-m" font="font-light" color="text-secondary-text">
+          Представительства за рубежом:
+        </Text>
+      </div>
+      <div className="flex gap-10">
+        {foreignOffices.map((office, i: number) => (
+          <ForeignOffice key={String(i)} {...office} />
+        ))}
+      </div>
+    </div>
+  ) : null;
+
+const ForeignOffice = JSX<ForeignOffice>(({ icon, ...rest }) => {
+  const link = useLink();
+  const { text, target, href, onClick } = link(rest);
+
+  return (
+    <div className="flex gap-x-3">
+      {icon ? <Img pathPrefix="/wcms-resources/" image={icon} /> : null}
+      {text ? (
+        <a className="hover:text-primary-hover" href={href} target={target} onClick={onClick}>
+          {text}
+        </a>
+      ) : null}
+    </div>
+  );
+});

package/mobile/src/ui-kit/LocationDialog/renderRegion.tsx

@@ -0,0 +1,15 @@
+import type { Region } from '../../hooks/useRegions';
+
+export const renderRegion = (onChangeLocation?: (region: Region) => void) => (region: Region) =>
+  (
+    <div key={region.id} className="mb-2xs">
+      <button
+        className="cursor-pointer hover:text-primary-hover"
+        onClick={() => {
+          onChangeLocation && onChangeLocation(region);
+        }}
+      >
+        {region.name || ''}
+      </button>
+    </div>
+  );

package/mobile/src/ui-kit/LocationDialog/renderRegionGroup.tsx

@@ -0,0 +1,15 @@
+import type { Region } from '../../hooks/useRegions';
+import { Text } from '../Text/Text';
+import { renderRegion } from './renderRegion';
+
+export const renderRegionGroup =
+  (onChangeLocation?: (region: Region) => void) =>
+  ([letter, regions]: [string, Region[]]) =>
+    (
+      <div key={letter} className="break-inside-avoid mb-2xl w-56">
+        <div className="mb-s">
+          <Text size="text-h6">{letter}</Text>
+        </div>
+        {regions.map(renderRegion(onChangeLocation))}
+      </div>
+    );

package/mobile/src/ui-kit/LocationDialog/useLocationDialog.tsx

@@ -0,0 +1,11 @@
+import { DialogOptions, useDialogManager } from '../DialogManager/useDialogManager';
+import { LocationDialog } from './LocationDialog';
+
+export const useLocationDialog = () => {
+  const { open, close } = useDialogManager();
+
+  return {
+    open: (options: DialogOptions = {}) => open(<LocationDialog />, options),
+    close,
+  };
+};

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

@@ -1,10 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { CloseButton } from '../Dialog/CloseButton';
-import { useDialog } from '../Dialog/useDialog';
-import { useDialogHandlers } from '../Dialog/useDialogHandlers';
-import { SEARCH_DIALOG_ID } from '../SearchDialog/SearchDialog';
+import { CloseButton } from '../DialogManager/CloseButton';
 import { SearchInput } from '../SearchDialog/SearchInput';
+import { useSearchDialog } from '../SearchDialog/useSearchDialog';
 
 interface SearchBarProps {
   className?: string;
@@ -16,21 +14,22 @@ export const SearchBar = JSX<SearchBarProps>(({ className }) => {
   const [value, setValue] = useState('');
 
   const resetQueryOnDialogClose = useCallback(() => setValue(''), []);
-  useDialogHandlers({ onClose: resetQueryOnDialogClose });
-
-  const { open } = useDialog(SEARCH_DIALOG_ID);
-
-  const handleInitialInputChange = useCallback((_: string) => {
-    setValue(_);
-    if (isQueryLongEnough(_)) {
-      open(_);
-    }
-  }, []);
+  const { open } = useSearchDialog();
+
+  const handleInitialInputChange = useCallback(
+    (_: string) => {
+      setValue(_);
+      if (isQueryLongEnough(_)) {
+        open({ initialQuery: _ }, { onClose: resetQueryOnDialogClose });
+      }
+    },
+    [resetQueryOnDialogClose],
+  );
 
   return (
     <div className={className}>
       <SearchInput value={value} onChange={handleInitialInputChange} />
-      <CloseButton className="absolute top-2 right-3 sm:hidden" onClick={resetQueryOnDialogClose} />
+      <CloseButton className="absolute top-2 right-3 sm:hidden" onClose={resetQueryOnDialogClose} />
     </div>
   );
 });

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

@@ -3,27 +3,25 @@ import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import type { LinkProps } from '../../model/LinkProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
 import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
+import { useSitemap } from '../../services/sitemap/useSitemap';
 import { joinPath } from '../../utils/url';
 import { zip } from '../../utils/zip';
-import { Dialog } from '../Dialog/Dialog';
-import { useDialogProps } from '../Dialog/useDialogProps';
+import { Dialog } from '../DialogManager/Dialog';
 import { Sitemap } from '../Sitemap/Sitemap';
 import { SearchInput } from './SearchInput';
 
 export interface SearchDialogProps {
-  topItems?: TopMenuItemProps[];
+  initialQuery?: string;
 }
 
-export const SEARCH_DIALOG_ID = 'search';
-
-export const SearchDialog = JSX<SearchDialogProps>(({ topItems }) => {
-  const dialogProps = useDialogProps(SEARCH_DIALOG_ID);
+export const SearchDialog = JSX<SearchDialogProps>(({ 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(
@@ -34,7 +32,7 @@ export const SearchDialog = JSX<SearchDialogProps>(({ topItems }) => {
   useEffect(() => printSearchItems(searchItems), [searchItems]); // Temp
 
   return (
-    <Dialog {...dialogProps} head={<SearchInput autoFocus={true} {...searchInputProps} />}>
+    <Dialog head={<SearchInput autoFocus={true} {...searchInputProps} />}>
       <Sitemap topItems={searchItems} />
     </Dialog>
   );

package/mobile/src/ui-kit/SearchDialog/useSearchDialog.tsx

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

package/mobile/src/ui-kit/SwipeListControl/SwipeListContainer.tsx

@@ -26,7 +26,7 @@ interface SwipeListContainerProps extends SwipeListContainerContent {
   onVisibleIndicesChange?: (indices: number[]) => void;
 }
 
-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<SwipeListContainerProps>(
   ({

package/package.json

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

package/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/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/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/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/src/components/BusinessBlock/BusinessBlock.fixture.tsx

@@ -1,14 +1,13 @@
 import '../../setup-fixture';
-
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { BusinessBlock } from './BusinessBlock';
 import type {
   BusinessBlockContent,
   BusinessCardItemProps,
   BusinessCardProps,
 } from './BusinessBlockContent';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-const button: ButtonWithIconProps = {
+const button: ButtonContent = {
   href: '#',
   text: 'Подробнее',
   target: '_blank',

package/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/src/components/ButtonsBlock/ButtonsBlock.fixture.mobile.tsx

@@ -1,8 +1,8 @@
 import '../../setup-fixture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ButtonsBlock } from './ButtonsBlock';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: '/credit-cards',
     text: 'Оформить',

package/src/components/ButtonsBlock/ButtonsBlock.fixture.tsx

@@ -1,8 +1,8 @@
 import '../../setup-fixture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ButtonsBlock } from './ButtonsBlock';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: '/credit-cards',
     text: 'Оформить',

package/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/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/src/components/Calculator/Calculator.fixture.tsx

@@ -1,7 +1,7 @@
 import '../../setup-fixture';
 
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Calculator } from './Calculator';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import type {
   BonusCalculatorParamsDef,
   BusinessDepositCalculatorParamsDef,
@@ -10,7 +10,7 @@ import type {
   RefinancingCalculatorParamsDef,
 } from './CalculatorContent';
 
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Отправить заявку',

package/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/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/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.mobile.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/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/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/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/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/src/components/CarouselProductCard/CarouselProductCard.fixture.tsx

@@ -1,9 +1,9 @@
 import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselProductCard } from './CarouselProductCard';
 import type { CarouselProductCardContent } from './CarouselProductCardContent';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const isDotted = false;
 
@@ -17,14 +17,14 @@ const image: Picture = {
   title: 'money',
 };
 
-const buttonPrimary: ButtonWithIconProps = {
+const buttonPrimary: ButtonContent = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',
   version: 'secondary',
 };
 
-const buttonPrimaryIcon: ButtonWithIconProps = {
+const buttonPrimaryIcon: ButtonContent = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',

package/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/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/src/components/CarouselTariffsCard/CarouselTariffsCard.fixture.mobile.tsx

@@ -1,9 +1,10 @@
 import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
-import type { ButtonProps, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselTariffsCard } from './CarouselTariffsCard';
 import type { CarouselTariffsCardContent } from './CarouselTariffsCardContent';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const imageMonth: Picture = {
   src: 'monthly-payment.png',
@@ -29,7 +30,7 @@ const buttonSecondary: ButtonProps = {
   version: 'secondary',
 };
 
-const buttonIcon: ButtonWithIconProps = {
+const buttonIcon: ButtonContent = {
   text: 'App Store',
   icon: { icon: 'DocIconMonoColor', iconVersion: 'color' },
   href: 'rshb.ru',