@redneckz/wildless-cms-uni-blocks 0.12.10 → 0.12.12

package/src/components/Calculator/getRefinancingCalculatorLimitParams.ts

@@ -0,0 +1,25 @@
+import { RefinancingCalculatorParamsViewSettings } from './CalculatorContent';
+import {
+  RefinancingCalculatorSourceBookLimitParams,
+  RefinancingCalculatorUserInputParams,
+} from './useRefinancingCalculatorParams';
+import { checkRefinancingSourceBookRowCommonParams } from './checkRefinancingSourceBookRowCommonParams';
+
+interface GetRefinancingCalculatorLimitParamsProps {
+  limitRows: RefinancingCalculatorSourceBookLimitParams[];
+  userInputParams: RefinancingCalculatorUserInputParams;
+  paramsViewSettings?: RefinancingCalculatorParamsViewSettings;
+}
+
+export const getRefinancingCalculatorLimitParams = ({
+  limitRows,
+  userInputParams,
+  paramsViewSettings,
+}: GetRefinancingCalculatorLimitParamsProps) =>
+  limitRows?.find((row) =>
+    checkRefinancingSourceBookRowCommonParams({
+      row,
+      userInputParams,
+      paramsViewSettings,
+    }),
+  );

package/src/components/Calculator/getRefinancingCalculatorRateParams.ts

@@ -0,0 +1,40 @@
+import { RefinancingCalculatorParamsViewSettings } from './CalculatorContent';
+import { DEFAULT_REFINANCING_CALCULATOR_PARAMS } from './constants';
+import { checkRangeByKeys } from './rangeHelpers';
+import {
+  RefinancingCalculatorSourceBookRateParams,
+  RefinancingCalculatorUserInputParams,
+} from './useRefinancingCalculatorParams';
+import { checkRefinancingSourceBookRowCommonParams } from './checkRefinancingSourceBookRowCommonParams';
+
+interface GetRefinancingCalculatorRateParamsProps {
+  rateRows: RefinancingCalculatorSourceBookRateParams[];
+  userInputParams: RefinancingCalculatorUserInputParams;
+  paramsViewSettings?: RefinancingCalculatorParamsViewSettings;
+  moneyValue: number;
+  monthsValue: number;
+  moneyExtra: number;
+  oldMonthlyPayment: number;
+}
+
+export const getRefinancingCalculatorRateParams = ({
+  rateRows = [],
+  userInputParams,
+  paramsViewSettings,
+  moneyValue,
+  monthsValue,
+  oldMonthlyPayment,
+  moneyExtra,
+}: GetRefinancingCalculatorRateParamsProps) =>
+  rateRows?.find(
+    (row) =>
+      checkRefinancingSourceBookRowCommonParams({
+        row,
+        userInputParams,
+        paramsViewSettings,
+      }) &&
+      checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
+      checkRangeByKeys(oldMonthlyPayment, ['minSumOld', 'maxSumOld'], row) &&
+      checkRangeByKeys(moneyExtra, ['minSumExtra', 'maxSumExtra'], row) &&
+      checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
+  ) || DEFAULT_REFINANCING_CALCULATOR_PARAMS;

package/src/components/Calculator/rangeHelpers.ts

@@ -1,6 +1,6 @@
+import { min } from '../../utils/minBy';
 import { max } from '../../utils/maxBy';
 import { mergeIntervals } from '../../utils/mergeIntervals';
-import { min } from '../../utils/minBy';
 
 export const getLimitRangeByKeys = <
   MinKey extends string,
@@ -26,8 +26,12 @@ export const getRangeByKeys = <
   [minKey, maxKey]: [MinKey, MaxKey],
   rows: T[] = [],
 ) => ({
-  [minKey]: rows.length ? min(rows.filter((row) => row[minKey]).map((row) => row[minKey])) : 0,
-  [maxKey]: rows.length ? max(rows.filter((row) => row[maxKey]).map((row) => row[maxKey])) : 0,
+  [minKey]: rows.length
+    ? min(rows.filter((row) => typeof row[minKey] === 'number').map((row) => row[minKey]))
+    : 0,
+  [maxKey]: rows.length
+    ? max(rows.filter((row) => typeof row[minKey] === 'number').map((row) => row[maxKey]))
+    : 0,
 });
 
 export const getMergeRangesByKeys = <

package/src/components/Calculator/useRefinancingCalculatorParams.ts

@@ -0,0 +1,136 @@
+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 { getRefinancingCalculatorLimitParams } from './getRefinancingCalculatorLimitParams';
+import { getRefinancingCalculatorRateParams } from './getRefinancingCalculatorRateParams';
+import { getMonthlyPayment } from './getMonthlyPayment';
+
+export interface CommonRefinancingParams {
+  isSalaryClient: boolean;
+  isInsurance: boolean;
+  isExtraMoney: boolean;
+}
+export interface RefinancingCalculatorSourceBookRateParams extends CommonRefinancingParams {
+  minSum: number;
+  maxSum: number;
+  minSumOld: number;
+  maxSumOld: number;
+  minSumExtra: number;
+  maxSumExtra: number;
+  minMonths: number;
+  maxMonths: number;
+  rate: number;
+}
+
+export interface RefinancingCalculatorSourceBookLimitParams extends CommonRefinancingParams {
+  minSum: number;
+  maxSum: number;
+  minSumOld: number;
+  maxSumOld: number;
+  minSumExtra: number;
+  maxSumExtra: number;
+  minMonths: number;
+  maxMonths: number;
+}
+
+export interface RefinancingCalculatorUserInputParams extends CommonRefinancingParams {
+  isAnnuity: boolean;
+  moneyValue: number;
+  oldMonthlyPayment: number;
+  moneyExtra: number;
+  monthsValue: number;
+}
+
+export interface RefinancingCalculatorParams
+  extends RefinancingCalculatorSourceBookRateParams,
+    RefinancingCalculatorUserInputParams {
+  monthlyPayment: number;
+  benefit: number;
+}
+
+export type RefinancingCalculatorData = {
+  rateRows?: RefinancingCalculatorSourceBookRateParams[];
+  limitRows?: RefinancingCalculatorSourceBookLimitParams[];
+};
+
+export const useRefinancingCalculatorParams = (
+  userInputParams: RefinancingCalculatorUserInputParams,
+  sourceBookDir?: string,
+  paramsViewSettings?: RefinancingCalculatorParamsViewSettings,
+): RefinancingCalculatorParams => {
+  let { 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 sourceBookLimitParams = getRefinancingCalculatorLimitParams({
+    limitRows,
+    userInputParams,
+    paramsViewSettings,
+  });
+
+  const { minSum, maxSum } = getLimitRangeByKeys(
+    ['minSum', 'maxSum'],
+    sourceBookLimitParams,
+    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,
+    paramsViewSettings,
+    moneyValue,
+    monthsValue,
+    oldMonthlyPayment,
+    moneyExtra,
+  });
+  const { rate } = refinancingCalculatorSourceBookRateParams;
+  const monthlyPayment = getMonthlyPayment(rate, userInputParams);
+
+  const benefit = userInputParams.oldMonthlyPayment - monthlyPayment;
+
+  return useMemo(
+    () => ({
+      ...refinancingCalculatorSourceBookRateParams,
+      ...userInputParams,
+      minSum,
+      maxSum,
+      minMonths,
+      maxMonths,
+      moneyValue,
+      monthsValue,
+      oldMonthlyPayment,
+      moneyExtra,
+      monthlyPayment,
+      benefit,
+    }),
+    [userInputParams, data],
+  );
+};

package/src/components/CardTransfer/CardTransfer.tsx

@@ -44,7 +44,7 @@ export const CardTransfer = JSX<CardTransferProps>(
     return (
       <BlockWrapper
         className={style('flex flex-col items-center', className)}
-        defaultPadding="p-default"
+        defaultPadding="p-6xl"
         {...rest}
       >
         {title ? (

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

@@ -1,19 +1,19 @@
 import '../../setup-fixture';
 
 import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
+import { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
-import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselTariffsCard.fixture';
-import { Carousel } from './Carousel';
-import { CARD } from '../CarouselCard/CarouselCard.fixture.mobile';
-import { CAROUSEL_RECOMMENDATION_CARD } from '../CarouselRecommendationCard/CarouselRecommendationCard.fixture.mobile';
-import { BUSINESS_CARD } from '../CarouselProgramsCard/CarouselProgramsCard.fixture';
 import { BANK_HISTORY_CARD } from '../CarouselBankHistoryCard/CarouselBankHistoryCard.fixture';
+import { CARD } from '../CarouselCard/CarouselCard.fixture.mobile';
 import { CATALOG_CARD } from '../CarouselCatalogCard/CatalogCard';
 import {
   PRODUCT_CARD,
   PRODUCT_CARD_SMALL,
 } from '../CarouselProductCard/CarouselProductCard.fixture';
-import { Picture } from '../../model/Picture';
+import { BUSINESS_CARD } from '../CarouselProgramsCard/CarouselProgramsCard.fixture';
+import { CAROUSEL_RECOMMENDATION_CARD } from '../CarouselRecommendationCard/CarouselRecommendationCard.fixture.mobile';
+import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselTariffsCard.fixture';
+import { Carousel } from './Carousel';
 
 const catalogImage: Picture = {
   src: 'pay-ring.png',
@@ -34,16 +34,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isPadding={false}
-        isCyclic={true}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: [
-            { type: 'CarouselCard', content: CARD, style: ['col-span-4'] },
-            { type: 'CarouselCard', content: CARD, style: ['col-span-4'] },
+            { type: 'CarouselCard', content: CARD },
+            { type: 'CarouselCard', content: CARD },
           ],
         }}
         options={options}
@@ -54,17 +50,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={true}
-        isPadding={true}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselCatalogCard',
             content: { ...CATALOG_CARD, image: catalogImage },
-            style: ['col-span-12'],
           }),
         }}
         options={options}
@@ -75,28 +66,21 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        visibleItemCount={0}
-        isBlur={true}
-        isCyclic={true}
         isAlignCenter={true}
-        showArrows={false}
         block={{
           type: 'Carousel',
           blocks: [
             {
               type: 'CarouselTariffsCard',
               content: TARIFFS_CARD_HIT,
-              style: ['col-span-4'],
             },
             {
               type: 'CarouselTariffsCard',
               content: TARIFFS_CARD,
-              style: ['col-span-4'],
             },
             {
               type: 'CarouselTariffsCard',
               content: TARIFFS_CARD,
-              style: ['col-span-4'],
             },
           ],
         }}
@@ -108,17 +92,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={true}
-        isPadding={false}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselProductCard',
             content: PRODUCT_CARD,
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -129,16 +108,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={true}
-        isPadding={false}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselProductCard',
             content: PRODUCT_CARD_SMALL,
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -149,17 +124,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={true}
-        isPadding={true}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselProgramsCard',
             content: BUSINESS_CARD,
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -170,17 +140,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isPadding={false}
-        isCyclic={true}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselRecommendationCard',
             content: CAROUSEL_RECOMMENDATION_CARD,
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -191,17 +156,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isPadding={false}
-        isCyclic={true}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselRecommendationCard',
             content: { version: 'secondary', ...CAROUSEL_RECOMMENDATION_CARD },
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -212,17 +172,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={true}
-        isPadding={false}
-        showArrows={false}
         showDots={true}
         block={{
           type: 'Carousel',
           blocks: new Array(3).fill({
             type: 'CarouselBankHistoryCard',
             content: BANK_HISTORY_CARD,
-            style: ['col-span-4'],
           }),
         }}
         options={options}

package/src/components/Carousel/Carousel.fixture.tsx

@@ -1,6 +1,7 @@
 import '../../setup-fixture';
 
 import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
+import { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
 import { BANK_HISTORY_CARD } from '../CarouselBankHistoryCard/CarouselBankHistoryCard.fixture';
 import { CARD, CARD_MINI, CARD_NEW } from '../CarouselCard/CarouselCard.fixture';
@@ -19,7 +20,6 @@ import {
 import { RICH_CARD } from '../CarouselRichTextCard/CarouselRichTextCard.fixture';
 import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselTariffsCard.fixture';
 import { Carousel } from './Carousel';
-import { Picture } from '../../model/Picture';
 
 const catalogImage: Picture = {
   src: 'pay-ring.png',
@@ -41,8 +41,7 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={1}
-        isBlur={false}
-        isCyclic={true}
+        noCardBorder={true}
         block={{
           type: 'Carousel',
           blocks: [
@@ -58,14 +57,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={true}
-        isCyclic={false}
+        noCardBorder={true}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselCard',
             content: CARD_MINI,
-            style: ['col-span-3'],
           }),
         }}
         options={options}
@@ -77,7 +74,6 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={3}
-        isBlur={false}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
@@ -94,8 +90,6 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={0}
-        isBlur={true}
-        isCyclic={false}
         isAlignCenter={true}
         isGap={false}
         block={{
@@ -116,7 +110,6 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={1}
-        isBlur={true}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
@@ -133,7 +126,6 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={3}
-        isBlur={true}
         block={{
           type: 'Carousel',
           blocks: [
@@ -164,7 +156,6 @@ export default {
       <Carousel
         className="col-span-12"
         visibleItemCount={2}
-        isBlur={false}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
@@ -180,14 +171,11 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={true}
-        isCyclic={false}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselInvestmentCard',
             content: INVESTMENT_CARD_WITH_SINGLE_COLUMN,
-            style: ['col-span-2'],
           }),
         }}
         options={options}
@@ -198,15 +186,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={false}
         visibleItemCount={0}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselRecommendationCard',
             content: CAROUSEL_RECOMMENDATION_CARD_WITHOUT_LIST,
-            style: ['col-span-2'],
           }),
         }}
         options={options}
@@ -217,15 +202,12 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={false}
         visibleItemCount={0}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselRecommendationCard',
             content: CAROUSEL_RECOMMENDATION_CARD_SECONDARY,
-            style: ['col-span-2'],
           }),
         }}
         options={options}
@@ -237,14 +219,11 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={false}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselEventCard',
             content: CAROUSEL_EVENT_CARD,
-            style: ['col-span-4'],
           }),
         }}
         options={options}
@@ -255,10 +234,9 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={false}
-        isCyclic={false}
         arrowsPadded={false}
         visibleItemCount={3}
+        noCardBorder={true}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({