@redneckz/wildless-cms-uni-blocks 0.9.5 → 0.9.7

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

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAUvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,SAAS,EACnB,KAAK,EACL,GAAG,GAAG,SAAS,EACf,IAAI,EACJ,OAAO,GAAG,IAAI,EACd,UAAU,GAAG,EAAE,EACf,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,SAAS,CACP,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CACrF,CAAC;IACJ,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CACd,UAAU,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,EACvC,WAAW,CAAC,OAAO,CAAC,EACpB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EACxB,SAAS,CACV,KACG,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACnD,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,KACN,UAAU,YAEb,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAU,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,SAAS,EACnB,OAAO,GAAG,IAAI,EACd,KAAK,EACL,GAAG,GAAG,SAAS,EACf,IAAI,EACJ,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,SAAS,CACP,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CACrF,CAAC;IACJ,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CACd,UAAU,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,EACvC,WAAW,CAAC,OAAO,CAAC,EACpB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EACxB,SAAS,CACV,KACG,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACnD,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAU,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}

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

@@ -0,0 +1,8 @@
+import type { Target } from '../../model/LinkProps';
+interface LinkWrapperProps {
+    className?: string;
+    href?: string;
+    target?: Target;
+}
+export declare const LinkWrapper: import("@redneckz/uni-jsx").UNIComponent<LinkWrapperProps, any, any>;
+export {};

package/mobile/lib/ui-kit/LinkWrapper/LinkWrapper.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink.js';
+export const LinkWrapper = JSX(({ className = '', href, target, children }) => {
+    const link = useLink();
+    const linkProps = link({ href, target });
+    const Tag = href ? 'a' : 'div';
+    return (_jsx(Tag, { className: className, ...(href ? linkProps : {}), children: children }));
+});
+//# sourceMappingURL=LinkWrapper.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LinkWrapper.js","sourceRoot":"","sources":["../../../src/ui-kit/LinkWrapper/LinkWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAS9C,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9F,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;IAE/B,OAAO,CACL,KAAC,GAAG,IAAC,SAAS,EAAE,SAAS,KAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,YACnD,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/src/BlockRenderer/BlockRendererOptions.ts

@@ -9,6 +9,4 @@ export interface BlockRendererOptions {
   blocksRegistry?: BlocksRegistry;
   parent?: Slot;
   ancestors?: BlockAncestors;
-  className?: string;
-  extraProps?: Record<string, any>;
 }

package/mobile/src/BlockRenderer/renderBlock.tsx

@@ -8,14 +8,18 @@ const DEFAULT_ANCESTORS: BlockAncestors = [];
 
 const defaultStyle = 'col-span-12';
 
-export function renderBlock(block: BlockDef, options: BlockRendererOptions) {
+type ExtraProps = Partial<Record<string, any> & { className: string }>;
+
+export function renderBlock(
+  block: BlockDef,
+  options: BlockRendererOptions,
+  { className, ...extraProps }: ExtraProps = {},
+) {
   const {
     key,
     blockDecorator = defaultBlockDecorator,
     blocksRegistry = {},
     ancestors = DEFAULT_ANCESTORS,
-    className = '',
-    extraProps = {},
   } = options;
   const { type } = block;
 

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

@@ -16,6 +16,12 @@
               "version": "primary"
             }
           ],
+          "paramsViewSettings": {
+            "isShowSalaryClient": true,
+            "isShowStateEmployee": true,
+            "isShowPensionClient": true,
+            "isShowInsurance": true
+          },
           "footnote": "Расчёт является предварительным. Точные условия будут предоставлены в отделении Банка. "
         }
       }

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

@@ -10,6 +10,21 @@ export type CommonCalculatorProps = Footnote &
     sourceBookDir?: string;
   };
 
+export interface CreditCalculatorParamsViewSettings {
+  /** @title Получаю зарплату на счёт в Россельхозбанке */
+  isShowSalaryClient?: boolean;
+  /** @title Работаю в бюджетной организации */
+  isShowStateEmployee?: boolean;
+  /** @title Получаю пенсию на карту Россельхозбанка */
+  isShowPensionClient?: boolean;
+  /** @title Комплексная страховая защита */
+  isShowInsurance?: boolean;
+}
+export interface CreditCalculatorProps extends CommonCalculatorProps {
+  /** @title Настройка отображения чекбоксов */
+  paramsViewSettings?: CreditCalculatorParamsViewSettings;
+}
+
 export interface BusinessDepositCalculatorProps extends CommonCalculatorProps {
   /** @title Сноска снизу блока */
   bottomFootnote?: string;
@@ -53,7 +68,7 @@ export interface CalculatorParams {
  * @default {"calcType": "CreditCalculatorForm"}
  */
 export type CreditCalculatorParamsDef = TitleProps &
-  CommonCalculatorProps & {
+  CreditCalculatorProps & {
     calcType: 'CreditCalculatorForm';
   };
 

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

@@ -3,7 +3,10 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { style } from '../../utils/style';
-import type { CommonCalculatorProps } from './CalculatorContent';
+import type {
+  CreditCalculatorParamsViewSettings,
+  CreditCalculatorProps,
+} from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { DEFAULT_MONTHS, DEFAULT_SUM } from './constants';
 import { Rate } from './Rate';
@@ -11,18 +14,23 @@ import { renderFootnote } from './renderFootnote';
 import { renderMonthsInput } from './renderMonthsInput';
 import { renderPaymentType } from './renderPaymentType';
 import { renderWantedSumInput } from './renderWantedSumInput';
-import { useCreditCalculatorParams } from './useCreditCalculatorParams';
+import { CreditCalculatorParams, useCreditCalculatorParams } from './useCreditCalculatorParams';
 
-export interface CreditCalculatorProp extends CommonCalculatorProps {
+export interface CreditCalculatorProp extends CreditCalculatorProps {
   className?: string;
 }
 
 export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
-  ({ className = '', sourceBookDir, buttons, footnote }) => {
+  ({ className = '', sourceBookDir, buttons, footnote, paramsViewSettings }) => {
     const [isAnnuity, toggleIsAnnuity] = useState(false);
-    const [isInsurance, toggleIsInsurance] = useState(true);
     const [isSalaryClient, toggleIsSalaryClient] = useState(false);
+    const handleIsSalaryClient = useCallback((_: boolean) => toggleIsSalaryClient(_), []);
     const [isStateEmployee, toggleIsStateEmployee] = useState(false);
+    const handleIsStateEmployee = useCallback((_: boolean) => toggleIsStateEmployee(_), []);
+    const [isPensionClient, toggleIsPensionClient] = useState(false);
+    const handleIsPensionClient = useCallback((_: boolean) => toggleIsPensionClient(_), []);
+    const [isInsurance, toggleIsInsurance] = useState(true);
+    const handleIsInsurance = useCallback((_: boolean) => toggleIsInsurance(_), []);
     const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
     const handleMoneyValue = useCallback((_: number) => setMoneyValue(_), []);
     const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
@@ -31,11 +39,16 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
       isAnnuity,
       isInsurance,
       isSalaryClient,
+      isPensionClient,
       isStateEmployee,
       moneyValue,
       monthsValue,
     };
-    const calculatorParams = useCreditCalculatorParams(userInputParams, sourceBookDir);
+    const calculatorParams = useCreditCalculatorParams(
+      userInputParams,
+      sourceBookDir,
+      paramsViewSettings,
+    );
 
     return (
       <section className={style('flex justify-between', className)}>
@@ -47,31 +60,17 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
           )}
           {renderMonthsInput('Срок кредита, месяцев', calculatorParams, handleMonthsValue)}
           <div className="mt-7">
-            <Checkbox
-              text="Получаю зарплату на счёт в Россельхозбанке"
-              checked={isSalaryClient}
-              onChange={toggleIsSalaryClient}
-            />
-            <Checkbox
-              className="mt-3"
-              text="Работаю в бюджетной организации"
-              checked={isStateEmployee}
-              onChange={toggleIsStateEmployee}
-            />
-            <Checkbox
-              className="mt-3"
-              text="Комплексная страховая защита"
-              checked={isInsurance}
-              onChange={toggleIsInsurance}
-            />
+            {renderCreditParamsForm({
+              ...calculatorParams,
+              ...paramsViewSettings,
+              handleIsSalaryClient,
+              handleIsStateEmployee,
+              handleIsPensionClient,
+              handleIsInsurance,
+            })}
           </div>
         </div>
-        <Rate
-          title="Ставка"
-          rate={calculatorParams.rate}
-          rateBlockClassName="tracking-[-25px]"
-          unit="%"
-        />
+        {renderRate(calculatorParams.rate)}
         <div className="w-full max-w-[350px]">
           <CalculatorValueBlock
             title={'Ежемесячный платеж'}
@@ -90,3 +89,64 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
     );
   },
 );
+
+const renderRate = (rate: number) => (
+  <Rate title="Ставка" rate={rate} rateBlockClassName="tracking-[-25px]" unit="%" />
+);
+
+type CreditParamsFormProps = CreditCalculatorParams &
+  CreditCalculatorParamsViewSettings & {
+    handleIsSalaryClient?: (value: boolean) => void;
+    handleIsStateEmployee?: (value: boolean) => void;
+    handleIsPensionClient?: (value: boolean) => void;
+    handleIsInsurance?: (value: boolean) => void;
+  };
+
+const renderCreditParamsForm = ({
+  isSalaryClient,
+  isStateEmployee,
+  isPensionClient,
+  isInsurance,
+  isShowSalaryClient,
+  isShowStateEmployee,
+  isShowPensionClient,
+  isShowInsurance,
+  handleIsSalaryClient,
+  handleIsStateEmployee,
+  handleIsPensionClient,
+  handleIsInsurance,
+}: CreditParamsFormProps) => (
+  <div>
+    {isShowSalaryClient ? (
+      <Checkbox
+        text="Получаю зарплату на счёт в Россельхозбанке"
+        checked={isSalaryClient}
+        onChange={handleIsSalaryClient}
+      />
+    ) : null}
+    {isShowStateEmployee ? (
+      <Checkbox
+        className="mt-3"
+        text="Работаю в бюджетной организации"
+        checked={isStateEmployee}
+        onChange={handleIsStateEmployee}
+      />
+    ) : null}
+    {isShowPensionClient ? (
+      <Checkbox
+        className="mt-3"
+        text="Получаю пенсию на карту Россельхозбанка"
+        checked={isPensionClient}
+        onChange={handleIsPensionClient}
+      />
+    ) : null}
+    {isShowInsurance ? (
+      <Checkbox
+        className="mt-3"
+        text="Комплексная страховая защита"
+        checked={isInsurance}
+        onChange={handleIsInsurance}
+      />
+    ) : null}
+  </div>
+);

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

@@ -4,7 +4,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
-import { CommonCalculatorProps, DepositCalculatorParams } from './CalculatorContent';
+import { CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { DEFAULT_MONTHS, DEFAULT_SUM } from './constants';
 import { Rate } from './Rate';
@@ -15,7 +15,7 @@ import { renderRegistrationType } from './renderRegistrationType';
 import { renderWantedSumInput } from './renderWantedSumInput';
 import { useDepositCalculatorParams } from './useDepositCalculatorParams';
 
-export interface DepositCalculatorProp extends DepositCalculatorParams, CommonCalculatorProps {
+export interface DepositCalculatorProp extends CommonCalculatorProps {
   className?: string;
 }
 

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

@@ -27,6 +27,7 @@ export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookParams
   maxMonths: DEFAULT_MAX_MONTHS,
   rate: 0,
   isSalaryClient: true,
+  isPensionClient: false,
   isStateEmployee: true,
   isInsurance: true,
 };

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

@@ -1,3 +1,4 @@
+import type { CreditCalculatorParamsViewSettings } from './CalculatorContent';
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
 import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
@@ -6,6 +7,7 @@ import { useCalculatorParams } from './useCalculatorParams';
 export interface CommonCreditParams {
   isInsurance: boolean;
   isSalaryClient: boolean;
+  isPensionClient: boolean;
   isStateEmployee: boolean;
 }
 export interface CreditCalculatorSourceBookParams extends CommonCreditParams {
@@ -35,18 +37,44 @@ export type CreditCalculatorData = {
 export const useCreditCalculatorParams = (
   userInputParams: CreditCalculatorUserInputParams,
   sourceBookDir?: string,
+  paramsViewSettings?: CreditCalculatorParamsViewSettings,
 ): CreditCalculatorParams => {
-  const { isInsurance, isSalaryClient, isStateEmployee, moneyValue, monthsValue } = userInputParams;
-
+  const { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
   const creditCalculatorSourceBookParams =
-    data?.rows?.find((_) => {
+    data?.rows?.find((row) => {
+      const isExcludeSalaryClient = !paramsViewSettings?.isShowSalaryClient;
+      const isExcludeStateEmployee = !paramsViewSettings?.isShowStateEmployee;
+      const isExcludePensionClient = !paramsViewSettings?.isShowPensionClient;
+      const isExcludeInsurance = !paramsViewSettings?.isShowInsurance;
+
       return (
-        isInsurance === _.isInsurance &&
-        isSalaryClient === _.isSalaryClient &&
-        isStateEmployee === _.isStateEmployee &&
-        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
-        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _)
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isSalaryClient',
+          isExclude: isExcludeSalaryClient,
+        }) &&
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isStateEmployee',
+          isExclude: isExcludeStateEmployee,
+        }) &&
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isPensionClient',
+          isExclude: isExcludePensionClient,
+        }) &&
+        checkRowByParam({
+          row,
+          userInputParams,
+          paramKey: 'isInsurance',
+          isExclude: isExcludeInsurance,
+        }) &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row)
       );
     }) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
@@ -62,3 +90,13 @@ export const useCreditCalculatorParams = (
     monthlyPayment,
   };
 };
+
+interface CheckRowByParamProps {
+  row: CreditCalculatorSourceBookParams;
+  userInputParams: CreditCalculatorUserInputParams;
+  paramKey: string;
+  isExclude: boolean;
+}
+
+const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }: CheckRowByParamProps) =>
+  isExclude || userInputParams[paramKey] === row[paramKey];

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { renderBlock } from '../../BlockRenderer/renderBlock';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -24,7 +25,6 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
     isCyclic = false,
     arrowsPadded = true,
     isPadding = true,
-    options,
     ...rest
   }) => {
     const { blocks: childBlocks } = rest.block || {};
@@ -59,18 +59,16 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
             gap={ITEMS_GAP}
             onVisibleIndicesChange={scroll.handleVisibleIndicesChange}
           >
-            {isBankHistoryCarousel
-              ? renderChildren({
-                  ...rest,
-                  options: {
-                    ...options,
-                    extraProps: {
+            {renderChildren({
+              ...rest,
+              renderProps: isBankHistoryCarousel
+                ? (block, options) =>
+                    renderBlock(block, options, {
                       blocksLength: childBlocks?.length,
                       activeIndex: activeIndex,
-                    },
-                  },
-                })
-              : renderChildren({ ...rest, options })}
+                    })
+                : renderBlock,
+            })}
           </SwipeListContainer>
           <CarouselScrollButtons
             scroll={scroll}

package/mobile/src/components/CarouselCatalogCard/CarouselCatalogCard.tsx

@@ -52,7 +52,8 @@ export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
 );
 
 const renderColorOption = (color: ProductColorVersion, i: number) => (
-  <span
+  <div
+    role="figure"
     key={String(i)}
     className={`w-6 h-6 ml-3 border border-solid border-main-divider rounded-full ${cardStyleMap[color]}`}
   />

package/mobile/src/components/CarouselEventCard/CarouselEventCard.tsx

@@ -1,41 +1,34 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { style } from '../../utils/style';
+import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { Text } from '../../ui-kit/Text/Text';
-import { useLink } from '../../hooks/useLink';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
+import { style } from '../../utils/style';
 import type { CarouselEventCardContent } from './CarouselEventCardContent';
-import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselEventCardProps extends CarouselEventCardContent, UniBlockProps {}
 
 export const CarouselEventCard = JSX<CarouselEventCardProps>(
   ({ className = '', icon, title, description, href, target, ...rest }) => {
-    const link = useLink();
-    const adjustedProps = link({ href, target });
-    const tagName = href ? 'a' : 'section';
-
     return (
-      <BlockWrapper
-        className={style('flex flex-col w-[365px]', className)}
-        extraProps={adjustedProps}
-        tag={tagName}
-        {...rest}
-      >
-        {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
-        {icon?.src ? <Img image={icon} /> : null}
-        {title ? (
-          <Heading headingType="h6" as="h4" className="text-left mb-2" title={title} />
-        ) : null}
-        {description ? (
-          <div className="mb-4">
-            <Text font="font-light" size="text-s" color="text-secondary-text">
-              {description}
-            </Text>
-          </div>
-        ) : null}
+      <BlockWrapper className={style('w-[365px]', className)} {...rest}>
+        <LinkWrapper className="flex flex-col" href={href} target={target}>
+          {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
+          {icon?.src ? <Img image={icon} /> : null}
+          {title ? (
+            <Heading headingType="h6" as="h4" className="text-left mb-2" title={title} />
+          ) : null}
+          {description ? (
+            <div className="mb-4">
+              <Text font="font-light" size="text-s" color="text-secondary-text">
+                {description}
+              </Text>
+            </div>
+          ) : null}
+        </LinkWrapper>
       </BlockWrapper>
     );
   },

package/mobile/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -1,17 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
+import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
+import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { List } from '../../ui-kit/List/List';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
-import { style } from '../../utils/style';
 import { Text } from '../../ui-kit/Text/Text';
-import { useLink } from '../../hooks/useLink';
-import type { BlockVersion } from '../../model/BlockVersion';
+import { style } from '../../utils/style';
+import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
 import type { CarouselProductCardContent, ListProps } from './CarouselProductCardContent';
-import type { Picture } from '../../model/Picture';
-import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselProductCardProps extends CarouselProductCardContent, UniBlockProps {}
 
@@ -32,31 +32,25 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
     version = 'primary',
     ...rest
   }) => {
-    const link = useLink();
-    const adjustedProps = link({ href, target });
-    const tagName = href ? 'a' : 'section';
-
     return (
       <BlockWrapper
         className={style(
-          'flex flex-col justify-between items-stretch min-w-[260px] h-full w-full p-6',
+          'justify-between min-w-[260px]',
           'box-border border-solid border border-gray',
           align,
           className,
         )}
-        extraProps={adjustedProps}
-        tag={tagName}
         version={version}
         {...rest}
       >
-        <div className="flex flex-col h-full">
+        <LinkWrapper className="p-6" href={href} target={target}>
           {renderImage(icon)}
           {renderCardTitle(headlineSmallVersion, title)}
           {renderDescription(description, title)}
           {renderItems(items, isDotted, version)}
           {renderAdditionalDescription(additionalDescription)}
-        </div>
-        {renderButtonsSection([button], { buttonClassName: 'mt-6 w-full' })}
+        </LinkWrapper>
+        {renderButtonsSection([button], { className: 'p-6 pt-0', isVertical: true })}
       </BlockWrapper>
     );
   },
@@ -72,7 +66,11 @@ const renderImage = (image?: Picture) => (
 );
 
 const renderCardTitle = (headlineSmallVersion: string, title?: string) =>
-  title ? <Text size={HEADLINE_SMALL_VERSION[headlineSmallVersion]}>{title}</Text> : null;
+  title ? (
+    <div>
+      <Text size={HEADLINE_SMALL_VERSION[headlineSmallVersion]}>{title}</Text>
+    </div>
+  ) : null;
 
 const renderDescription = (description?: string, title?: string) =>
   description ? (

package/mobile/src/components/CarouselProgramsCard/CarouselProgramsCard.tsx

@@ -4,34 +4,29 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { getIconWithVersion } from '../../utils/getIconWithVersion';
-import type { CarouselProgramsCardContent } from './CarouselProgramsCardContent';
-import { useLink } from '../../hooks/useLink';
 import { style } from '../../utils/style';
+import type { CarouselProgramsCardContent } from './CarouselProgramsCardContent';
 
 export interface CarouselTariffsCardProps extends CarouselProgramsCardContent, UniBlockProps {}
 
 export const CarouselProgramsCard = JSX<CarouselTariffsCardProps>(
   ({ className = '', title, icon, list = [], href, target, ...rest }) => {
-    const link = useLink();
-    const adjustedProps = link({ href, target });
-    const tagName = href ? 'a' : 'section';
-
     return (
-      <BlockWrapper
-        tag={tagName}
-        className={style('border border-gray flex min-w-[536px]', className)}
-        extraProps={adjustedProps}
-        {...rest}
-      >
-        <div className="w-[200px] min-w-[200px] self-center">
-          {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
-          {icon?.src ? <Img image={icon} /> : null}
-        </div>
-        <div className="p-8 pl-3 w-full">
-          {title ? <Heading className=" mb-3.5" headingType="h5" title={title} /> : null}
-          {list.length ? <div className="flex flex-col gap-3">{list?.map(renderList)}</div> : null}
-        </div>
+      <BlockWrapper className={style('border border-gray min-w-[536px]', className)} {...rest}>
+        <LinkWrapper className="flex" href={href} target={target}>
+          <div className="w-[200px] min-w-[200px] self-center">
+            {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
+            {icon?.src ? <Img image={icon} /> : null}
+          </div>
+          <div className="p-8 pl-3 w-full">
+            {title ? <Heading className=" mb-3.5" headingType="h5" title={title} /> : null}
+            {list.length ? (
+              <div className="flex flex-col gap-3">{list?.map(renderList)}</div>
+            ) : null}
+          </div>
+        </LinkWrapper>
       </BlockWrapper>
     );
   },