@redneckz/wildless-cms-uni-blocks 0.9.10 → 0.9.12

package/src/components/Calculator/renderMonthsInput.tsx

@@ -1,3 +1,4 @@
+import { InputListRange } from '../../ui-kit/InputListRange/InputListRange';
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
 import { clamp } from '../../utils/clamp';
 
@@ -7,6 +8,7 @@ interface RenderMonthsInputParams {
   minMonths: number;
   maxMonths: number;
   monthsValue: number;
+  availableMonths?: Array<number>;
 }
 
 export function renderMonthsInput(
@@ -14,14 +16,23 @@ export function renderMonthsInput(
   params: RenderMonthsInputParams,
   callback?: (value: number) => void,
 ) {
-  const { minMonths, maxMonths, monthsValue } = params;
+  const { minMonths, maxMonths, monthsValue, availableMonths } = params;
   const monthText = (month: number) => {
     const text = Number(month) % 10 === 1 ? 'месяца' : 'месяцев';
 
     return `${month} ${text}`;
   };
 
-  return (
+  return availableMonths?.length ? (
+    <InputListRange
+      className="mt-7"
+      title={title}
+      items={[`От ${monthText(minMonths)}`, `До ${monthText(maxMonths)}`]}
+      list={availableMonths}
+      value={clamp(monthsValue, minMonths, maxMonths)}
+      onChange={callback}
+    />
+  ) : (
     <InputRange
       className="mt-7"
       title={title}

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -41,14 +41,13 @@ export const useCreditCalculatorParams = (
 ): CreditCalculatorParams => {
   const { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
+  const isExcludeSalaryClient = !paramsViewSettings?.isShowSalaryClient;
+  const isExcludeStateEmployee = !paramsViewSettings?.isShowStateEmployee;
+  const isExcludePensionClient = !paramsViewSettings?.isShowPensionClient;
+  const isExcludeInsurance = !paramsViewSettings?.isShowInsurance;
   const creditCalculatorSourceBookParams =
-    data?.rows?.find((row) => {
-      const isExcludeSalaryClient = !paramsViewSettings?.isShowSalaryClient;
-      const isExcludeStateEmployee = !paramsViewSettings?.isShowStateEmployee;
-      const isExcludePensionClient = !paramsViewSettings?.isShowPensionClient;
-      const isExcludeInsurance = !paramsViewSettings?.isShowInsurance;
-
-      return (
+    data?.rows?.find(
+      (row) =>
         checkRowByParam({
           row,
           userInputParams,
@@ -74,9 +73,8 @@ export const useCreditCalculatorParams = (
           isExclude: isExcludeInsurance,
         }) &&
         checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row)
-      );
-    }) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
+    ) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
   const { rate } = creditCalculatorSourceBookParams;
   const monthlyPayment = getMonthlyPayment(rate, userInputParams);

package/src/components/Calculator/useDepositCalculatorParams.ts

@@ -1,3 +1,6 @@
+import { arrayByRange } from '../../utils/arrayByRange';
+import { mergeIntervals } from '../../utils/mergeIntervals';
+import { DepositCalculatorParamsViewSettings } from './CalculatorContent';
 import { DEFAULT_DEPOSIT_CALCULATOR_PARAMS, DEPOSIT_CALC_DEFAULT_DIR } from './constants';
 import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
@@ -23,6 +26,7 @@ export interface DepositCalculatorUserInputParams extends CommonDepositParams {
 export interface DepositCalculatorParams
   extends DepositCalculatorSourceBookParams,
     DepositCalculatorUserInputParams {
+  availableMonths: number[];
   income: number;
   finalSum: number;
 }
@@ -34,21 +38,31 @@ export type DepositCalculatorData = {
 export const useDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
   sourceBookDir?: string,
+  paramsViewSettings?: DepositCalculatorParamsViewSettings,
 ): DepositCalculatorParams => {
-  const { isMonthlyInterestPayment, isRemoteRegistration, moneyValue, monthsValue } =
-    userInputParams;
-
+  const { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
   );
-
+  const isExcludeMonthlyInterestPayment = !paramsViewSettings?.isShowMonthlyInterestPayment;
+  const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
   const depositCalculatorSourceBookParams =
     data?.rows?.find(
-      (_) =>
-        isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
-        isRemoteRegistration === _.isRemoteRegistration &&
-        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
-        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _),
+      (row) =>
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isMonthlyInterestPayment',
+          isExclude: isExcludeMonthlyInterestPayment,
+        }) &&
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isRemoteRegistration',
+          isExclude: isExcludeRemoteRegistration,
+        }) &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
     ) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
 
   const { rate } = depositCalculatorSourceBookParams;
@@ -60,6 +74,9 @@ export const useDepositCalculatorParams = (
     ...depositCalculatorSourceBookParams,
     ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
     ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
+    availableMonths: mergeIntervals(
+      sourceBookRows.map((row) => [row['minMonths'], row['maxMonths']]),
+    ).flatMap(([start, end]) => arrayByRange(start, end)),
     ...userInputParams,
     income,
     finalSum,
@@ -78,3 +95,13 @@ const getDepositIncome = (rate: number, userInputParams: DepositCalculatorUserIn
     return Math.round((moneyValue * rate * 30 * monthsValue) / 365 / 100);
   }
 };
+
+interface CheckRowByParamProps {
+  row: DepositCalculatorSourceBookParams;
+  userInputParams: DepositCalculatorUserInputParams;
+  paramKey: string;
+  isExclude: boolean;
+}
+
+const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }: CheckRowByParamProps) =>
+  isExclude || userInputParams[paramKey] === row[paramKey];

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.example.json

@@ -27,8 +27,7 @@
         "target": "_blank",
         "version": "gray",
         "rounded": false,
-        "aboveText": "Доступно в",
-        "text": "Telegram"
+        "text": "Текст"
       }
     ],
     "version": "primary"

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.fixture.tsx

@@ -1,6 +1,5 @@
 import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
-import { Icon } from '../../ui-kit/Icon/Icon';
 import { CarouselRecommendationCard } from './CarouselRecommendationCard';
 import type {
   CarouselRecommendationCardContent,
@@ -17,8 +16,6 @@ const icon: Picture = {
   title: 'product-basket',
 };
 
-const appendLeft = <Icon name="PlayMarketIcon" iconVersion="color" width="24" height="24" asSVG />;
-
 const commonProps: RecommendationSocialMedia = {
   target: '_blank',
   version: 'gray',
@@ -28,23 +25,17 @@ const commonProps: RecommendationSocialMedia = {
 const socialMediaWithText: RecommendationSocialMedia[] = [
   {
     href: 'https://t.me',
-    aboveText: 'Доступно в',
     text: 'Telegram',
-    appendLeft,
     ...commonProps,
   },
   {
     href: 'https://vk.com',
-    aboveText: 'Доступно в',
     text: 'Telegram',
-    appendLeft,
     ...commonProps,
   },
   {
     href: 'https://ok.ru',
-    aboveText: 'Доступно в',
     text: 'Telegram',
-    appendLeft,
     ...commonProps,
   },
 ];

package/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -1,18 +1,12 @@
-import type { ButtonVersion } from '../../model/ButtonVersion';
 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 { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
-export type RecommendationSocialMedia = LinkCommonProps &
-  IconProps &
-  ButtonWithIconProps & {
-    version: ButtonVersion;
-    rounded?: boolean;
-  };
+export type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonProps;
 
 /**
  * @title Карточка рекомендаций

package/src/components/Filtration/Filtration.example.json

@@ -3,35 +3,55 @@
     "filtrationSchema": {
       "propertyType": {
         "title": "Тип недвижимости",
-        "type": "string",
-        "enum": ["flat", "apartment", "house", "storeRoom", "parkingSpace"],
-        "enumNames": ["Квартира", "Апартаменты", "Жилой дом", "Кладовая", "Машино-место"]
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["flat", "apartment", "house", "storeRoom", "parkingSpace"],
+          "enumNames": ["Квартира", "Апартаменты", "Жилой дом", "Кладовая", "Машино-место"]
+        }
       },
       "stage": {
         "title": "Этап строительства",
-        "type": "string",
-        "enum": ["built", "inProgress"],
-        "enumNames": ["Готовое жильё", "Строящиеся"]
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["built", "inProgress"],
+          "enumNames": ["Готовое жильё", "Строящиеся"]
+        }
       },
       "categories": {
         "title": "Категории",
-        "type": "string",
-        "enum": ["salaryClient", "IT", "youngFamily", "military", "medicalWorker", "scientist"],
-        "enumNames": [
-          "Зарплатный клиент",
-          "IT-специалист",
-          "Молодая семья",
-          "Военнослужащий",
-          "Медицинский работник",
-          "Научный сотрудник"
-        ]
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["salaryClient", "IT", "youngFamily", "military", "medicalWorker", "scientist"],
+          "enumNames": [
+            "Зарплатный клиент",
+            "IT-специалист",
+            "Молодая семья",
+            "Военнослужащий",
+            "Медицинский работник",
+            "Научный сотрудник"
+          ]
+        }
       },
       "extraOptions": {
         "title": "Дополнительно",
-        "type": "string",
-        "enum": ["preferentialMortgage", "children"],
-        "enumNames": ["Льготная ипотека", "Дети"]
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["preferentialMortgage", "children"],
+          "enumNames": ["Льготная ипотека", "Дети"]
+        }
       }
+    },
+    "resetButton": {
+      "text": "Очистить фильтры",
+      "version": "secondary"
+    },
+    "notFound": {
+      "title": "Нет подходящей ипотечной программы",
+      "description": "Попробуйте очистить фильтры"
     }
   }
 }

package/src/components/Filtration/Filtration.fixture.tsx

@@ -49,34 +49,46 @@ const generateBlock = (...presets: any[]) => ({
 const SCHEMA: FiltrationContent['filtrationSchema'] = {
   propertyType: {
     title: 'Тип недвижимости',
-    type: 'string',
-    enum: ['flat', 'apartment', 'house', 'storeRoom', 'parkingSpace'],
-    enumNames: ['Квартира', 'Апартаменты', 'Жилой дом', 'Кладовая', 'Машино-место'],
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['flat', 'apartment', 'house', 'storeRoom', 'parkingSpace'],
+      enumNames: ['Квартира', 'Апартаменты', 'Жилой дом', 'Кладовая', 'Машино-место'],
+    },
   },
   stage: {
     title: 'Этап строительства',
-    type: 'string',
-    enum: ['built', 'inProgress'],
-    enumNames: ['Готовое жильё', 'Строящиеся'],
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['built', 'inProgress'],
+      enumNames: ['Готовое жильё', 'Строящиеся'],
+    },
   },
   categories: {
     title: 'Категории',
-    type: 'string',
-    enum: ['salaryClient', 'IT', 'youngFamily', 'military', 'medicalWorker', 'scientist'],
-    enumNames: [
-      'Зарплатный клиент',
-      'IT-специалист',
-      'Молодая семья',
-      'Военнослужащий',
-      'Медицинский работник',
-      'Научный сотрудник',
-    ],
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['salaryClient', 'IT', 'youngFamily', 'military', 'medicalWorker', 'scientist'],
+      enumNames: [
+        'Зарплатный клиент',
+        'IT-специалист',
+        'Молодая семья',
+        'Военнослужащий',
+        'Медицинский работник',
+        'Научный сотрудник',
+      ],
+    },
   },
   extraOptions: {
     title: 'Дополнительно',
-    type: 'string',
-    enum: ['preferentialMortgage', 'children'],
-    enumNames: ['Льготная ипотека', 'Дети'],
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['preferentialMortgage', 'children'],
+      enumNames: ['Льготная ипотека', 'Дети'],
+    },
   },
 };
 
@@ -92,7 +104,11 @@ export default {
         label="Другие ипотечные программы"
         filtrationSchema={SCHEMA}
         topItemsCount={2}
-        resetButton={{ text: 'Очистить фильтры', buttonVersion: 'secondary' }}
+        resetButton={{ text: 'Очистить фильтры', version: 'secondary' }}
+        notFound={{
+          title: 'Нет подходящей ипотечной программы',
+          description: 'Попробуйте очистить фильтры',
+        }}
         block={{
           type: 'Filtration',
           blocks: [

package/src/components/Filtration/Filtration.tsx

@@ -15,19 +15,14 @@ export const Filtration: JSXBlock<FiltrationProps> = JSX<FiltrationProps>(
     const { formState, register, resetForm } = useForm();
 
     return (
-      <BlockWrapper className={style('p-9', className)} {...rest}>
-        <form className="flex justify-between">
+      <BlockWrapper className={style(className)} version="transparent" {...rest}>
+        <form className="flex justify-between bg-white p-9 mb-1">
           <div className="flex gap-11">
             {Object.keys(filtrationSchema).map(renderFormItem(filtrationSchema, register))}
           </div>
           {resetButton ? (
             <div>
-              <Button
-                className="w-72"
-                text={resetButton.text}
-                version={resetButton.buttonVersion}
-                onClick={resetForm}
-              />
+              <Button className="w-72" onClick={resetForm} {...resetButton} />
             </div>
           ) : null}
         </form>

package/src/components/Filtration/FiltrationContent.ts

@@ -1,4 +1,5 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Заголовок
@@ -33,6 +34,7 @@ export type StringArray = {
    * @hidden
    */
   type?: 'array';
+  /** @title */
   items?: {
     /**
      * @default string
@@ -47,13 +49,13 @@ export type StringArray = {
 // TODO: Make customizable to implement arbitrary filtration blocks
 export type FiltrationSchema = {
   /** @title Тип недвижимости */
-  propertyType?: StringEnum;
+  propertyType?: StringArray;
   /** @title Этап строительства */
-  stage?: StringEnum;
+  stage?: StringArray;
   /** @title Категории */
-  categories?: StringEnum;
+  categories?: StringArray;
   /** @title Дополнительно */
-  extraOptions?: StringEnum;
+  extraOptions?: StringArray;
 };
 
 /**
@@ -67,14 +69,24 @@ export type ResetButton = {
   /**
    * @title Цвет кнопки
    */
-  buttonVersion: ButtonVersion;
+  version: ButtonVersion;
 };
 
+/**
+ * @title Плитка "Не найдено"
+ */
+export type NotFound = TitleProps & DescriptionProps;
+
 export interface FiltrationInnerContent {
-  /** @title Название кнопки */
+  /** @title Название сворачивающейся кнопки */
   label?: string;
-  /** @title Количество отображаемых предметов */
+  /**
+   * @title Количество отображаемых предметов
+   * @minimum 1
+   */
   topItemsCount?: number;
+  resetButton?: ResetButton;
+  notFound?: NotFound;
 }
 
 /**
@@ -83,5 +95,4 @@ export interface FiltrationInnerContent {
 export interface FiltrationContent extends FiltrationInnerContent {
   /** @title Параметры фильтрации */
   filtrationSchema?: FiltrationSchema;
-  resetButton?: ResetButton;
 }

package/src/components/Filtration/FiltrationInner.tsx

@@ -5,10 +5,11 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
+import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
-import { ErrorBlock } from '../ErrorBlock/ErrorBlock';
 import { checkShouldRenderBlock } from './checkShouldRenderBlock';
-import type { FiltrationInnerContent } from './FiltrationContent';
+import type { FiltrationInnerContent, NotFound } from './FiltrationContent';
 
 const ICONS: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
 
@@ -19,7 +20,7 @@ interface FiltrationInnerProps extends FiltrationInnerContent, UniBlockProps {
 }
 
 export const FiltrationInner = JSX<FiltrationInnerProps>(
-  ({ label = '', filtrationState = {}, topItemsCount = 0, block, ...rest }) => {
+  ({ label = '', filtrationState = {}, topItemsCount = 0, block, notFound, ...rest }) => {
     const blocksToRender =
       block?.blocks?.filter((b) => checkShouldRenderBlock(filtrationState, b.content || {})) || [];
 
@@ -30,28 +31,27 @@ export const FiltrationInner = JSX<FiltrationInnerProps>(
 
     return (
       <div>
-        <div className={style(blocksToRender.length ? 'hidden' : '')}>
-          <ErrorBlock
-            error={{ errorContentType: 'Image' }}
-            title="Нет подходящей ипотечной программы"
-            subtitle="Попробуйте очистить фильтры"
-          />
+        <div className={style(blocksToRender.length ? 'hidden' : 'block')}>
+          {notFound ? renderNotFound(notFound) : null}
         </div>
         <div className={style(blocksToRender.length ? '' : 'hidden')}>
-          <div className={resultsGridStyle}>
+          <div className={style('mb-1', resultsGridStyle)}>
             {renderBlocksList(visibleBlocks, { ...rest.options, parent: block })}
           </div>
           <Foldable
             renderFoldableSection={({ isUnfolded }) => {
               return (
-                <FoldableSection className={resultsGridStyle} isUnfolded={isUnfolded}>
+                <FoldableSection
+                  className={style(resultsGridStyle, isUnfolded ? 'mb-1' : '')}
+                  isUnfolded={isUnfolded}
+                >
                   {renderBlocksList(hiddenBlocks, { ...rest.options, parent: block })}
                 </FoldableSection>
               );
             }}
             renderFoldButton={({ isUnfolded, onToggle }) => (
               <DefaultFoldButton
-                className={style('mt-11', topItemsCount < 1 ? 'hidden' : '')}
+                className={style(topItemsCount < 1 ? 'hidden' : '')}
                 disabled={!hiddenBlocks?.length}
                 label={label}
                 icon={ICONS[Number(isUnfolded)]}
@@ -65,3 +65,22 @@ export const FiltrationInner = JSX<FiltrationInnerProps>(
     );
   },
 );
+
+function renderNotFound({ title, description }: NotFound) {
+  return (
+    <div className="bg-white py-20">
+      {title ? (
+        <div className="mb-2">
+          <Paragraph align="text-center">
+            <Text size="text-h4">{title}</Text>
+          </Paragraph>
+        </div>
+      ) : null}
+      {description ? (
+        <Paragraph size="text-xl" font="font-light" align="text-center">
+          {description}
+        </Paragraph>
+      ) : null}
+    </div>
+  );
+}

package/src/components/Filtration/renderFormItem.tsx

@@ -1,7 +1,7 @@
 import type { FormElementRegisterer } from '../../hooks/useForm';
 import { SlideCheckboxGroup } from '../../ui-kit/SlideCheckboxGroup/SlideCheckboxGroup';
 import { Text } from '../../ui-kit/Text/Text';
-import type { FiltrationSchema, StringEnum } from './FiltrationContent';
+import type { FiltrationSchema, StringArray } from './FiltrationContent';
 
 export const renderFormItem =
   (filtrationSchema: FiltrationSchema, register: FormElementRegisterer) => (key: string) => {
@@ -9,28 +9,28 @@ export const renderFormItem =
     const type = item?.type;
 
     switch (type) {
-      case 'string':
-        return renderRadioButtons(key, register)(item);
+      case 'array':
+        return renderCheckboxes(key, register)(item);
       default:
         return null;
     }
   };
 
-const renderRadioButtons =
-  (key: string, register: FormElementRegisterer) => (item?: StringEnum) => {
-    const options =
-      item?.enum?.map((e, i) => ({ value: e, title: item?.enumNames?.[i] || '' })) || [];
+const renderCheckboxes = (key: string, register: FormElementRegisterer) => (item?: StringArray) => {
+  const options =
+    item?.items?.enum?.map((e, i) => ({ value: e, title: item?.items?.enumNames?.[i] || '' })) ||
+    [];
 
-    return (
-      <div role="radiogroup" key={key}>
-        {item?.title ? (
-          <div className="mb-4">
-            <Text size="text-m" font="font-light" color="text-secondary-text">
-              {item.title}
-            </Text>
-          </div>
-        ) : null}
-        <SlideCheckboxGroup items={options} multiple={false} {...register(key)} />
-      </div>
-    );
-  };
+  return (
+    <div key={key}>
+      {item?.title ? (
+        <div className="mb-4">
+          <Text size="text-m" font="font-light" color="text-secondary-text">
+            {item.title}
+          </Text>
+        </div>
+      ) : null}
+      <SlideCheckboxGroup items={options} multiple {...register(key)} />
+    </div>
+  );
+};

package/src/components/Footer/MediaButton.tsx

@@ -1,8 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { IconVersion } from '../../model/IconVersion';
-import type { Picture } from '../../model/Picture';
+import type { IconProps, Picture } from '../../model/Picture';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
 import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { style } from '../../utils/style';
@@ -46,8 +45,7 @@ const ICONS_MAP: Array<{
 
 export type ButtonSize = 'default' | 'small';
 
-interface MediaButtonProps extends ButtonWithIconProps {
-  iconVersion?: IconVersion;
+interface MediaButtonProps extends ButtonProps, IconProps {
   buttonSize?: ButtonSize;
 }
 

package/src/components/RichTextBlock/RichTextBlock.example.json

@@ -1,5 +1,5 @@
 {
   "content": {
-    "__html": "<p class=\"h1\">Заголовок 1</p>\n<p class=\"h2\">Заголовок 2</p>\n<p class=\"h3\">Заголовок 3</p>\n<p class=\"h4\">Заголовок 4</p>\n<p class=\"h5\">Заголовок 5</p>\n<p class=\"h6\">Заголовок 6</p>\n<p>Параграф, в котором много текста и даже <a href=\"#\">ссылка</a></p>\n<p><strong>Жирный текст</strong>, <em>Наклонный текст</em></p>\n<ul>\n  <li>Список с точками</li>\n  <li>Список с точками</li>\n</ul>\n<ol>\n  <li>Нумерованный список</li>\n  <li>Нумерованный список</li>\n</ol>\n"
+    "__html": "<h1>Заголовок 1</h1>\n<h2>Заголовок 2</h2>\n<h3>Заголовок 3</h3>\n<h4>Заголовок 4</h4>\n<h5>Заголовок 5</h5>\n<h6>Заголовок 6</h6>\n<p>Параграф, в котором много текста и даже <a href=\"#\">ссылка</a></p>\n<p><strong>Жирный текст</strong>, <em>Наклонный текст</em></p>\n<ul>\n  <li>Список с точками</li>\n  <li>Список с точками</li>\n</ul>\n<ol>\n  <li>Нумерованный список</li>\n  <li>Нумерованный список</li>\n</ol>\n"
   }
 }