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

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

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

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

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

package/mobile/src/components/MobileAppTile/MobileAppTile.tsx

@@ -50,6 +50,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
               />
             ) : null
           }
+          rightImage={image?.src ? <Img className="hidden lg:block" image={image} /> : null}
           buttons={renderButtonsSection(buttons, { isVertical: buttons.length > 4 })}
         >
           {renderDescription(description)}
@@ -60,7 +61,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
               </div>
             ) : null}
             {renderList(items)}
-            {image?.src ? <Img image={image} /> : null}
+            {image?.src ? <Img className="lg:hidden" image={image} /> : null}
           </div>
         </BaseTile>
       </BlockWrapper>

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

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

package/mobile/src/components/MortgageFiltration/HotFilterRecord.ts

@@ -0,0 +1,14 @@
+import { arrCmp, combineBoolCmps, objCmp, scalarCmp } from '../../utils/BoolComparator';
+
+export type HotFilterRecord = {
+  /** @title Тип недвижимости */
+  propertyType?: string[];
+  /** @title Этап строительства */
+  stage?: string[];
+  /** @title Категории */
+  categories?: string[];
+  /** @title Дополнительно */
+  extraOptions?: string[];
+};
+
+export const hotFilterRecordCmp = objCmp<string[]>(combineBoolCmps(scalarCmp, arrCmp()));

package/mobile/src/components/MortgageFiltration/MortgageFiltration.example.json

@@ -6,8 +6,15 @@
         "type": "array",
         "items": {
           "type": "string",
-          "enum": ["flat", "apartment", "house", "storeRoom", "parkingSpace"],
-          "enumNames": ["Квартира", "Апартаменты", "Жилой дом", "Кладовая", "Машино-место"]
+          "enum": ["flat", "apartment", "house", "storeRoom", "parkingSpace", "suburban"],
+          "enumNames": [
+            "Квартира",
+            "Апартаменты",
+            "Жилой дом",
+            "Кладовая",
+            "Машино-место",
+            "Загородная недвижимость"
+          ]
         }
       },
       "stage": {
@@ -40,11 +47,54 @@
         "type": "array",
         "items": {
           "type": "string",
-          "enum": ["preferentialMortgage", "children"],
-          "enumNames": ["Льготная ипотека", "Дети"]
+          "enum": ["preferentialMortgage", "children", "refinancing"],
+          "enumNames": ["Льготная ипотека", "Дети", "Рефинансирование"]
         }
       }
     },
+    "hotFilters": [
+      { "text": "Все программы" },
+      {
+        "text": "Льготные программы",
+        "filter": {
+          "categories": [],
+          "extraOptions": ["preferentialMortgage"],
+          "propertyType": [],
+          "stage": []
+        }
+      },
+      {
+        "text": "Строящееся жилье",
+        "filter": {
+          "stage": ["inProgress"],
+          "categories": [],
+          "extraOptions": [],
+          "propertyType": []
+        }
+      },
+      {
+        "text": "Готовое жилье",
+        "filter": { "stage": ["built"], "categories": [], "extraOptions": [], "propertyType": [] }
+      },
+      {
+        "text": "Загородная недвижимость",
+        "filter": {
+          "propertyType": ["suburban"],
+          "categories": [],
+          "extraOptions": [],
+          "stage": []
+        }
+      },
+      {
+        "text": "Рефинансирование",
+        "filter": {
+          "categories": [],
+          "extraOptions": ["refinancing"],
+          "propertyType": [],
+          "stage": []
+        }
+      }
+    ],
     "resetButton": {
       "text": "Очистить фильтры",
       "version": "secondary"

package/mobile/src/components/MortgageFiltration/MortgageFiltration.tsx

@@ -1,19 +1,60 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
 import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import type { TabItemBase } from '../../ui-kit/TabsControl/TabItem';
+import { TabsControl } from '../../ui-kit/TabsControl/TabsControl';
 import { style } from '../../utils/style';
-import type { MortgageFiltrationContent } from './MortgageFiltrationContent';
+import { hotFilterRecordCmp } from './HotFilterRecord';
+import type {
+  MortgageFiltrationContent,
+  MortgageFiltrationSchema,
+} from './MortgageFiltrationContent';
 
 interface MortgageFiltrationProps extends MortgageFiltrationContent, UniBlockProps {}
 
-const initialFiltrationState = {};
+const initialFiltrationState: Partial<Record<keyof MortgageFiltrationSchema, string[]>> = {
+  categories: [],
+  extraOptions: [],
+  propertyType: [],
+  stage: [],
+};
 
 export const MortgageFiltration: JSXBlock<MortgageFiltrationProps> = JSX<MortgageFiltrationProps>(
-  ({ className, filtrationSchema = {}, resetButton, ...rest }) => {
-    const [filtrationState, { field, reset }] = useForm(initialFiltrationState);
+  ({ className, hotFilters = [], filtrationSchema = {}, resetButton, ...rest }) => {
+    const [filtrationState, { field, reset, update: replaceFiltrationState }] =
+      useForm(initialFiltrationState);
+
+    const normalizedHotFilters: TabItemBase[] = useMemo(
+      () =>
+        hotFilters.map(({ text }) => ({
+          text,
+        })),
+      [hotFilters],
+    );
+
+    const [hotFilterIndex, setHotFilterIndex] = useState(0);
+
+    const handleHotFilterSelect = useCallback(
+      (_: TabItemBase) => {
+        setHotFilterIndex(normalizedHotFilters.indexOf(_));
+        replaceFiltrationState(
+          hotFilters[normalizedHotFilters.indexOf(_)].filter || initialFiltrationState,
+        );
+      },
+      [normalizedHotFilters],
+    );
+
+    useEffect(() => {
+      const suggestedHotFilterIndex = hotFilters.findIndex((_) =>
+        hotFilterRecordCmp(_.filter, filtrationState),
+      );
+
+      setHotFilterIndex(suggestedHotFilterIndex !== -1 ? suggestedHotFilterIndex : 0);
+    }, [hotFilters, filtrationState]);
 
     return (
       <BlockWrapper
@@ -22,6 +63,12 @@ export const MortgageFiltration: JSXBlock<MortgageFiltrationProps> = JSX<Mortgag
         version="transparent"
         {...rest}
       >
+        <TabsControl
+          className="mb-2xs"
+          items={normalizedHotFilters}
+          value={normalizedHotFilters[hotFilterIndex]}
+          onChange={handleHotFilterSelect}
+        />
         {renderFiltrationForm({ field, reset, filtrationSchema, resetButton })}
         <BaseFiltrationInner filtrationState={filtrationState} {...rest} />
       </BlockWrapper>

package/mobile/src/components/MortgageFiltration/MortgageFiltrationContent.ts

@@ -2,6 +2,7 @@ import type {
   BaseFiltrationInnerContent,
   StringArray,
 } from '../../ui-kit/BaseFiltration/BaseFiltrationContent';
+import type { HotFilterRecord } from './HotFilterRecord';
 
 export type MortgageFiltrationSchema = {
   /** @title Тип недвижимости */
@@ -14,10 +15,22 @@ export type MortgageFiltrationSchema = {
   extraOptions?: StringArray;
 };
 
+/**
+ * @title Кнопка фильтрации
+ */
+export interface HotFilterButton {
+  /** @title Текст */
+  text?: string;
+  /** @title Применяемые фильтры */
+  filter?: HotFilterRecord;
+}
+
 /**
  * @title Подборщик ипотек
  */
 export interface MortgageFiltrationContent extends BaseFiltrationInnerContent {
   /** @title Параметры фильтрации */
   filtrationSchema?: MortgageFiltrationSchema;
+  /** @title Горячие фильтры */
+  hotFilters?: HotFilterButton[];
 }

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

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

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

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

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

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

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

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

package/mobile/src/components/RollupItem/RollupItem.tsx

@@ -132,7 +132,7 @@ const renderPrimaryFoldButton = ({
       )}
       onClick={onToggle}
     >
-      <div className="flex items-center group-hover/button:text-primary-main gap-s">
+      <div className="flex items-center text-start group-hover/button:text-primary-main gap-s">
         {renderRoundedIcon(labelIcon, labelIconBgVersion)}
         {label ? (
           <Text size="text-h6" font="font-normal">

package/mobile/src/components/RollupItem/renderRoundedIcon.tsx

@@ -3,5 +3,5 @@ import { RoundedIcon } from '../../ui-kit/Icon/RoundedIcon';
 import type { IconBgVersion } from '../../ui-kit/Icon/IconProps';
 
 export const renderRoundedIcon = (icon?: Picture, iconBgVersion?: IconBgVersion) => (
-  <RoundedIcon {...icon} iconBgVersion={iconBgVersion} />
+  <RoundedIcon {...icon} iconBgVersion={iconBgVersion} className="shrink-0" />
 );

package/mobile/src/components/RollupItem/rollupIconVersion.tsx

@@ -1 +1 @@
-export const rollupIconVersion = 'normal';
+export const rollupIconVersion = 'black';

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

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

package/mobile/src/components/Tabs/Tabs.tsx

@@ -1,73 +1,60 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { defaultEventBus } from '../../EventBus/defaultEventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import type { TabItemBase } from '../../ui-kit/TabsControl/TabItem';
 import { style } from '../../utils/style';
-import { CenteredTabs } from './CenteredTabs';
-import { renderTab } from './renderTab';
-import { ScrollableTabs } from './ScrollableTabs';
+import { renderTabs } from './renderTabs';
 import type { TabData, TabsContent } from './TabsContent';
 
 export interface TabsBlockProps extends TabsContent, UniBlockProps {}
 
-interface RenderTabsProps extends TabsBlockProps {
-  currentTab?: TabData;
-  onClick: (tab: TabData) => void;
-}
+export const Tabs = JSX<TabsBlockProps>(
+  ({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
+    const normalizedTabs: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
 
-export const Tabs = JSX<TabsBlockProps>((props) => {
-  const { className = '', isSticky, tabs, ...rest } = props;
+    const [activeTabIndex, setActiveTabIndex] = useState(0);
 
-  const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
+    useEffect(() => {
+      if (!tabs || !tabs[0]) {
+        return;
+      }
 
-  useEffect(() => {
-    if (!tabs || !tabs[0]) {
-      return;
-    }
+      fireTabEvent(tabs[0]);
+    }, []);
 
-    fireTabEvent(tabs[0]);
-  }, []);
+    useEffect(() => {
+      const activeTab = tabs[activeTabIndex];
 
-  useEffect(() => {
-    if (currentTab?.type === 'group') {
-      defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref });
-    }
-  }, [currentTab]);
+      if (activeTab?.type === 'group') {
+        defaultEventBus.subject('tab', { type: activeTab.type, label: activeTab.ref });
+      }
+    }, [tabs, activeTabIndex]);
 
-  const handleClick = useCallback((selectedTab: TabData) => {
-    fireTabEvent(selectedTab);
-    setCurrentTab(selectedTab);
-  }, []);
+    const handleChange = useCallback((_: TabItemBase) => {
+      const index = normalizedTabs.indexOf(_);
 
-  return (
-    <BlockWrapper
-      className={style(
-        'relative box-border flex gap-x-1 w-full overflow-x-auto no-scrollbar',
-        isSticky ? 'sticky top-1 z-20' : '',
-        className,
-      )}
-      defaultPadding="p-0"
-      role="tablist"
-      {...rest}
-    >
-      {renderTabs({ tabs, onClick: handleClick, currentTab, ...rest })}
-    </BlockWrapper>
-  );
-});
+      setActiveTabIndex(index);
+      fireTabEvent(tabs[index]);
+    }, []);
 
-const renderTabs = ({ tabsMode, tabs, ...rest }: RenderTabsProps) => {
-  switch (tabsMode) {
-    case 'wideScreen':
-      return tabs?.map(renderTab({ tabsMode, ...rest }));
-    case 'centered':
-      return <CenteredTabs tabs={tabs} tabsMode={tabsMode} {...rest} />;
-    case 'scrollable':
-      return <ScrollableTabs tabs={tabs} tabsMode={tabsMode} {...rest} />;
-  }
-
-  return null;
-};
+    return (
+      <BlockWrapper
+        className={style(isSticky ? 'sticky top-1 z-20' : '', className)}
+        defaultPadding="p-0"
+        {...rest}
+      >
+        {renderTabs({
+          items: normalizedTabs,
+          onChange: handleChange,
+          value: normalizedTabs[activeTabIndex],
+          tabsMode,
+        })}
+      </BlockWrapper>
+    );
+  },
+);
 
 const fireTabEvent = (tab: TabData) => {
   if (tab.type === 'group') {
@@ -77,3 +64,5 @@ const fireTabEvent = (tab: TabData) => {
     defaultEventBus.fire('tab', { type: tab.type, label: tab.href });
   }
 };
+
+const normalizeTab = (_: TabData): TabItemBase => (_?.type === 'group' ? { text: _.title } : _);

package/mobile/src/components/Tabs/renderTabs.tsx

@@ -0,0 +1,37 @@
+import { ScrollableTabsControl } from '../../ui-kit/TabsControl/ScrollableTabsControl';
+import type { TabItemBase } from '../../ui-kit/TabsControl/TabItem';
+import { TabsControl } from '../../ui-kit/TabsControl/TabsControl';
+import type { TabsControlProps } from '../../ui-kit/TabsControl/TabsControlProps';
+import type { TabsMode } from './TabsContent';
+
+interface RenderTabsProps {
+  items: TabItemBase[];
+  value: TabItemBase;
+  onChange: TabsControlProps['onChange'];
+  tabsMode?: TabsMode;
+}
+
+export const renderTabs = ({ tabsMode, ...props }: RenderTabsProps) => {
+  switch (tabsMode) {
+    case 'wideScreen':
+      return <TabsControl {...props} />;
+    case 'centered':
+      return (
+        <div className="flex">
+          <TabsControl
+            className="m-auto p-xs rounded-md bg-main-gray"
+            tabsType="rounded"
+            {...props}
+          />
+        </div>
+      );
+    case 'scrollable':
+      return (
+        <div className="flex">
+          <ScrollableTabsControl className="m-auto" tabsType="underlined" {...props} />
+        </div>
+      );
+    default:
+      return null;
+  }
+};

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

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

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

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

package/mobile/src/hooks/useForm.ts

@@ -25,6 +25,7 @@ export const useForm = <FormState extends Record<string, any>>(
   {
     isDirty: boolean;
     field: FormFieldRegisterer<FormState>;
+    update: (_: FormState) => void;
     reset: () => void;
     onSubmit: (e: PreventableEvent) => void;
   },
@@ -60,6 +61,11 @@ export const useForm = <FormState extends Record<string, any>>(
     [formState, isDirtyForm, dirtyFieldsMap],
   );
 
+  const update = useCallback((_: FormState) => {
+    setFormState(_);
+    setDirtyFieldsMap(_);
+  }, []);
+
   const reset = useCallback(() => {
     setFormState(initialState);
     setDirtyForm(false);
@@ -81,6 +87,7 @@ export const useForm = <FormState extends Record<string, any>>(
     {
       isDirty: isDirtyForm || Object.values(dirtyFieldsMap).some(Boolean),
       field,
+      update,
       reset,
       onSubmit: handleSubmit,
     },