@redneckz/wildless-cms-uni-blocks 0.8.22 → 0.8.24

package/mobile/lib/ui-kit/SwipeListControl/SwipeListControlDots.d.ts

@@ -1,3 +1,4 @@
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { SwipeListControlType } from './SwipeListControlProps';
 interface SwipeListControlDotsProps {
     containerRef?: {
@@ -6,6 +7,7 @@ interface SwipeListControlDotsProps {
     activeIndex?: number;
     dotCount?: number;
     listType?: SwipeListControlType;
+    version?: BlockVersion;
 }
 export declare const SwipeListControlDots: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlDotsProps, any, any>;
 export {};

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { style } from '../../utils/style.js';
 const containerStyles = {
     'horizontal-list': 'mx-auto mt-5 w-fit',
     'vertical-list': 'absolute flex-col justify-center h-full top-0 left-4',
@@ -8,9 +9,9 @@ const activeDotStyles = {
     'horizontal-list': 'w-6',
     'vertical-list': 'h-6',
 };
-const dotStyle = 'cursor-pointer bg-primary-main rounded-full transition-width duration-300 group-data-secondary:bg-white group-data-transparent:bg-white';
+const dotStyle = 'cursor-pointer rounded-full transition-width duration-300 bg-primary-main group-data-secondary:bg-white group-data-transparent:bg-white';
 const inactiveDotStyle = 'w-2 h-2 opacity-30';
-export const SwipeListControlDots = JSX(({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list' }) => {
+export const SwipeListControlDots = JSX(({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list', version }) => {
     const handleClick = (idx) => {
         if (idx !== activeIndex && containerRef?.current) {
             containerRef.current.children[idx]?.scrollIntoView({
@@ -19,6 +20,6 @@ export const SwipeListControlDots = JSX(({ containerRef, activeIndex, dotCount =
             });
         }
     };
-    return dotCount ? (_jsx("div", { className: `flex gap-2 ${containerStyles[listType]}`, children: new Array(dotCount).fill(null).map((_, idx) => (_jsx("div", { className: `${dotStyle} ${idx === activeIndex ? activeDotStyles[listType] : inactiveDotStyle}`, role: "button", "aria-hidden": true, onClick: () => handleClick(idx) }, String(idx)))) })) : null;
+    return dotCount ? (_jsx("div", { className: style('flex gap-2', containerStyles[listType], version ? 'group' : ''), ...(version ? { 'data-ver': version } : {}), children: new Array(dotCount).fill(null).map((_, idx) => (_jsx("div", { className: `${dotStyle} ${idx === activeIndex ? activeDotStyles[listType] : inactiveDotStyle}`, role: "button", "aria-hidden": true, onClick: () => handleClick(idx) }, String(idx)))) })) : null;
 });
 //# sourceMappingURL=SwipeListControlDots.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SwipeListControlDots.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListControlDots.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,MAAM,eAAe,GAAyC;IAC5D,iBAAiB,EAAE,oBAAoB;IACvC,eAAe,EAAE,sDAAsD;CACxE,CAAC;AAEF,MAAM,eAAe,GAAyC;IAC5D,iBAAiB,EAAE,KAAK;IACxB,eAAe,EAAE,KAAK;CACvB,CAAC;AAEF,MAAM,QAAQ,GACZ,yIAAyI,CAAC;AAE5I,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAS9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CACrC,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,iBAAiB,EAAE,EAAE,EAAE;IAC5E,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,IAAI,GAAG,KAAK,WAAW,IAAI,YAAY,EAAE,OAAO,EAAE;YAChD,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;gBACjD,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,OAAO,QAAQ,CAAC,CAAC,CAAC,CAChB,cAAK,SAAS,EAAE,cAAc,eAAe,CAAC,QAAQ,CAAC,EAAE,YACtD,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAW,EAAE,EAAE,CAAC,CACtD,cAEE,SAAS,EAAE,GAAG,QAAQ,IACpB,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBACpD,EAAE,EACF,IAAI,EAAC,QAAQ,uBAEb,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,IAN1B,MAAM,CAAC,GAAG,CAAC,CAOhB,CACH,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}
+{"version":3,"file":"SwipeListControlDots.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListControlDots.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,eAAe,GAAyC;IAC5D,iBAAiB,EAAE,oBAAoB;IACvC,eAAe,EAAE,sDAAsD;CACxE,CAAC;AAEF,MAAM,eAAe,GAAyC;IAC5D,iBAAiB,EAAE,KAAK;IACxB,eAAe,EAAE,KAAK;CACvB,CAAC;AAEF,MAAM,QAAQ,GACZ,yIAAyI,CAAC;AAE5I,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAU9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CACrC,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,iBAAiB,EAAE,OAAO,EAAE,EAAE,EAAE;IACrF,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,IAAI,GAAG,KAAK,WAAW,IAAI,YAAY,EAAE,OAAO,EAAE;YAChD,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;gBACjD,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,OAAO,QAAQ,CAAC,CAAC,CAAC,CAChB,cACE,SAAS,EAAE,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAC7E,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,YAE3C,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAW,EAAE,EAAE,CAAC,CACtD,cAEE,SAAS,EAAE,GAAG,QAAQ,IACpB,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBACpD,EAAE,EACF,IAAI,EAAC,QAAQ,uBAEb,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,IAN1B,MAAM,CAAC,GAAG,CAAC,CAOhB,CACH,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}

package/mobile/lib/ui-kit/Text/TextProps.d.ts

@@ -1,4 +1,4 @@
-import { BlockVersionMolecule } from '../../model/BlockVersion';
+import type { BlockVersionMolecule } from '../../model/BlockVersion';
 /**
  * @title Размер текста
  */

package/mobile/lib/ui-kit/TopItem/TopItem.d.ts

@@ -1,4 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 export interface TopItemContent extends LinkProps {
     active?: boolean;
 }
@@ -6,6 +7,6 @@ export interface TopItemProps extends TopItemContent {
     className?: string;
     flat?: boolean;
     dataItemName?: string;
-    onClick?: () => void;
+    onClick?: (ev?: PreventableEvent) => void;
 }
 export declare const TopItem: import("@redneckz/uni-jsx").UNIComponent<TopItemProps, any, any>;

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

@@ -1 +1 @@
-{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}
+{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}

package/mobile/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -66,7 +66,7 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'acqr',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         PartnerComments,
         fullName,
         inn,

package/mobile/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -6,11 +6,11 @@ import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange } from './models';
 import { normalizeSelectedRegion } from './normalizeSelectedRegion';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useFormHandlers } from './useFormHandlers';
+import { WrapperSelect } from './WrapperSelect';
 
 export interface BusinessCardFormState {
   region: string;
@@ -47,7 +47,7 @@ export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) =>
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'bcrd',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         name,
         phone,
         inn,

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

@@ -1,5 +1,6 @@
 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';
 
@@ -18,14 +19,15 @@ export interface SubmitButtonProps extends ButtonAdditionalProps {
 /**
  * @title Форма заявки
  */
-export type ApplicationFormContent = TitleProps & {
-  /**
-   * @title Вид заявки
-   * @default credit
-   * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
-   */
-  typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
-  button?: SubmitButtonProps;
-  /** @title Условия передачи данных */
-  link?: LinkProps;
-};
+export type ApplicationFormContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Вид заявки
+     * @default credit
+     * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
+     */
+    typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
+    button?: SubmitButtonProps;
+    /** @title Условия передачи данных */
+    link?: LinkProps;
+  };

package/mobile/src/components/ApplicationForm/ApplicationFormCredit.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useSafeBoxes } from '../../hooks/useSafeBoxes';
+import { useBranches } from '../../hooks/useBranches';
 import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
@@ -52,9 +52,9 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
     setFormState,
   });
 
-  const selectedRegion = normalizeSelectedRegion(formState.region, regions);
+  const selectedRegion = normalizeSelectedRegion(region, regions);
 
-  const branches = useSafeBoxes(region);
+  const branches = useBranches(selectedRegion).filter((branch) => branch.address);
 
   useEffect(() => {
     handleChange({
@@ -75,8 +75,8 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
         name,
         phone,
         mail,
-        region,
-        department,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
+        department: branches.find((_) => _.branchCode === department)?.address || '',
         PartnerComments,
       }));
   };

package/mobile/src/components/ApplicationForm/renderBankOffices.tsx

@@ -1,7 +1,7 @@
 import { Branch } from '../../hooks/useSafeBoxes';
 import type { CreditFormState } from './ApplicationFormCredit';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange, Select } from './models';
+import { WrapperSelect } from './WrapperSelect';
 
 interface RenderBankOfficesProps {
   regions: Select[];

package/mobile/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,6 +1,6 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 
 /**
@@ -47,12 +47,11 @@ export type BenefitBlockItemProps = LabelProps &
 /**
  * @title Блок преимущества
  */
-export type BenefitsBlockContent = TitleProps & {
-  /**
-   * @title Список преимуществ
-   * @maxItems 6
-   */
-  benefitList?: BenefitBlockItemProps[];
-  /** @default primary */
-  version?: BlockVersion;
-};
+export type BenefitsBlockContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Список преимуществ
+     * @maxItems 6
+     */
+    benefitList?: BenefitBlockItemProps[];
+  };

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

@@ -1,15 +1,15 @@
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /**
  * @title Изображение
  */
-export type BonusImageDef = {
+export type BonusImageDef = ImageContent & {
   /** @default image */
   bonusType?: 'image';
-  image?: Picture;
 };
 
 /**
@@ -45,7 +45,8 @@ export type BonusItem = HeadlineCommonProps & {
 /**
  * @title Блок Бонусы
  */
-export type BonusContent = HeadlineCommonProps & {
-  /** @title Список плиток */
-  bonusItems?: BonusItem[];
-};
+export type BonusContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /** @title Список плиток */
+    bonusItems?: BonusItem[];
+  };

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

@@ -6,7 +6,8 @@
     "cardTextAlign": "center",
     "bonusBenefits": [
       {
-        "label": "Более 5000 товаров",
+        "title": "",
+        "description": "Более 5000 товаров",
         "icon": {
           "format": "webp",
           "size": {
@@ -17,7 +18,8 @@
         }
       },
       {
-        "label": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
+        "title": "",
+        "description": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
         "icon": {
           "format": "webp",
           "size": {
@@ -28,7 +30,8 @@
         }
       },
       {
-        "label": "Аренда автомобилей",
+        "title": "",
+        "description": "Аренда автомобилей",
         "icon": {
           "format": "webp",
           "size": {
@@ -39,7 +42,8 @@
         }
       },
       {
-        "label": "Болеее 1000 развлечений",
+        "title": "",
+        "description": "Болеее 1000 развлечений",
         "icon": {
           "format": "webp",
           "size": {
@@ -50,7 +54,8 @@
         }
       },
       {
-        "label": "Платежные гаджеты Pay Ring",
+        "title": "",
+        "description": "Платежные гаджеты Pay Ring",
         "icon": {
           "format": "webp",
           "size": {
@@ -61,7 +66,8 @@
         }
       },
       {
-        "label": "Цифровые сервисы",
+        "title": "",
+        "description": "Цифровые сервисы",
         "icon": {
           "format": "webp",
           "size": {
@@ -72,7 +78,8 @@
         }
       },
       {
-        "label": "Фермерские продукты",
+        "title": "",
+        "description": "Фермерские продукты",
         "icon": {
           "format": "webp",
           "size": {
@@ -83,7 +90,8 @@
         }
       },
       {
-        "label": "Страхование",
+        "title": "",
+        "description": "Страхование",
         "icon": {
           "format": "webp",
           "size": {

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -38,12 +38,12 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
   ),
 );
 
-const renderBonusBenefit = ({ icon, label, description }: BonusBenefit, i: number) => {
+const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: number) => {
   return (
     <div key={String(i)} className="flex flex-col items-center text-h6">
-      {description ? <span>{description}</span> : null}
+      {title ? <span>{title}</span> : null}
       {icon ? <Img image={icon} height="180" width="auto" className="h-[180px] w-auto" /> : null}
-      <div>{label ? <span>{label}</span> : null}</div>
+      <div>{description ? <span>{description}</span> : null}</div>
     </div>
   );
 };

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,6 +1,8 @@
 import type { AlignType } from '../../model/AlignType';
-import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+
 /**
  * @title Количество элементов в строке
  * @enumNames [
@@ -13,17 +15,22 @@ export type ColumnsCount = '3' | '4' | '5';
 
 /**
  * @title Бонус и преимущество
+ * @default {
+ *   "title": "Верхний заголовок",
+ *   "description": "Нижний заголовок",
+ * }
  */
-export type BonusBenefit = LabelProps & IconProps & DescriptionProps;
+export type BonusBenefit = TitleProps & IconProps & DescriptionProps;
 
 /**
  * @title Блок бонусов и преимуществ
  */
-export type BonusBenefitsBlockContent = TitleProps & {
-  /** @title Подзаголовок */
-  subtitle?: string;
-  /** @title Список бонусов */
-  bonusBenefits?: BonusBenefit[];
-  columnsCount?: ColumnsCount;
-  cardTextAlign?: AlignType;
-};
+export type BonusBenefitsBlockContent = UniBlockContent &
+  TitleProps & {
+    /** @title Подзаголовок */
+    subtitle?: string;
+    /** @title Список бонусов */
+    bonusBenefits?: BonusBenefit[];
+    columnsCount?: ColumnsCount;
+    cardTextAlign?: AlignType;
+  };

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

@@ -1,5 +1,8 @@
-import type { IconProps, Picture } from '../../model/Picture';
+import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { IconProps } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /** @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }}} */
 export type BusinessCardItemProps = IconProps & {
@@ -7,30 +10,27 @@ export type BusinessCardItemProps = IconProps & {
   text?: string;
 };
 
-export interface BusinessCardProps {
-  /** @title Заголовок карточки */
-  title?: string;
-  image?: Picture;
-  /** @title Список */
-  cardItems?: BusinessCardItemProps[];
-  /**
-   * @title Кнопка
-   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
-   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}, "text": "Кнопка"}
-   */
-  button?: ButtonWithIconProps;
-}
+export type BusinessCardProps = TitleProps &
+  ImageContent & {
+    /** @title Список */
+    cardItems?: BusinessCardItemProps[];
+    /**
+     * @title Кнопка
+     * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
+     * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}, "text": "Кнопка"}
+     */
+    button?: ButtonWithIconProps;
+  };
 
 /**
  * @title Бизнес блок
  */
-export interface BusinessBlockContent {
-  /** @title Заголовок блока */
-  title?: string;
-  /**
-   * @title Карточки
-   * @minItems 2
-   * @maxItems 2
-   */
-  cards?: BusinessCardProps[];
-}
+export type BusinessBlockContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Карточки
+     * @minItems 2
+     * @maxItems 2
+     */
+    cards?: BusinessCardProps[];
+  };

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

@@ -9,7 +9,9 @@ import type { CreditCalculatorUserInputParams } from './useCreditCalculatorParam
 export const getMonthlyPayment = (rate: number, params: CreditCalculatorUserInputParams) => {
   const { isAnnuity, moneyValue, monthsValue } = params;
 
-  if (isAnnuity) {
+  if (rate === 0) {
+    return 0;
+  } else if (isAnnuity) {
     const i = rate / MONTHLY_INTEREST_RATE; // Используется значение ставки в процентах
 
     return moneyValue * (i + i / (Math.pow(1 + i, monthsValue) - 1));

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

@@ -1,10 +1,12 @@
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Перевод с карты на карту
  */
-export type CardTransferContent = LabelProps &
+export type CardTransferContent = UniBlockContent &
+  LabelProps &
   TitleProps & {
     /** @title Плейсхолдер */
     placeholder?: string;

package/mobile/src/components/Carousel/Carousel.tsx

@@ -43,7 +43,14 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
     const isBankHistoryCarousel = childBlocks && childBlocks[0]?.type === 'CarouselBankHistoryCard';
 
     return (
-      <BlockWrapper className={style(getPaddingStyle(isPadding), className)} {...rest}>
+      <BlockWrapper
+        className={style(
+          getPaddingStyle(isPadding),
+          'group-data-secondary:bg-primary-main group-data-secondary:text-white',
+          className,
+        )}
+        {...rest}
+      >
         <div className="relative max-w-full">
           <SwipeListContainer
             containerRef={containerRef}

package/mobile/src/components/Carousel/CarouselContent.ts

@@ -1,7 +1,9 @@
+import type { UniBlockContent } from '../../model/JSXBlock';
+
 /**
  * @title Карусель
  */
-export interface CarouselContent {
+export type CarouselContent = UniBlockContent & {
   /**
    * @title Количество видимых карточек
    * @enumNames ["auto", "1", "2", "3"]
@@ -18,4 +20,4 @@ export interface CarouselContent {
   isCyclic?: boolean;
   /** @title Внутренний отступ  */
   isPadding?: boolean;
-}
+};

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

@@ -11,7 +11,7 @@ interface CarouselBankHistoryCardProps extends CarouselBankHistoryCardContent, U
 }
 
 export const CarouselBankHistoryCard = JSX<CarouselBankHistoryCardProps>(
-  ({ title, description, blocksLength = 0, activeIndex, options, ...rest }) => {
+  ({ title, description, blocksLength = 0, activeIndex, options }) => {
     const orderNumber = Number(options?.key?.split('-').slice(-1)[0]) || 0;
     const isActive = orderNumber === activeIndex;
 

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCardContent.ts

@@ -1,9 +1,7 @@
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+
 /**
  * @title Карточка карусели истории банка
  */
-export interface CarouselBankHistoryCardContent {
-  /** @title Заголовок */
-  title?: string;
-  /** @title Описание */
-  description?: string;
-}
+export type CarouselBankHistoryCardContent = UniBlockContent & HeadlineCommonProps;

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

@@ -1,18 +1,20 @@
-import type { SizeVersion } from '../../model/SizeVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
+import type { SizeVersion } from '../../model/SizeVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Карточка карусели
  */
-export interface CarouselCardContent extends HeadlineCommonProps {
-  /**
-   * @title Кнопка
-   * @default {
-   *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
-   *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
-   * }
-   */
-  button?: ButtonWithIconProps;
-  carouselVersion?: SizeVersion;
-}
+export type CarouselCardContent = UniBlockContent &
+  HeadlineCommonProps & {
+    /**
+     * @title Кнопка
+     * @default {
+     *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+     *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
+     * }
+     */
+    button?: ButtonWithIconProps;
+    carouselVersion?: SizeVersion;
+  };

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

@@ -1,5 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
@@ -7,7 +7,8 @@ import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 /**
  * @title Карточка каталога
  */
-export type CarouselCatalogCardContent = HeadlineCommonProps &
+export type CarouselCatalogCardContent = UniBlockContent &
+  HeadlineCommonProps &
   ImageContent & {
     /** @title Цена в рублях */
     price?: number;
@@ -21,5 +22,4 @@ export type CarouselCatalogCardContent = HeadlineCommonProps &
      * }
      */
     button?: ButtonWithIconProps;
-    version?: BlockVersion;
   };

package/mobile/src/components/CarouselEventCard/CarouselEventCardContent.ts

@@ -1,12 +1,13 @@
 import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
+import type { IconProps } from '../../model/Picture';
 
 /**
  * @title Карточка мероприятия в карусели
  */
-export type CarouselEventCardContent = TitleProps &
+export type CarouselEventCardContent = UniBlockContent &
+  TitleProps &
   DescriptionProps &
-  LinkCommonProps & {
-    icon?: Picture;
-  };
+  LinkCommonProps &
+  IconProps;