@redneckz/wildless-cms-uni-blocks 0.14.183 → 0.14.185

package/{src/components/Calculator/useDepositCalculatorParams.ts → mobile/src/components/Calculator/getDepositCalculatorParams.ts}

@@ -1,9 +1,8 @@
 import { arrayByRange } from '../../utils/arrayByRange';
 import { mergeIntervals } from '../../utils/mergeIntervals';
 import { type DepositCalculatorParamsViewSettings } from './CalculatorContent';
-import { DEFAULT_DEPOSIT_CALCULATOR_PARAMS, DEPOSIT_CALC_DEFAULT_DIR } from './constants';
+import { DEFAULT_DEPOSIT_CALCULATOR_PARAMS } from './constants';
 import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
-import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonDepositParams {
   isMonthlyInterestPayment: boolean;
@@ -33,25 +32,22 @@ export interface DepositCalculatorParams
 }
 
 export type DepositCalculatorData = {
-  rateRows: DepositCalculatorSourceBookParams[];
+  rateRows?: DepositCalculatorSourceBookParams[];
 };
 
-export const useDepositCalculatorParams = (
+export const getDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
-  sourceBookDir?: string,
+  calcSource?: DepositCalculatorData,
   paramsViewSettings?: DepositCalculatorParamsViewSettings,
 ): DepositCalculatorParams => {
   const { moneyValue, monthsValue } = userInputParams;
-  const data = useCalculatorParams<DepositCalculatorData>(
-    sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
-  );
-  const defaultMonth = data?.rateRows?.[0]
-    ? getMiddleMonth(data.rateRows[0].minMonths, data.rateRows[0].maxMonths)
+  const defaultMonth = calcSource?.rateRows?.[0]
+    ? getMiddleMonth(calcSource.rateRows[0].minMonths, calcSource.rateRows[0].maxMonths)
     : 0;
   const isExcludeMonthlyInterestPayment = !paramsViewSettings?.isShowMonthlyInterestPayment;
   const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
   const depositCalculatorSourceBookParams =
-    data?.rateRows?.find(
+    calcSource?.rateRows?.find(
       (row) =>
         checkRowByParam({
           row,
@@ -72,7 +68,7 @@ export const useDepositCalculatorParams = (
   const { rate } = depositCalculatorSourceBookParams;
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
-  const sourceBookRows = data?.rateRows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
+  const sourceBookRows = calcSource?.rateRows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
 
   return {
     ...depositCalculatorSourceBookParams,

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

@@ -3,7 +3,7 @@ import { checkRefinancingSourceBookRowCommonParams } from './checkRefinancingSou
 import {
   type RefinancingCalculatorSourceBookLimitParams,
   type RefinancingCalculatorUserInputParams,
-} from './useRefinancingCalculatorParams';
+} from './getRefinancingCalculatorParams';
 
 interface GetRefinancingCalculatorLimitParamsProps {
   limitRows: RefinancingCalculatorSourceBookLimitParams[];

package/mobile/src/components/Calculator/{useRefinancingCalculatorParams.ts → getRefinancingCalculatorParams.ts}

@@ -1,11 +1,9 @@
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { type RefinancingCalculatorParamsViewSettings } from './CalculatorContent';
-import { DEFAULT_REFINANCING_CALCULATOR_PARAMS, REFINANCING_CALC_DEFAULT_DIR } from './constants';
+import { DEFAULT_REFINANCING_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
 import { getRefinancingCalculatorLimitParams } from './getRefinancingCalculatorLimitParams';
 import { getRefinancingCalculatorRateParams } from './getRefinancingCalculatorRateParams';
 import { getLimitRangeByKeys } from './rangeHelpers';
-import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonRefinancingParams {
   isSalaryClient: boolean;
@@ -56,17 +54,14 @@ export type RefinancingCalculatorData = {
   limitRows?: RefinancingCalculatorSourceBookLimitParams[];
 };
 
-export const useRefinancingCalculatorParams = (
+export const getRefinancingCalculatorParams = (
   userInputParams: RefinancingCalculatorUserInputParams,
-  sourceBookDir?: string,
+  calcSource?: RefinancingCalculatorData,
   paramsViewSettings?: RefinancingCalculatorParamsViewSettings,
 ): RefinancingCalculatorParams => {
   const { moneyValue, monthsValue, oldMonthlyPayment, moneyExtra } = userInputParams;
-  const data = useCalculatorParams<RefinancingCalculatorData>(
-    sourceBookDir || REFINANCING_CALC_DEFAULT_DIR,
-  );
-  const rateRows = data?.rateRows || [DEFAULT_REFINANCING_CALCULATOR_PARAMS];
-  const limitRows = data?.limitRows || [];
+  const rateRows = calcSource?.rateRows || [DEFAULT_REFINANCING_CALCULATOR_PARAMS];
+  const limitRows = calcSource?.limitRows || [];
   const sourceBookLimitParams = getRefinancingCalculatorLimitParams({
     limitRows,
     userInputParams,
@@ -99,21 +94,18 @@ export const useRefinancingCalculatorParams = (
 
   const benefit = userInputParams.oldMonthlyPayment - monthlyPayment;
 
-  return useMemo(
-    () => ({
-      ...refinancingCalculatorSourceBookRateParams,
-      ...userInputParams,
-      minSum,
-      maxSum,
-      minMonths,
-      maxMonths,
-      moneyValue,
-      monthsValue,
-      oldMonthlyPayment,
-      moneyExtra,
-      monthlyPayment,
-      benefit,
-    }),
-    [userInputParams, data],
-  );
+  return {
+    ...refinancingCalculatorSourceBookRateParams,
+    ...userInputParams,
+    minSum,
+    maxSum,
+    minMonths,
+    maxMonths,
+    moneyValue,
+    monthsValue,
+    oldMonthlyPayment,
+    moneyExtra,
+    monthlyPayment,
+    benefit,
+  };
 };

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

@@ -1,11 +1,11 @@
 import { type RefinancingCalculatorParamsViewSettings } from './CalculatorContent';
 import { checkRefinancingSourceBookRowCommonParams } from './checkRefinancingSourceBookRowCommonParams';
 import { DEFAULT_REFINANCING_CALCULATOR_PARAMS } from './constants';
-import { checkRangeByKeys } from './rangeHelpers';
 import {
   type RefinancingCalculatorSourceBookRateParams,
   type RefinancingCalculatorUserInputParams,
-} from './useRefinancingCalculatorParams';
+} from './getRefinancingCalculatorParams';
+import { checkRangeByKeys } from './rangeHelpers';
 
 interface GetRefinancingCalculatorRateParamsProps {
   rateRows: RefinancingCalculatorSourceBookRateParams[];

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

@@ -11,8 +11,11 @@ export const PriceList = JSX<PriceListProps>(({ priceList }) =>
   ) : null,
 );
 
-const renderPriceListItem = ({ label, amount }: PriceItem) => (
-  <div className="basis-full flex flex-col-reverse sm:flex-row sm:justify-between sm:bg-main-divider sm:py-m sm:px-lg sm:rounded-md items-baseline whitespace-pre">
+const renderPriceListItem = ({ label, amount }: PriceItem, i: number) => (
+  <div
+    key={String(i)}
+    className="basis-full flex flex-col-reverse sm:flex-row sm:justify-between sm:bg-main-divider sm:py-m sm:px-lg sm:rounded-md items-baseline whitespace-pre"
+  >
     <Text font="font-light" size="text-l" color="text-secondary-text">
       {label}
     </Text>

package/package.json

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

package/src/components/ApplicationFormCustom/ApplicationFormCustom.example.json

@@ -1,21 +1,106 @@
-{
-  "content": {
-    "title": "Заголовок",
-    "typeForm": "CORRUPTION",
-    "endpoint": "lead",
-    "inputs": [
-      { "name": "surname", "required": true },
-      { "name": "middleName" },
-      { "name": "consentDataProcessing", "required": true }
-    ],
-    "button": {
-      "text": "Отправить",
-      "version": "primary"
-    },
-    "link": {
-      "text": "Согласен на обработку персональных данных",
-      "href": "/privacy-policy",
-      "target": "_blank"
+[
+  [
+    "Коррупция",
+    {
+      "content": {
+        "title": "Сообщить о коррупции",
+        "typeForm": "CORRUPTION",
+        "endpoint": "lead",
+        "formColumns": 1,
+        "inputs": [
+          {
+            "name": "surname",
+            "required": true
+          },
+          {
+            "name": "name",
+            "required": true
+          },
+          {
+            "name": "middleName"
+          },
+          {
+            "name": "phone",
+            "required": true
+          },
+          {
+            "name": "region",
+            "required": true
+          },
+          {
+            "name": "email"
+          },
+          {
+            "name": "comment",
+            "required": true
+          },
+          {
+            "name": "consentDataProcessing",
+            "required": true
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
     }
-  }
-}
+  ],
+  [
+    "Мошенничество",
+    {
+      "content": {
+        "title": "Сообщить о возможных мошеннических действиях",
+        "typeForm": "ANTIFRAUD",
+        "endpoint": "lead",
+        "inputs": [
+          {
+            "name": "surname",
+            "required": true
+          },
+          {
+            "name": "name",
+            "required": true
+          },
+          {
+            "name": "middleName"
+          },
+          {
+            "name": "phone",
+            "required": true
+          },
+          {
+            "name": "birthday",
+            "required": true
+          },
+          {
+            "name": "client"
+          },
+          {
+            "name": "comment",
+            "required": true
+          },
+          {
+            "name": "consentDataProcessing",
+            "required": true
+          }
+        ],
+        "formColumns": 1,
+        "button": {
+          "text": "Отправить",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
+  ]
+]

package/src/components/ApplicationFormCustom/ApplicationFormCustom.fixture.tsx

@@ -50,4 +50,64 @@ export default {
       <PopupManager />
     </div>
   ),
+  corruption: (
+    <div className="container grid grid-cols-12">
+      <ApplicationFormCustom
+        className="col-span-12"
+        title="Сообщить о коррупции"
+        typeForm={'CORRUPTION'}
+        inputs={[
+          { name: 'surname', required: true },
+          { name: 'name', required: true },
+          { name: 'middleName' },
+          { name: 'phone', required: true },
+          { name: 'region', required: true },
+          { name: 'email' },
+          { name: 'comment', required: true },
+          { name: 'consentDataProcessing', required: true },
+        ]}
+        button={{
+          text: 'Отправить заявку',
+          version: 'primary',
+        }}
+        link={{
+          text: 'Согласен на обработку персональных данных',
+          href: '/privacy-policy',
+          target: '_blank',
+        }}
+        formColumns={1}
+      />
+      <PopupManager />
+    </div>
+  ),
+  antiFraud: (
+    <div className="container grid grid-cols-12">
+      <ApplicationFormCustom
+        className="col-span-12"
+        title="Сообщить о возможных мошеннических действиях"
+        typeForm={'ANTIFRAUD'}
+        inputs={[
+          { name: 'surname', required: true },
+          { name: 'name', required: true },
+          { name: 'middleName' },
+          { name: 'phone', required: true },
+          { name: 'birthday', required: true },
+          { name: 'client' },
+          { name: 'comment', required: true },
+          { name: 'consentDataProcessing', required: true },
+        ]}
+        formColumns={1}
+        button={{
+          text: 'Отправить заявку',
+          version: 'primary',
+        }}
+        link={{
+          text: 'Согласен на обработку персональных данных',
+          href: '/privacy-policy',
+          target: '_blank',
+        }}
+      />
+      <PopupManager />
+    </div>
+  ),
 };

package/src/components/Blocks.mobile.ts

@@ -2,7 +2,6 @@ import { type BlocksRegistry } from '../model/BlocksRegistry';
 
 import { AdTile } from './AdTile/AdTile';
 import { ApplicationForm } from './ApplicationForm/ApplicationForm';
-import { ApplicationFormCorruption } from './ApplicationFormCorruption/ApplicationFormCorruption';
 import { ApplicationFormCustom } from './ApplicationFormCustom/ApplicationFormCustom';
 import { BenefitsBlock } from './BenefitsBlock/BenefitsBlock';
 import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
@@ -47,9 +46,8 @@ import { VerticalLayout } from './VerticalLayout/VerticalLayout';
 
 export const Blocks: BlocksRegistry = {
   AdTile,
-  ApplicationFormCorruption,
-  ApplicationFormCustom,
   ApplicationForm,
+  ApplicationFormCustom,
   BenefitsBlock,
   BonusBenefitsBlock,
   ButtonsBlock,

package/src/components/Blocks.ts

@@ -2,8 +2,6 @@ import { type BlocksRegistry } from '../model/BlocksRegistry';
 
 import { AdTile } from './AdTile/AdTile';
 import { ApplicationForm } from './ApplicationForm/ApplicationForm';
-import { ApplicationFormAntiFraud } from './ApplicationFormAntiFraud/ApplicationFormAntiFraud';
-import { ApplicationFormCorruption } from './ApplicationFormCorruption/ApplicationFormCorruption';
 import { ApplicationFormCustom } from './ApplicationFormCustom/ApplicationFormCustom';
 import { BenefitsBlock } from './BenefitsBlock/BenefitsBlock';
 import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
@@ -56,9 +54,7 @@ import { Video } from './Video/Video';
 export const Blocks: BlocksRegistry = {
   AdTile,
   ApplicationForm,
-  ApplicationFormAntiFraud,
   ApplicationFormCustom,
-  ApplicationFormCorruption,
   BenefitsBlock,
   BonusBenefitsBlock,
   ButtonsBlock,

package/src/components/Calculator/BonusCalculatorForm.tsx

@@ -1,28 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type JSONRefObject } from '../../data/JSONRefObject';
 import { useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/LinkButton/renderButtonsSection';
 import { style } from '../../utils/style';
 import { type CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { DEFAULT_REST_MIN_SUM, DEFAULT_TRAVEL_MIN_SUM } from './constants';
+import { getBonusCalculatorParams, type BonusCalculatorData } from './getBonusCalculatorParams';
 import { renderFootnote } from './renderFootnote';
 import { renderRate } from './renderRate';
 import { renderWantedSumInput } from './renderWantedSumInput';
-import { useBonusCalculatorParams } from './useBonusCalculatorParams';
 
 export interface BonusCalculatorProps extends CommonCalculatorProps {
   className?: string;
+  calcSource?: BonusCalculatorData & JSONRefObject;
 }
 
 export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
-  ({ className = '', sourceBookDir, buttons, footnote }) => {
+  ({ className = '', calcSource, buttons, footnote }) => {
     const [userInputParams, { field }] = useForm({
       travelExpenseValue: DEFAULT_TRAVEL_MIN_SUM,
       restExpenseValue: DEFAULT_REST_MIN_SUM,
     });
 
     const { minSumTravel, maxSumTravel, minSumOther, maxSumOther, monthBonus, yearBonus } =
-      useBonusCalculatorParams(userInputParams, sourceBookDir);
+      getBonusCalculatorParams(userInputParams, calcSource);
 
     return (
       <section

package/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type JSONRefObject } from '../../data/JSONRefObject';
 import { useForm, type FormFieldRegisterer } from '../../hooks/useForm';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { renderButtonsSection } from '../../ui-kit/LinkButton/renderButtonsSection';
@@ -7,31 +8,33 @@ import { type BusinessDepositCalculatorProps } from './CalculatorContent';
 import { CalculatorFormLayout } from './CalculatorFormLayout';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { BUSINESS_DEFAULT_DAYS, BUSINESS_DEFAULT_SUM } from './constants';
+import {
+  getBusinessDepositCalculatorParams,
+  type BusinessDepositCalculatorData,
+  type BusinessDepositCalculatorParams,
+  type BusinessDepositCalculatorUserInputParams,
+} from './getBusinessDepositCalculatorParams';
 import { getMoneyDefaultValue, getMonthsDefaultValue } from './getDefaultValues';
 import { renderDaysInput } from './renderDaysInput';
 import { renderFootnote } from './renderFootnote';
 import { renderInterestPayment } from './renderInterestPayment';
 import { renderRate } from './renderRate';
 import { renderWantedSumInput } from './renderWantedSumInput';
-import {
-  useBusinessDepositCalculatorParams,
-  type BusinessDepositCalculatorParams,
-  type BusinessDepositCalculatorUserInputParams,
-} from './useBusinessDepositCalculatorParams';
 
 export interface BusinessDepositCalculatorProp extends BusinessDepositCalculatorProps {
   className?: string;
+  calcSource?: BusinessDepositCalculatorData & JSONRefObject;
 }
 
 export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
   ({
     className = '',
-    rateParams,
     buttons,
     footnote,
     bottomFootnote,
     isShowDepositeName,
     defaultParams,
+    calcSource,
   }) => {
     const [userInputParams, { field }] = useForm({
       moneyValue: getMoneyDefaultValue(defaultParams, BUSINESS_DEFAULT_SUM),
@@ -40,11 +43,7 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
       isPartialWithdrawal: Boolean(defaultParams?.isPartialWithdrawal),
       isMonthlyInterestPayment: Boolean(defaultParams?.isMonthlyInterestPayment),
     });
-
-    const calculatorParams = useBusinessDepositCalculatorParams(
-      userInputParams,
-      rateParams?.rateType && rateParams.sourceBookDir,
-    );
+    const calculatorParams = getBusinessDepositCalculatorParams(userInputParams, calcSource);
     const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (

package/src/components/Calculator/Calculator.fixture.tsx

@@ -45,6 +45,9 @@ const CREDIT_CALCULATOR_BLOCK: CreditCalculatorParamsDef = {
   },
   buttons: buttons,
   footnote,
+  calcSource: {
+    $ref: '/wcms-resources/credit-calculator-data.json',
+  },
 };
 
 const DEPOSIT_CALCULATOR_BLOCK: DepositCalculatorParamsDef = {
@@ -58,6 +61,9 @@ const DEPOSIT_CALCULATOR_BLOCK: DepositCalculatorParamsDef = {
   },
   buttons: buttons,
   footnote,
+  calcSource: {
+    $ref: '/wcms-resources/deposit-calculator-data.json',
+  },
 };
 
 const BUSINESS_DEPOSIT_CALCULATOR_BLOCK: BusinessDepositCalculatorParamsDef = {
@@ -66,6 +72,9 @@ const BUSINESS_DEPOSIT_CALCULATOR_BLOCK: BusinessDepositCalculatorParamsDef = {
   isShowDepositeName: true,
   footnote,
   bottomFootnote,
+  calcSource: {
+    $ref: '/wcms-resources/business-calculator-data.json',
+  },
 };
 
 const REFINANCING_CALCULATOR_BLOCK: RefinancingCalculatorParamsDef = {
@@ -83,12 +92,18 @@ const REFINANCING_CALCULATOR_BLOCK: RefinancingCalculatorParamsDef = {
     },
   ],
   footnote,
+  calcSource: {
+    $ref: '/wcms-resources/refinancing-calculator-data.json',
+  },
 };
 
 const BONUS_CALCULATOR_BLOCK: BonusCalculatorParamsDef = {
   title: 'Обменивайте баллы на путешествия',
   calcType: 'BonusCalculatorForm',
   buttons: buttons,
+  calcSource: {
+    $ref: '/wcms-resources/bonus-calculator-data.json',
+  },
 };
 
 export default {

package/src/components/Calculator/Calculator.mobile.tsx

@@ -1,4 +1,3 @@
-import { JSX } from '@redneckz/uni-jsx';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps';
@@ -6,17 +5,20 @@ import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { Text } from '../../ui-kit/Text/Text';
+import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type CalculatorContent, type CalculatorTab } from './CalculatorContent';
 import { EmbeddableCalcBlocks } from './EmbeddableCalcBlocks';
 
 export interface CalculatorProps extends CalculatorContent, UniBlockProps {}
 
-export const Calculator = JSX<CalculatorProps>(({ className, calculatorTabs = [], ...rest }) => (
-  <BlockWrapper className={className} defaultPadding="p-0" {...rest}>
-    {renderTabs(calculatorTabs)}
-  </BlockWrapper>
-));
+export const Calculator = UniBlock<CalculatorProps>(
+  ({ className, calculatorTabs = [], ...rest }) => (
+    <BlockWrapper className={className} defaultPadding="p-0" {...rest}>
+      {renderTabs(calculatorTabs)}
+    </BlockWrapper>
+  ),
+);
 
 const renderCalculator = (tab: CalculatorTab) => {
   const type = tab.calculatorBlock?.calcType;

package/src/components/Calculator/Calculator.tsx

@@ -1,4 +1,3 @@
-import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
 import { type Align } from '../../model/Align';
@@ -6,6 +5,7 @@ import { AlignJustifyStyle } from '../../model/AlignJustifyStyle';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
 import { renderArrows } from '../../ui-kit/LinkButton/renderArrows';
+import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import {
@@ -32,7 +32,7 @@ interface NavButtonProps {
   onClick: () => void;
 }
 
-export const Calculator = JSX<CalculatorProps>(
+export const Calculator = UniBlock<CalculatorProps>(
   ({ className = '', tabAlign, calculatorTabs = [], ...rest }) => {
     const tabsNav = calculatorTabs.map((_) => _.nav || ({} as CalculatorNav));
     const calculatorBlocks = calculatorTabs.map(

package/src/components/Calculator/CalculatorContent.ts

@@ -1,46 +1,14 @@
+import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type Align } from '../../model/Align';
 import { type Footnote } from '../../model/Footnote';
 import { type HeadlineCommonProps, type TitleProps } from '../../model/HeadlineType';
 import { type IconProps } from '../../model/Picture';
 import { type ButtonsSectionContent } from '../../ui-kit/LinkButton/ButtonsSectionContent';
 
-export interface RateParams {
-  /** @title Адрес справочника */
-  sourceBookDir?: string; // TODO: JSON Ref
-}
-
-/**
- * @title ЮЛ
- * @default {"rateType": "UL"}
- */
-export type ULRateDef = RateParams & {
-  rateType: 'UL';
-};
-
-/**
- * @title ИП
- * @default {"rateType": "IP"}
- */
-export type IPRateDef = RateParams & {
-  rateType: 'IP';
-};
-
-/** @title Не выбрано * */
-export type EmptyRateParams = {
-  /** @default "" */
-  rateType: '';
-};
-
-/**
- * @title Назначение ставки
- * @default {"rateType": ""}
- */
-export type RateParamsDef = EmptyRateParams | ULRateDef | IPRateDef;
-
 export type CommonCalculatorProps = Footnote &
   ButtonsSectionContent & {
-    /** @title Адрес справочника */
-    sourceBookDir?: string; // TODO: JSON Ref
+    /** @title Данные калькулятора */
+    calcSource?: JSONRefObject;
   };
 
 export interface CommonDefaultParams {
@@ -124,9 +92,7 @@ export interface BusinessDepositDefaultParams extends CommonDefaultParams {
   isMonthlyInterestPayment?: boolean;
 }
 
-export interface BusinessDepositCalculatorProps extends Footnote, ButtonsSectionContent {
-  /** @title Ставка для */
-  rateParams?: RateParamsDef;
+export interface BusinessDepositCalculatorProps extends CommonCalculatorProps {
   /** @title Сноска снизу блока */
   bottomFootnote?: string;
   /** @title Показывать название депозита */