@redneckz/wildless-cms-uni-blocks 0.8.8 → 0.8.10

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../../EventBus/EventBus';
+import { defaultEventBus } from '../../EventBus/defaultEventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderTab } from './renderTab';
@@ -21,7 +21,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   useEffect(
     () =>
-      EventBus.inst.subscribe('tab', (event) => {
+      defaultEventBus.subscribe('tab', (event) => {
         const tab = tabs?.find(checkTab(event));
         if (event.type === 'link' && tab) {
           setCurrentTab(tab);
@@ -35,14 +35,14 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   useEffect(
     () =>
       currentTab?.type === 'group'
-        ? EventBus.inst.subject('tab', { type: currentTab.type, label: currentTab.ref })
+        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
         : undefined,
     [currentTab],
   );
 
   const handleClick = useCallback((selectedTab: TabData) => {
     if (selectedTab?.type === 'group') {
-      EventBus.inst.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
+      defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
     }
     setCurrentTab(selectedTab);
   }, []);

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

@@ -2,7 +2,7 @@
   "content": {
     "title": "Плитка",
     "headingType": "h3",
-    "description": "Описание",
+    "__html": "<p>Описание</p>",
     "image": {
       "format": "webp",
       "size": {

package/mobile/src/components/Tile/Tile.tsx

@@ -5,7 +5,7 @@ import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
-import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
+import { RichText } from '../../ui-kit/RichText/RichText';
 import { Tags } from '../../ui-kit/Tags/Tags';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
@@ -18,7 +18,7 @@ export const Tile = JSX<TileProps>(
   ({
     title,
     headingType = 'h3',
-    description,
+    __html,
     items,
     buttons,
     image,
@@ -52,9 +52,9 @@ export const Tile = JSX<TileProps>(
         })}
         image={image?.src ? <Img className="mt-auto ml-7" image={image} /> : null}
       >
-        {description ? (
+        {__html ? (
           <div className="max-w-[600px] mt-2.5">
-            <Paragraph size="text-xl-light">{description}</Paragraph>
+            <RichText __html={__html} />
           </div>
         ) : null}
         {children}

package/mobile/src/components/Tile/Tile.ui.json

@@ -1 +1,7 @@
-{}
+{
+  "content": {
+    "__html": {
+      "ui:widget": "html"
+    }
+  }
+}

package/mobile/src/components/Tile/TileContent.ts

@@ -1,17 +1,17 @@
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { DescriptionProps } from '../../model/HeadlineType';
 import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { ListItemSize } from '../../ui-kit/List/ListProps';
+import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 import type { TagsContent } from '../../ui-kit/Tags/TagsContent';
 
 /**
  * @title Плитка
  */
 export type TileContent = HeadingCommonProps &
-  DescriptionProps &
+  RichTextProps &
   ListContent &
   ButtonContent &
   TagsContent & {

package/mobile/src/hooks/useLink.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../model/LinkProps';
 import { projectSettings } from '../ProjectSettings';
-import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
+import { gotoBlock } from '../services/BlockRouter/BlockRouter';
 import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
@@ -15,7 +15,6 @@ interface Clickable {
 
 export function useLink(isRemote?: boolean) {
   const router = useRouter();
-  const blockRouter = useBlockRouter();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
@@ -44,7 +43,7 @@ export function useLink(isRemote?: boolean) {
       // Client routing
       ev?.preventDefault();
       if (isHash(href)) {
-        blockRouter.goto(href);
+        gotoBlock(router, href);
       } else if (href) {
         router.push(href);
       }

package/mobile/src/hooks/useRouter.ts

@@ -1,10 +1,14 @@
+interface RouterOptions {
+  scroll?: boolean;
+}
+
 export interface Router {
   pathname: string;
   query: Record<string, string | string[] | undefined>;
   href?: string;
   basePath?: string;
-  push: (url: string) => void;
-  replace: (url: string) => void;
+  push: (url: string, as?: string, options?: RouterOptions) => void;
+  replace: (url: string, as?: string, options?: RouterOptions) => void;
 }
 
 export function useRouter(): Router {

package/mobile/src/services/BlockRouter/BlockRouter.ts

@@ -1,53 +1,14 @@
-import { EventBus } from '../../EventBus/EventBus';
+import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
 
-export interface GotoAnchorEvent {
-  anchor: string;
-}
-
-export interface BlockIntersectionEvent {
-  block: BlockDef;
-  intersection: IntersectionObserverEntry;
-}
+const normalizeAnchor = (anchor?: string) => anchor?.replace('#', '') || '';
 
-interface EventMap {
-  goto: GotoAnchorEvent;
-  intersection: BlockIntersectionEvent;
+export function gotoBlock(router: Router, anchor?: string) {
+  router.replace(`#${normalizeAnchor(anchor)}`);
 }
 
-const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '') || '';
-const getURLWithAnchor = (rawAnchor?: string) =>
-  `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
-
-export class BlockRouter {
-  public static readonly inst = new BlockRouter();
-
-  readonly eventBus = new EventBus<EventMap>();
-
-  constructor() {
-    const anchor = normalizeAnchor(globalThis.location?.hash);
-    if (anchor) {
-      this.eventBus.subject('goto', { anchor });
-    }
-  }
-
-  goto(rawAnchor?: string) {
-    const anchor = normalizeAnchor(rawAnchor);
-    if (anchor) {
-      this.push(anchor);
-      this.eventBus.fire('goto', { anchor });
-    }
-  }
-
-  push(rawAnchor: string) {
-    globalThis.history?.pushState(null, '', getURLWithAnchor(rawAnchor));
-  }
-
-  replace(rawAnchor: string) {
-    globalThis.history?.replaceState(null, '', getURLWithAnchor(rawAnchor));
-  }
-
-  reset() {
-    globalThis.history?.replaceState(null, '', getURLWithAnchor());
-  }
+export function trackBlock(router: Router, block?: BlockDef) {
+  router.replace(`#${normalizeAnchor(block?.anchor)}`, undefined, {
+    scroll: false,
+  });
 }

package/mobile/src/services/BlockRouter/blockRouterEventBus.ts

@@ -0,0 +1,13 @@
+import { EventBus } from '../../EventBus/EventBus';
+import type { BlockDef } from '../../model/ContentPageDef';
+
+export interface BlockIntersectionEvent {
+  block: BlockDef;
+  intersection: IntersectionObserverEntry;
+}
+
+interface EventMap {
+  intersection: BlockIntersectionEvent;
+}
+
+export const blockRouterEventBus = new EventBus<EventMap>();

package/mobile/src/services/BlockRouter/useBlockIntersectionObserver.ts

@@ -1,12 +1,9 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useIntersectionObserver } from '../../hooks/useIntersectionObserver';
 import type { BlockDef } from '../../model/ContentPageDef';
-import { BlockRouter } from './BlockRouter';
+import { blockRouterEventBus } from './blockRouterEventBus';
 
-export function useBlockIntersectionObserver(
-  block?: BlockDef,
-  router: BlockRouter = BlockRouter.inst,
-) {
+export function useBlockIntersectionObserver(block?: BlockDef) {
   const observerCallback = useCallback(
     (entries: IntersectionObserverEntry[]) => {
       if (!block || !entries?.length) {
@@ -14,24 +11,10 @@ export function useBlockIntersectionObserver(
       }
 
       const intersection = entries[entries.length - 1];
-      router.eventBus.fire('intersection', { block, intersection });
+      blockRouterEventBus.fire('intersection', { block, intersection });
     },
-    [block, router],
+    [block],
   );
 
-  const ref = useIntersectionObserver(observerCallback, { sensitivity: 1 });
-
-  useEffect(() => {
-    if (!ref.current) {
-      return undefined;
-    }
-
-    return router.eventBus.subscribe('goto', ({ anchor }) => {
-      if (ref.current && block?.anchor === anchor) {
-        ref.current.scrollIntoView({ behavior: 'smooth', block: 'start' });
-      }
-    });
-  }, [block, router]);
-
-  return ref;
+  return useIntersectionObserver(observerCallback, { sensitivity: 1 });
 }

package/mobile/src/services/BlockRouter/useBlockRouterProvider.ts

@@ -1,41 +1,35 @@
 import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import { useRouter } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
 import { debounce } from '../../utils/debounce';
-import { BlockRouter } from './BlockRouter';
+import { trackBlock } from './BlockRouter';
+import { blockRouterEventBus } from './blockRouterEventBus';
 import { findActiveBlock } from './findActiveBlock';
 
 const isScrolledEnough = () => globalThis.scrollY > (globalThis.innerHeight * 3) / 4;
 
-export function useBlockRouterProvider(
-  router: BlockRouter = BlockRouter.inst,
-  scrollTarget: EventTarget = globalThis,
-) {
+export function useBlockRouterProvider(scrollTarget: EventTarget = globalThis) {
+  const router = useRouter();
+
   const intersectionsMapRef = useRef<Map<BlockDef, IntersectionObserverEntry>>(new Map());
 
   useEffect(
     () =>
-      router.eventBus.subscribe('intersection', ({ block, intersection }) => {
+      blockRouterEventBus.subscribe('intersection', ({ block, intersection }) => {
         if (intersectionsMapRef.current) {
           intersectionsMapRef.current.set(block, intersection);
         }
       }),
-    [router],
+    [],
   );
 
   useEffect(() => {
     const handleScroll = debounce(() => {
-      if (!isScrolledEnough()) {
-        router.reset();
-
-        return;
-      }
-
-      const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
-
-      if (activeBlock?.anchor) {
-        router.replace(activeBlock.anchor);
-      } else if (!activeBlock) {
-        router.reset();
+      if (isScrolledEnough()) {
+        const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
+        trackBlock(router, activeBlock);
+      } else {
+        trackBlock(router);
       }
     }, 100);
 

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../EventBus/EventBus';
+import { defaultEventBus } from '../EventBus/defaultEventBus';
 import type { BlockVersion } from '../model/BlockVersion';
 import type { UniBlockProps } from '../model/JSXBlock';
 import { useBlockIntersectionObserver } from '../services/BlockRouter/useBlockIntersectionObserver';
@@ -28,7 +28,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
     const [isVisible, setVisible] = useState(true);
     useEffect(
       () =>
-        EventBus.inst.subscribe('tab', (event) => {
+        defaultEventBus.subscribe('tab', (event) => {
           if (event.type === 'group') {
             const hasSettings = block?.labels?.length || block?.anchor;
             setVisible(

package/package.json

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

package/src/EventBus/EventBus.ts

@@ -1,10 +1,4 @@
-import type { EventMap } from './EventMap';
-
-export type BaseEventMap = Record<string, any>;
-
-export class EventBus<EM extends BaseEventMap> {
-  public static readonly inst = new EventBus<EventMap>();
-
+export class EventBus<EM extends Record<string, any>> {
   private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
   private subjectsStateMap: Partial<EM> = {};
 

package/src/EventBus/defaultEventBus.ts

@@ -0,0 +1,8 @@
+import type { TabActivationEvent } from '../components/Tabs/Tabs';
+import { EventBus } from './EventBus';
+
+interface GlobalEventMap {
+  tab: TabActivationEvent;
+}
+
+export const defaultEventBus = new EventBus<GlobalEventMap>();

package/src/components/ButtonBlock/ButtonBlock.example.json

@@ -1,8 +1,8 @@
 {
   "content": {
     "button": {
-      "href": "/credit-cards",
-      "text": "Подробнее",
+      "href": "#",
+      "text": "Кнопка",
       "target": "_blank",
       "version": "primary"
     }

package/src/components/ButtonBlock/ButtonBlock.tsx

@@ -2,10 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { style } from '../../utils/style';
 import type { ButtonBlockContent } from './ButtonBlockContent';
 
 interface ButtonBlockProps extends ButtonBlockContent, UniBlockProps {}
 
-export const ButtonBlock = JSX<ButtonBlockProps>(({ button, ...rest }) => (
-  <BlockWrapper {...rest}>{renderButtonsSection([button])}</BlockWrapper>
+export const ButtonBlock = JSX<ButtonBlockProps>(({ button, className, ...rest }) => (
+  <BlockWrapper className={style('!bg-transparent', className)} {...rest}>
+    {renderButtonsSection([button])}
+  </BlockWrapper>
 ));

package/src/components/ButtonBlock/ButtonBlockContent.ts

@@ -4,6 +4,10 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
  * @title Блок Кнопка
  */
 export interface ButtonBlockContent {
-  /** @title Кнопка */
+  /**
+   * @title Кнопка
+   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
+   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}}
+   */
   button?: ButtonWithIconProps;
 }

package/src/components/Calculator/Rate.tsx

@@ -25,7 +25,7 @@ export const Rate = JSX<RateProps>(
               rateBlockClassName,
             )}
           >
-            {String(rate).replace('.', ',')}
+            {String(rate.toFixed(2)).replace('.', ',')}
           </span>
           {unit ? (
             <span className="gradient-color-text text-[65px] leading-[75px]">{unit}</span>

package/src/components/Calculator/constants.ts

@@ -54,7 +54,7 @@ export const DEFAULT_DEPOSIT_CALCULATOR_PARAMS: DepositCalculatorSourceBookParam
   maxSum: 5000000,
   minMonths: 2,
   maxMonths: 120,
-  rate: 5.9,
+  rate: 7,
   isMonthlyInterestPayment: true,
 };
 
@@ -64,7 +64,7 @@ export const DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS: BusinessDepositCalculat
     maxSum: 500000,
     minDays: BUSINESS_MIN_DAYS,
     maxDays: BUSINESS_MAX_DAYS,
-    rate: 5.9,
+    rate: 6.6,
     isMonthlyInterestPayment: true,
     isReplenished: false,
     isPartialWithdrawal: false,

package/src/components/Calculator/rangeHelpers.ts

@@ -0,0 +1,24 @@
+import { maxBy } from '../../utils/maxBy';
+import { minBy } from '../../utils/minBy';
+
+export const getRangeByKeys = <
+  MinKey extends string,
+  MaxKey extends string,
+  T extends Record<MinKey | MaxKey, number>,
+>(
+  [minKey, maxKey]: [MinKey, MaxKey],
+  rows: T[] = [],
+) => ({
+  [minKey]: rows.length ? minBy()(rows.map((row) => row[minKey])) : 0,
+  [maxKey]: rows.length ? maxBy()(rows.map((row) => row[maxKey])) : 0,
+});
+
+export const checkRangeByKeys = <
+  MinKey extends string,
+  MaxKey extends string,
+  T extends Record<MinKey | MaxKey, number>,
+>(
+  value: number,
+  [minKey, maxKey]: [MinKey, MaxKey],
+  sourceBookRow: T,
+): boolean => value >= sourceBookRow[minKey] && value < sourceBookRow[maxKey];

package/src/components/Calculator/useBusinessDepositCalculatorParams.ts

@@ -5,6 +5,7 @@ import {
   BUSINESS_RATE_MIN_DAYS,
   DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS,
 } from './constants';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 import type { CommonDepositParams } from './useDepositCalculatorParams';
 
@@ -72,9 +73,9 @@ export const useBusinessDepositCalculatorParams = (
       return (
         isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
         isSmallBusiness === _.isSmallBusiness &&
-        (isOperatingDeposit
-          ? _.isReplenished && _.isPartialWithdrawal
-          : !_.isReplenished && !_.isPartialWithdrawal)
+        checkIsOperatingDeposit(isOperatingDeposit, _) &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(daysValue, ['minDays', 'maxDays'], _)
       );
     }) || DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS;
 
@@ -82,9 +83,12 @@ export const useBusinessDepositCalculatorParams = (
 
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
+  const sourceBookRows = data?.rows || [DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS];
 
   return {
     ...businessDepositCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minDays', 'maxDays'], sourceBookRows),
     ...userInputParams,
     isDisabledOperatingDeposit,
     income,
@@ -92,6 +96,14 @@ export const useBusinessDepositCalculatorParams = (
   };
 };
 
+const checkIsOperatingDeposit = (
+  isOperatingDeposit: boolean,
+  sourceBookRow: BusinessDepositCalculatorSourceBookParams,
+) =>
+  isOperatingDeposit
+    ? sourceBookRow.isReplenished && sourceBookRow.isPartialWithdrawal
+    : !sourceBookRow.isReplenished && !sourceBookRow.isPartialWithdrawal;
+
 const getDepositIncome = (
   rate: number,
   userInputParams: BusinessDepositCalculatorUserInputParams,

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -1,5 +1,6 @@
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonCreditParams {
@@ -38,7 +39,7 @@ export const useCreditCalculatorParams = (
   userInputParams: CreditCalculatorUserInputParams,
   sourceBookDir?: string,
 ): CreditCalculatorParams => {
-  const { isInsurance, isSalaryClient, isStateEmployee, moneyValue } = userInputParams;
+  const { isInsurance, isSalaryClient, isStateEmployee, moneyValue, monthsValue } = userInputParams;
 
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
   const creditCalculatorSourceBookParams =
@@ -46,16 +47,21 @@ export const useCreditCalculatorParams = (
       return (
         isInsurance === _.isInsurance &&
         isSalaryClient === _.isSalaryClient &&
-        isStateEmployee === _.isStateEmployee
+        isStateEmployee === _.isStateEmployee &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _)
       );
     }) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
   const { rateBottomRange, rateTopRange, sumBorder } = creditCalculatorSourceBookParams;
   const finalRate = moneyValue <= sumBorder ? rateBottomRange : rateTopRange;
   const monthlyPayment = getMonthlyPayment(finalRate, userInputParams);
+  const sourceBookRows = data?.rows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
 
   return {
     ...creditCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
     ...userInputParams,
     finalRate,
     monthlyPayment,

package/src/components/Calculator/useDepositCalculatorParams.ts

@@ -1,9 +1,11 @@
 import { DEFAULT_DEPOSIT_CALCULATOR_PARAMS, DEPOSIT_CALC_DEFAULT_DIR } from './constants';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonDepositParams {
   isMonthlyInterestPayment: boolean;
 }
+
 export interface DepositCalculatorSourceBookParams extends CommonDepositParams {
   minSum: number;
   maxSum: number;
@@ -32,22 +34,34 @@ export const useDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
   sourceBookDir?: string,
 ): DepositCalculatorParams => {
-  const { isMonthlyInterestPayment, moneyValue } = userInputParams;
+  const { isMonthlyInterestPayment, moneyValue, monthsValue } = userInputParams;
 
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
   );
 
   const depositCalculatorSourceBookParams =
-    data?.rows?.find((_) => isMonthlyInterestPayment === _.isMonthlyInterestPayment) ||
-    DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
+    data?.rows?.find(
+      (_) =>
+        isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _),
+    ) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
 
   const { rate } = depositCalculatorSourceBookParams;
 
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
+  const sourceBookRows = data?.rows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
 
-  return { ...depositCalculatorSourceBookParams, ...userInputParams, income, finalSum };
+  return {
+    ...depositCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
+    ...userInputParams,
+    income,
+    finalSum,
+  };
 };
 
 const getDepositIncome = (rate: number, userInputParams: DepositCalculatorUserInputParams) => {

package/src/components/Carousel/Carousel.tsx

@@ -52,10 +52,12 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
             gap={ITEMS_GAP}
             onVisibleIndicesChange={scroll.handleVisibleIndicesChange}
           >
-            {renderChildren({
-              ...rest,
-              block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
-            })}
+            {isBankHistoryCarousel
+              ? renderChildren({
+                  ...rest,
+                  block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
+                })
+              : renderChildren(rest)}
           </SwipeListContainer>
           <CarouselScrollButtons
             scroll={scroll}

package/src/components/PictureText/renderBenefit.tsx

@@ -4,6 +4,7 @@ import type { ComplexBenefitProps } from '../../ui-kit/BenefitItem/BenefitItemPr
 import { RichText } from '../../ui-kit/RichText/RichText';
 import { assertUnreachable } from '../../utils/assertUnreachable';
 
+// TODO: Create universal function for this case
 export const renderBenefit =
   // Linter doesn't understand that switch processes all cases
   // eslint-disable-next-line consistent-return

package/src/components/ProductTile/renderBenefit.tsx

@@ -3,6 +3,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { assertUnreachable } from '../../utils/assertUnreachable';
 import type { Benefit } from './ProductTileContent';
 
+// TODO: Create universal function for this case
 export const renderBenefit =
   // Linter doesn't understand that switch processes all cases
   // eslint-disable-next-line consistent-return