@redneckz/wildless-cms-uni-blocks 0.13.7 → 0.13.9

package/mobile/lib/components/DepositFiltration/DepositFiltration.js.map

@@ -1 +1 @@
-{"version":3,"file":"DepositFiltration.js","sourceRoot":"","sources":["../../../src/components/DepositFiltration/DepositFiltration.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK1C,MAAM,sBAAsB,GAAG;IAC7B,GAAG,EAAE,GAAG;IACR,MAAM,EAAE;QACN,GAAG,EAAE,CAAC;QACN,GAAG,EAAE,EAAE;KACR;CACF,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,eAAe,GAAG,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,iBAAiB,GAAqC,GAAG,CACpE,CAAC,EAAE,SAAS,EAAE,gBAAgB,GAAG,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpF,MAAM,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,WAAW,EAAE,GAAG,IAAI,kBAAkB,CAAC;IAExD,MAAM,MAAM,GAAG,CACb,0BACE,KAAC,aAAa,IACZ,KAAK,EAAE,QAAQ,EAAE,KAAK,EACtB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,eAAe,KAChB,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GACnD,EACF,KAAC,UAAU,IACT,KAAK,EAAE,WAAW,EAAE,KAAK,EACzB,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,EAC/B,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,kBAAkB,EAC3C,GAAG,EAAE,QAAQ,KACT,KAAK,CAAC,QAAQ,EAAE;oBAClB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;oBACxC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG;iBACzB,CAAC,GACF,IACE,CACP,CAAC;IAEF,OAAO,CACL,MAAC,YAAY,IACX,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,EAC1C,cAAc,EAAC,KAAK,EACpB,OAAO,EAAC,aAAa,KACjB,IAAI,aAEP,oBAAoB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EACxF,KAAC,mBAAmB,IAAC,eAAe,EAAE,eAAe,KAAM,IAAI,GAAI,IACtD,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,iBAAiB,CAAC,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;AAClD,iBAAiB,CAAC,WAAW,GAAG,CAAC,OAAkC,EAAE,EAAE,CACrE,OAAO,EAAE,gBAAgB,IAAI,EAAE,CAAC"}
+{"version":3,"file":"DepositFiltration.js","sourceRoot":"","sources":["../../../src/components/DepositFiltration/DepositFiltration.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/components/DepositFiltration/DepositFiltrationContent.d.ts

@@ -1,4 +1,4 @@
-import type { BaseFiltrationInnerContent, NumberRange, NumberValue, StringArray } from '../../ui-kit/BaseFiltration/BaseFiltrationContent';
+import type { BaseFiltrationInnerContent, NumberRange, StringArray } from '../../ui-kit/BaseFiltration/BaseFiltrationContent';
 export declare type DepositFiltrationSchema = {
     /** @title Валюта */
     currency?: StringArray;
@@ -7,7 +7,7 @@ export declare type DepositFiltrationSchema = {
     /** @title Выплата процентов */
     percents?: StringArray;
     /** @hidden */
-    sum?: NumberValue;
+    sum?: NumberRange;
     /** @hidden */
     period?: NumberRange;
 };

package/mobile/lib/ui-kit/InputRange/renderRangeWithTicks.js

@@ -2,8 +2,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { parseDecimal } from './parseDecimal.js';
 export function renderRangeWithTicks({ list = [], min, max, step, value = list[0] || min, disabled, onChange, }) {
     const rangeValue = list.length ? list.indexOf(value) : value;
+    const rangeValueShift = rangeValue > min ? rangeValue - min : 0;
     const inputStyle = {
-        backgroundSize: `${(((rangeValue - min) * 100) / (max - min)).toFixed(2)}% 100%`,
+        backgroundSize: `${((rangeValueShift * 100) / (max - min)).toFixed(2)}% 100%`,
     };
     return (_jsxs("div", { children: [list.length ? (_jsx("div", { className: "absolute w-full flex justify-between -bottom-[3px] px-m", children: list.map((_, i) => (_jsx("div", { className: `w-2 h-2 rounded-full ${rangeValue <= i || disabled ? 'bg-gray' : 'bg-primary-main'}` }, String(i)))) })) : null, _jsx("div", { className: "absolute inset-x-0 -bottom-1 px-m leading-[18px]", children: _jsx("input", { className: "box-border w-full m-0 cursor-pointer slider relative z-10", style: inputStyle, type: "range", min: min, max: max, step: step, value: rangeValue, disabled: disabled, onInput: ((e) => {
                         const rawValue = parseDecimal(e.target?.value);

package/mobile/lib/ui-kit/InputRange/renderRangeWithTicks.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderRangeWithTicks.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/renderRangeWithTicks.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAY9C,MAAM,UAAU,oBAAoB,CAAC,EACnC,IAAI,GAAG,EAAE,EACT,GAAG,EACH,GAAG,EACH,IAAI,EACJ,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EACtB,QAAQ,EACR,QAAQ,GACY;IACpB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KACjF,CAAC;IAEF,OAAO,CACL,0BACG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,yDAAyD,YACrE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAClB,cAEE,SAAS,EAAE,wBACT,UAAU,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAC5C,EAAE,IAHG,MAAM,CAAC,CAAC,CAAC,CAId,CACH,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,EACR,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,2DAA2D,EACrE,KAAK,EAAE,UAAU,EACjB,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EACL,CAAC,CAAC,CAAkC,EAAE,EAAE;wBACtC,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACzD,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oBACtC,CAAC,CAAQ,GAEX,GACE,IACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"renderRangeWithTicks.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/renderRangeWithTicks.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAY9C,MAAM,UAAU,oBAAoB,CAAC,EACnC,IAAI,GAAG,EAAE,EACT,GAAG,EACH,GAAG,EACH,IAAI,EACJ,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EACtB,QAAQ,EACR,QAAQ,GACY;IACpB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,MAAM,eAAe,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC9E,CAAC;IAEF,OAAO,CACL,0BACG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,yDAAyD,YACrE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAClB,cAEE,SAAS,EAAE,wBACT,UAAU,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAC5C,EAAE,IAHG,MAAM,CAAC,CAAC,CAAC,CAId,CACH,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,EACR,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,2DAA2D,EACrE,KAAK,EAAE,UAAU,EACjB,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EACL,CAAC,CAAC,CAAkC,EAAE,EAAE;wBACtC,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACzD,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oBACtC,CAAC,CAAQ,GAEX,GACE,IACF,CACP,CAAC;AACJ,CAAC"}

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

@@ -1,21 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { style } from '../../utils/style';
 import type { BusinessDepositCalculatorProps } from './CalculatorContent';
-import { renderFootnote } from './renderFootnote';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
+import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { BUSINESS_DEFAULT_DAYS, BUSINESS_DEFAULT_SUM } from './constants';
+import { renderDaysInput } from './renderDaysInput';
+import { renderFootnote } from './renderFootnote';
+import { renderInterestPayment } from './renderInterestPayment';
+import { renderRate } from './renderRate';
+import { renderWantedSumInput } from './renderWantedSumInput';
 import {
   BusinessDepositCalculatorParams,
   BusinessDepositCalculatorUserInputParams,
   useBusinessDepositCalculatorParams,
 } from './useBusinessDepositCalculatorParams';
-import { renderWantedSumInput } from './renderWantedSumInput';
-import { renderDaysInput } from './renderDaysInput';
-import { renderInterestPayment } from './renderInterestPayment';
-import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { renderRate } from './renderRate';
-import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
-import { style } from '../../utils/style';
 
 export interface BusinessDepositCalculatorProp extends BusinessDepositCalculatorProps {
   className?: string;
@@ -33,7 +33,7 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
     });
 
     const calculatorParams = useBusinessDepositCalculatorParams(userInputParams, sourceBookDir);
-    const { income, finalSum, rate, isShowUnknownRate, depositeName } = calculatorParams;
+    const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (
       <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
@@ -65,7 +65,7 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
           rate,
           depositeName,
           isShowDepositeName,
-          isShowUnknownRate,
+          isUnavailableByTerm,
         })}
         <div className="flex flex-col gap-2xl sm:w-96">
           {renderDepositResults(finalSum, income)}

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

@@ -14,15 +14,15 @@ import {
   REFINANCING_DEFAULT_SUM,
   REFINANCING_OLD_DEFAULT_SUM,
 } from './constants';
-import { Rate } from './Rate';
 import { renderFootnote } from './renderFootnote';
 import { renderMonthsInput } from './renderMonthsInput';
+import { renderPaymentType } from './renderPaymentType';
+import { renderRate } from './renderRate';
 import { renderWantedSumInput } from './renderWantedSumInput';
 import {
   RefinancingCalculatorParams,
   useRefinancingCalculatorParams,
 } from './useRefinancingCalculatorParams';
-import { renderPaymentType } from './renderPaymentType';
 
 export interface RefinancingCalculatorProp extends RefinancingCalculatorProps {
   className?: string;
@@ -86,13 +86,10 @@ export const RefinancingCalculatorForm = JSX<RefinancingCalculatorProp>(
               })
             : null}
         </div>
-        <Rate
-          title="Ставка"
-          rate={calculatorParams.rate}
-          fractionDigits={1}
-          rateBlockClassName="tracking-[-25px]"
-          unit="%"
-        />
+        {renderRate({
+          rate: calculatorParams.rate,
+          fractionDigits: 1,
+        })}
         <div className="flex flex-col gap-2xl sm:w-96">
           <CalculatorValueBlock
             title={'Ежемесячный платеж'}

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

@@ -5,20 +5,30 @@ import { Text } from '../../ui-kit/Text/Text';
 
 export interface UnknownRateProps {
   title?: string;
+  isUnavailableByTerm?: boolean;
 }
 
-export const UnknownRate = JSX<UnknownRateProps>(({ title = 'Ставка' }) => (
-  <div>
-    <Text size="text-l" font="font-light" color="text-secondary-text">
-      {title}
-    </Text>
-    <div className="mt-2xs pt-2xs pl-lg pb-xs">
-      <Icon name="PercentIcon" width="90" height="85" />
+export const UnknownRate = JSX<UnknownRateProps>(
+  ({ title = 'Ставка', isUnavailableByTerm = false }) => (
+    <div>
+      <Text size="text-l" font="font-light" color="text-secondary-text">
+        {title}
+      </Text>
+      <div className="mt-2xs pt-2xs pl-lg pb-xs">
+        <Icon name="PercentIcon" width="90" height="85" />
+      </div>
+      <div className="w-64 mt-m">
+        {isUnavailableByTerm ? (
+          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+            Процентная ставка для срока <strong>1-30 дней</strong> устанавливается при обращении в
+            Банк
+          </Paragraph>
+        ) : (
+          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+            Выберите другую сумму или срок
+          </Paragraph>
+        )}
+      </div>
     </div>
-    <div className="w-64 mt-m">
-      <Paragraph size="text-xl" font="font-light" color="text-primary-text">
-        Процентная ставка для срока <strong>1-30 дней</strong> устанавливается при обращении в Банк
-      </Paragraph>
-    </div>
-  </div>
-));
+  ),
+);

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

@@ -36,7 +36,7 @@ export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookRatePar
   maxSum: DEFAULT_MAX_SUM,
   minMonths: DEFAULT_MIN_MONTHS,
   maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 12.5,
+  rate: 0,
   isSalaryClient: false,
   isPensionClient: false,
   isStateEmployee: false,
@@ -52,7 +52,7 @@ export const DEFAULT_REFINANCING_CALCULATOR_PARAMS: RefinancingCalculatorSourceB
   maxSumExtra: REFINANCING_EXTRA_MAX_SUM,
   minMonths: DEFAULT_REFINANCING_MIN_MONTHS,
   maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 7.5,
+  rate: 0,
   isExtraMoney: false,
   isSalaryClient: false,
   isInsurance: true,

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

@@ -1,18 +1,25 @@
-import { UnknownRate } from './UnknownRate';
-import { Rate } from './Rate';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
+import { Rate } from './Rate';
+import { UnknownRate } from './UnknownRate';
 
 interface RenderRateProps {
   rate: number;
   depositeName?: string;
-  isShowUnknownRate?: boolean;
+  isUnavailableByTerm?: boolean;
   isShowDepositeName?: boolean;
+  fractionDigits?: number;
 }
 
-const renderDesktopRate = ({ rate, depositeName, isShowDepositeName }: RenderRateProps) => (
+const renderDesktopRate = ({
+  rate,
+  depositeName,
+  fractionDigits,
+  isShowDepositeName,
+}: RenderRateProps) => (
   <Rate
     rate={rate}
     depositeName={depositeName}
+    fractionDigits={fractionDigits}
     isShowDepositeName={isShowDepositeName}
     rateBlockClassName="tracking-[-25px]"
     unit="%"
@@ -24,8 +31,8 @@ const renderMobileRate = ({ rate }: RenderRateProps) => (
 );
 
 export const renderRate = (props: RenderRateProps) => {
-  if (props.isShowUnknownRate) {
-    return <UnknownRate />;
+  if (props.rate === 0) {
+    return <UnknownRate isUnavailableByTerm={props.isUnavailableByTerm} />;
   }
 
   return (

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

@@ -34,7 +34,7 @@ export interface BusinessDepositCalculatorParams
   income?: number;
   finalSum?: number;
   isDisabledOperatingDeposit?: boolean;
-  isShowUnknownRate?: boolean;
+  isUnavailableByTerm?: boolean;
 }
 
 export type BusinessDepositCalculatorData = {
@@ -66,7 +66,7 @@ export const useBusinessDepositCalculatorParams = (
       ...DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS,
       ...userInputParams,
       isDisabledOperatingDeposit,
-      isShowUnknownRate: true,
+      isUnavailableByTerm: true,
     };
   }
   const businessDepositCalculatorSourceBookParams =

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

@@ -1,5 +1,4 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { clamp } from '../../utils/clamp';
 import type { CreditCalculatorParamsViewSettings } from './CalculatorContent';
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getCreditCalculatorLimitParams } from './getCreditCalculatorLimitParams';
@@ -51,7 +50,7 @@ export const useCreditCalculatorParams = (
   sourceBookDir?: string,
   paramsViewSettings?: CreditCalculatorParamsViewSettings,
 ): CreditCalculatorParams => {
-  let { moneyValue, monthsValue } = userInputParams;
+  const { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
   const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
   const limitRows = data?.limitRows || [];
@@ -72,9 +71,6 @@ export const useCreditCalculatorParams = (
     rateRows,
   );
 
-  moneyValue = clamp(moneyValue, minSum, maxSum);
-  monthsValue = clamp(monthsValue, minMonths, maxMonths);
-
   const creditCalculatorRateParams = getCreditCalculatorRateParams({
     rateRows,
     userInputParams,

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

@@ -1,12 +1,11 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { clamp } from '../../utils/clamp';
-import { DEFAULT_REFINANCING_CALCULATOR_PARAMS, REFINANCING_CALC_DEFAULT_DIR } from './constants';
-import { getLimitRangeByKeys } from './rangeHelpers';
-import { useCalculatorParams } from './useCalculatorParams';
 import { RefinancingCalculatorParamsViewSettings } from './CalculatorContent';
+import { DEFAULT_REFINANCING_CALCULATOR_PARAMS, REFINANCING_CALC_DEFAULT_DIR } from './constants';
+import { getMonthlyPayment } from './getMonthlyPayment';
 import { getRefinancingCalculatorLimitParams } from './getRefinancingCalculatorLimitParams';
 import { getRefinancingCalculatorRateParams } from './getRefinancingCalculatorRateParams';
-import { getMonthlyPayment } from './getMonthlyPayment';
+import { getLimitRangeByKeys } from './rangeHelpers';
+import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonRefinancingParams {
   isSalaryClient: boolean;
@@ -61,7 +60,7 @@ export const useRefinancingCalculatorParams = (
   sourceBookDir?: string,
   paramsViewSettings?: RefinancingCalculatorParamsViewSettings,
 ): RefinancingCalculatorParams => {
-  let { moneyValue, monthsValue, oldMonthlyPayment, moneyExtra } = userInputParams;
+  const { moneyValue, monthsValue, oldMonthlyPayment, moneyExtra } = userInputParams;
   const data = useCalculatorParams<RefinancingCalculatorData>(
     sourceBookDir || REFINANCING_CALC_DEFAULT_DIR,
   );
@@ -79,29 +78,12 @@ export const useRefinancingCalculatorParams = (
     rateRows,
   );
 
-  const { minSumOld, maxSumOld } = getLimitRangeByKeys(
-    ['minSumOld', 'maxSumOld'],
-    sourceBookLimitParams,
-    rateRows,
-  );
-
-  const { minSumExtra, maxSumExtra } = getLimitRangeByKeys(
-    ['minSumExtra', 'maxSumExtra'],
-    sourceBookLimitParams,
-    rateRows,
-  );
-
   const { minMonths, maxMonths } = getLimitRangeByKeys(
     ['minMonths', 'maxMonths'],
     sourceBookLimitParams,
     rateRows,
   );
 
-  moneyValue = clamp(moneyValue, minSum, maxSum);
-  oldMonthlyPayment = clamp(oldMonthlyPayment, minSumOld, maxSumOld);
-  moneyExtra = clamp(moneyExtra, minSumExtra, maxSumExtra);
-  monthsValue = clamp(monthsValue, minMonths, maxMonths);
-
   const refinancingCalculatorSourceBookRateParams = getRefinancingCalculatorRateParams({
     rateRows,
     userInputParams,

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

@@ -2,9 +2,9 @@ import type { UniBlockContent } from '../../model/JSXBlock';
 
 /**
  * @title Размер карточек
- * @enumNames ["Нормальный", "Большой"]
+ * @enumNames ["Маленький", "Нормальный", "Большой"]
  */
-export type CardSizeMode = 'normal' | 'big';
+export type CardSizeMode = 'small' | 'normal' | 'big';
 
 /**
  * @title Карусель

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

@@ -10,6 +10,7 @@ import type { CardSizeMode } from './CarouselContent';
 const cardBaseStyle = 'relative h-full';
 
 const CARD_SIZE_MAP: Record<CardSizeMode, string> = {
+  small: 'sm:min-w-64',
   normal: 'sm:min-w-96',
   big: 'sm:min-w-[515px]',
 };

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

@@ -30,7 +30,17 @@
       },
       "sum": {
         "title": "Сумма",
-        "type": "number"
+        "type": "object",
+        "properties": {
+          "min": {
+            "title": "Минимум",
+            "type": "number"
+          },
+          "max": {
+            "title": "Максимум",
+            "type": "number"
+          }
+        }
       },
       "period": {
         "title": "Срок",

package/mobile/src/components/DepositFiltration/DepositFiltration.tsx

@@ -11,25 +11,28 @@ import type { DepositFiltrationContent } from './DepositFiltrationContent';
 
 interface DepositFiltrationProps extends DepositFiltrationContent, UniBlockProps {}
 
+const DEFAULT_MIN_MONTHS = 3;
+const DEFAULT_MAX_MONTHS = 60;
+
+const DEFAULT_MIN_SUM = 500;
+const DEFAULT_MAX_SUM = 1000000000;
+
 const initialFiltrationState = {
-  sum: 500,
+  sum: {
+    min: 10000,
+    max: DEFAULT_MAX_SUM,
+  },
   period: {
     min: 3,
     max: 36,
   },
 };
 
-const DEFAULT_MIN_MONTHS = 3;
-const DEFAULT_MAX_MONTHS = 36;
-
-const DEFAULT_MIN_SUM = 500;
-const DEFAULT_MAX_SUM = 1000000000;
-
 export const DepositFiltration: JSXBlock<DepositFiltrationProps> = JSX<DepositFiltrationProps>(
   ({ className, filtrationSchema = {}, resetButton, sumInput, periodInput, ...rest }) => {
     const [filtrationState, { field, reset }] = useForm(initialFiltrationState);
 
-    const maxValue = periodInput?.max || DEFAULT_MAX_MONTHS;
+    const maxPeriodValue = periodInput?.max || DEFAULT_MAX_MONTHS;
 
     const Inputs = (
       <div>
@@ -37,15 +40,18 @@ export const DepositFiltration: JSXBlock<DepositFiltrationProps> = JSX<DepositFi
           label={sumInput?.title}
           min={DEFAULT_MIN_SUM}
           max={DEFAULT_MAX_SUM}
-          {...field('sum', { parse: Number, format: String })}
+          {...field('sum', {
+            parse: (min) => ({ min: Number(min), max: DEFAULT_MAX_SUM }),
+            format: ({ min }) => String(min),
+          })}
         />
         <InputRange
           title={periodInput?.title}
-          items={['От 3 мес', 'До 3 лет']}
+          items={['От 3 мес', 'До 5 лет']}
           min={periodInput?.min || DEFAULT_MIN_MONTHS}
-          max={maxValue}
+          max={maxPeriodValue}
           {...field('period', {
-            parse: (min) => ({ min, max: maxValue }),
+            parse: (min) => ({ min, max: maxPeriodValue }),
             format: ({ min }) => min,
           })}
         />

package/mobile/src/components/DepositFiltration/DepositFiltrationContent.ts

@@ -1,7 +1,6 @@
 import type {
   BaseFiltrationInnerContent,
   NumberRange,
-  NumberValue,
   StringArray,
 } from '../../ui-kit/BaseFiltration/BaseFiltrationContent';
 
@@ -13,7 +12,7 @@ export type DepositFiltrationSchema = {
   /** @title Выплата процентов */
   percents?: StringArray;
   /** @hidden */
-  sum?: NumberValue;
+  sum?: NumberRange;
   /** @hidden */
   period?: NumberRange;
 };

package/mobile/src/ui-kit/InputRange/renderRangeWithTicks.tsx

@@ -20,8 +20,9 @@ export function renderRangeWithTicks({
   onChange,
 }: RangeWithTicksProps) {
   const rangeValue = list.length ? list.indexOf(value) : value;
+  const rangeValueShift = rangeValue > min ? rangeValue - min : 0;
   const inputStyle = {
-    backgroundSize: `${(((rangeValue - min) * 100) / (max - min)).toFixed(2)}% 100%`,
+    backgroundSize: `${((rangeValueShift * 100) / (max - min)).toFixed(2)}% 100%`,
   };
 
   return (

package/package.json

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

package/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -1,21 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { style } from '../../utils/style';
 import type { BusinessDepositCalculatorProps } from './CalculatorContent';
-import { renderFootnote } from './renderFootnote';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
+import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { BUSINESS_DEFAULT_DAYS, BUSINESS_DEFAULT_SUM } from './constants';
+import { renderDaysInput } from './renderDaysInput';
+import { renderFootnote } from './renderFootnote';
+import { renderInterestPayment } from './renderInterestPayment';
+import { renderRate } from './renderRate';
+import { renderWantedSumInput } from './renderWantedSumInput';
 import {
   BusinessDepositCalculatorParams,
   BusinessDepositCalculatorUserInputParams,
   useBusinessDepositCalculatorParams,
 } from './useBusinessDepositCalculatorParams';
-import { renderWantedSumInput } from './renderWantedSumInput';
-import { renderDaysInput } from './renderDaysInput';
-import { renderInterestPayment } from './renderInterestPayment';
-import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { renderRate } from './renderRate';
-import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
-import { style } from '../../utils/style';
 
 export interface BusinessDepositCalculatorProp extends BusinessDepositCalculatorProps {
   className?: string;
@@ -33,7 +33,7 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
     });
 
     const calculatorParams = useBusinessDepositCalculatorParams(userInputParams, sourceBookDir);
-    const { income, finalSum, rate, isShowUnknownRate, depositeName } = calculatorParams;
+    const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (
       <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
@@ -65,7 +65,7 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
           rate,
           depositeName,
           isShowDepositeName,
-          isShowUnknownRate,
+          isUnavailableByTerm,
         })}
         <div className="flex flex-col gap-2xl sm:w-96">
           {renderDepositResults(finalSum, income)}

package/src/components/Calculator/RefinancingCalculatorForm.tsx

@@ -14,15 +14,15 @@ import {
   REFINANCING_DEFAULT_SUM,
   REFINANCING_OLD_DEFAULT_SUM,
 } from './constants';
-import { Rate } from './Rate';
 import { renderFootnote } from './renderFootnote';
 import { renderMonthsInput } from './renderMonthsInput';
+import { renderPaymentType } from './renderPaymentType';
+import { renderRate } from './renderRate';
 import { renderWantedSumInput } from './renderWantedSumInput';
 import {
   RefinancingCalculatorParams,
   useRefinancingCalculatorParams,
 } from './useRefinancingCalculatorParams';
-import { renderPaymentType } from './renderPaymentType';
 
 export interface RefinancingCalculatorProp extends RefinancingCalculatorProps {
   className?: string;
@@ -86,13 +86,10 @@ export const RefinancingCalculatorForm = JSX<RefinancingCalculatorProp>(
               })
             : null}
         </div>
-        <Rate
-          title="Ставка"
-          rate={calculatorParams.rate}
-          fractionDigits={1}
-          rateBlockClassName="tracking-[-25px]"
-          unit="%"
-        />
+        {renderRate({
+          rate: calculatorParams.rate,
+          fractionDigits: 1,
+        })}
         <div className="flex flex-col gap-2xl sm:w-96">
           <CalculatorValueBlock
             title={'Ежемесячный платеж'}

package/src/components/Calculator/UnknownRate.tsx

@@ -5,20 +5,30 @@ import { Text } from '../../ui-kit/Text/Text';
 
 export interface UnknownRateProps {
   title?: string;
+  isUnavailableByTerm?: boolean;
 }
 
-export const UnknownRate = JSX<UnknownRateProps>(({ title = 'Ставка' }) => (
-  <div>
-    <Text size="text-l" font="font-light" color="text-secondary-text">
-      {title}
-    </Text>
-    <div className="mt-2xs pt-2xs pl-lg pb-xs">
-      <Icon name="PercentIcon" width="90" height="85" />
+export const UnknownRate = JSX<UnknownRateProps>(
+  ({ title = 'Ставка', isUnavailableByTerm = false }) => (
+    <div>
+      <Text size="text-l" font="font-light" color="text-secondary-text">
+        {title}
+      </Text>
+      <div className="mt-2xs pt-2xs pl-lg pb-xs">
+        <Icon name="PercentIcon" width="90" height="85" />
+      </div>
+      <div className="w-64 mt-m">
+        {isUnavailableByTerm ? (
+          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+            Процентная ставка для срока <strong>1-30 дней</strong> устанавливается при обращении в
+            Банк
+          </Paragraph>
+        ) : (
+          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+            Выберите другую сумму или срок
+          </Paragraph>
+        )}
+      </div>
     </div>
-    <div className="w-64 mt-m">
-      <Paragraph size="text-xl" font="font-light" color="text-primary-text">
-        Процентная ставка для срока <strong>1-30 дней</strong> устанавливается при обращении в Банк
-      </Paragraph>
-    </div>
-  </div>
-));
+  ),
+);

package/src/components/Calculator/constants.ts

@@ -36,7 +36,7 @@ export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookRatePar
   maxSum: DEFAULT_MAX_SUM,
   minMonths: DEFAULT_MIN_MONTHS,
   maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 12.5,
+  rate: 0,
   isSalaryClient: false,
   isPensionClient: false,
   isStateEmployee: false,
@@ -52,7 +52,7 @@ export const DEFAULT_REFINANCING_CALCULATOR_PARAMS: RefinancingCalculatorSourceB
   maxSumExtra: REFINANCING_EXTRA_MAX_SUM,
   minMonths: DEFAULT_REFINANCING_MIN_MONTHS,
   maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 7.5,
+  rate: 0,
   isExtraMoney: false,
   isSalaryClient: false,
   isInsurance: true,