@redneckz/wildless-cms-uni-blocks 0.9.14 → 0.9.15

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -3,13 +3,13 @@ import { AlignText } from '../../model/AlignText';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
+import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 import type {
   BonusBenefit,
   BonusBenefitsBlockContent,
   ColumnsCount,
 } from './BonusBenefitsBlockContent';
-import { style } from '../../utils/style';
 
 export interface BenefitsBlockProps extends BonusBenefitsBlockContent, UniBlockProps {}
 
@@ -49,7 +49,7 @@ const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: numbe
       )}
     >
       {title ? <span>{title}</span> : null}
-      {icon ? <Img image={icon} height="180" width="auto" className="w-auto" /> : null}
+      {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
       {description ? <span>{description}</span> : null}
     </div>
   );

package/src/components/Calculator/CreditCalculatorForm.tsx

@@ -8,7 +8,7 @@ import type {
   CreditCalculatorProps,
 } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { DEFAULT_MONTHS, DEFAULT_SUM } from './constants';
+import { CREDIT_DEFAULT_SUM, DEFAULT_MONTHS } from './constants';
 import { Rate } from './Rate';
 import { renderFootnote } from './renderFootnote';
 import { renderMonthsInput } from './renderMonthsInput';
@@ -31,7 +31,7 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
     const handleIsPensionClient = useCallback((_: boolean) => toggleIsPensionClient(_), []);
     const [isInsurance, toggleIsInsurance] = useState(true);
     const handleIsInsurance = useCallback((_: boolean) => toggleIsInsurance(_), []);
-    const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+    const [moneyValue, setMoneyValue] = useState(CREDIT_DEFAULT_SUM);
     const handleMoneyValue = useCallback((_: number) => setMoneyValue(_), []);
     const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
     const handleMonthsValue = useCallback((_: number) => setMonthsValue(_), []);

package/src/components/Calculator/DepositCalculatorForm.tsx

@@ -1,12 +1,12 @@
 // TEMP
 
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
 import { DepositCalculatorParamsViewSettings, DepositCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { DEFAULT_MONTHS, DEFAULT_SUM } from './constants';
+import { DEPOSIT_DEFAULT_SUM } from './constants';
 import { Rate } from './Rate';
 import { renderFootnote } from './renderFootnote';
 import { renderInterestPayment } from './renderInterestPayment';
@@ -21,9 +21,9 @@ export interface DepositCalculatorProp extends DepositCalculatorProps {
 
 export const DepositCalculatorForm = JSX<DepositCalculatorProp>(
   ({ className = '', sourceBookDir, buttons, footnote, paramsViewSettings }) => {
-    const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+    const [moneyValue, setMoneyValue] = useState(DEPOSIT_DEFAULT_SUM);
     const handleMoneyValue = useCallback((_: number) => setMoneyValue(_), []);
-    const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
+    const [monthsValue, setMonthsValue] = useState(0);
     const [isMonthlyInterestPayment, toggleIsMonthlyInterestPayment] = useState(false);
     const handleIsMonthlyInterestPayment = useCallback(
       (_: boolean) => toggleIsMonthlyInterestPayment(_),
@@ -47,7 +47,10 @@ export const DepositCalculatorForm = JSX<DepositCalculatorProp>(
       sourceBookDir,
       paramsViewSettings,
     );
-    const { income, finalSum, rate } = calculatorParams;
+    const { defaultMonth, income, finalSum, rate } = calculatorParams;
+    useEffect(() => {
+      setMonthsValue(defaultMonth);
+    }, [defaultMonth]);
 
     return (
       <section className={style('flex justify-between', className)}>

package/src/components/Calculator/constants.ts

@@ -3,9 +3,10 @@ import { BusinessDepositCalculatorSourceBookParams } from './useBusinessDepositC
 import { CreditCalculatorSourceBookParams } from './useCreditCalculatorParams';
 import { DepositCalculatorSourceBookParams } from './useDepositCalculatorParams';
 
-export const DEFAULT_MIN_SUM = 30000;
+export const DEFAULT_MIN_SUM = 10000;
 export const DEFAULT_MAX_SUM = 5000000;
-export const DEFAULT_SUM = (DEFAULT_MAX_SUM - DEFAULT_MIN_SUM) / 2;
+export const CREDIT_DEFAULT_SUM = 200000;
+export const DEPOSIT_DEFAULT_SUM = 20000;
 export const DEFAULT_MIN_MONTHS = 13;
 export const DEFAULT_MAX_MONTHS = 60;
 export const DEFAULT_MONTHS = Math.round((DEFAULT_MAX_MONTHS - DEFAULT_MIN_MONTHS) / 2);
@@ -25,10 +26,10 @@ export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookParams
   maxSum: DEFAULT_MAX_SUM,
   minMonths: DEFAULT_MIN_MONTHS,
   maxMonths: DEFAULT_MAX_MONTHS,
-  rate: 0,
-  isSalaryClient: true,
+  rate: 12.5,
+  isSalaryClient: false,
   isPensionClient: false,
-  isStateEmployee: true,
+  isStateEmployee: false,
   isInsurance: true,
 };
 

package/src/components/Calculator/useDepositCalculatorParams.ts

@@ -27,6 +27,7 @@ export interface DepositCalculatorParams
   extends DepositCalculatorSourceBookParams,
     DepositCalculatorUserInputParams {
   availableMonths: number[];
+  defaultMonth: number;
   income: number;
   finalSum: number;
 }
@@ -44,6 +45,9 @@ export const useDepositCalculatorParams = (
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
   );
+  const defaultMonth = data?.rows[0]
+    ? getMiddleMonth(data.rows[0].minMonths, data.rows[0].maxMonths)
+    : 1;
   const isExcludeMonthlyInterestPayment = !paramsViewSettings?.isShowMonthlyInterestPayment;
   const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
   const depositCalculatorSourceBookParams =
@@ -62,7 +66,7 @@ export const useDepositCalculatorParams = (
           isExclude: isExcludeRemoteRegistration,
         }) &&
         checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
+        checkRangeByKeys(monthsValue || defaultMonth, ['minMonths', 'maxMonths'], row),
     ) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
 
   const { rate } = depositCalculatorSourceBookParams;
@@ -78,6 +82,7 @@ export const useDepositCalculatorParams = (
       sourceBookRows.map((row) => [row['minMonths'], row['maxMonths']]),
     ).flatMap(([start, end]) => arrayByRange(start, end)),
     ...userInputParams,
+    defaultMonth,
     income,
     finalSum,
   };
@@ -105,3 +110,6 @@ interface CheckRowByParamProps {
 
 const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }: CheckRowByParamProps) =>
   isExclude || userInputParams[paramKey] === row[paramKey];
+
+const getMiddleMonth = (minMonths: number, maxMonths: number): number =>
+  Math.round((maxMonths - minMonths) / 2);

package/src/components/CarouselProgramsCard/CarouselProgramsCard.example.json

@@ -10,16 +10,16 @@
   "title": "Заголовок",
   "list": [
     {
-      "title": "Ячейка 1-1",
-      "description": "Описание 1-1"
+      "title": "Заголовок 1",
+      "description": "Описание 1"
     },
     {
-      "title": "Ячейка 1-2",
-      "description": "Описание 1-2"
+      "title": "Заголовок 2",
+      "description": "Описание 2"
     },
     {
-      "title": "Ячейка 1-3",
-      "description": "Описание 1-3"
+      "title": "Заголовок 3",
+      "description": "Описание 3"
     }
   ]
 }

package/src/components/CarouselRichTextCard/CarouselRichTextCardContent.ts

@@ -4,4 +4,4 @@ import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 /**
  * @title Карточка c форматированным вводом
  */
-export type CarouselRichTextCardContent = UniBlockContent & RichTextProps & {};
+export type CarouselRichTextCardContent = UniBlockContent & RichTextProps;

package/src/components/LinkDocs/LinkDocsListItemBase.tsx

@@ -26,8 +26,8 @@ export const LinkDocsListItemBase = JSX<LinkDocsListItemBaseProps>(
           <Img
             className={iconClassName}
             image={getIconWithVersion(icon)}
-            width="24px"
-            height="24px"
+            width="24"
+            height="24"
             asSVG
           />
         ) : null}

package/src/components/TariffsTable/TableTileHeader.tsx

@@ -6,8 +6,6 @@ import type { TariffsTableRowHeader } from './TariffsTableContent';
 export const TableTileHeader = JSX<TariffsTableRowHeader>(({ title, icon }) => (
   <div className="flex gap-2.5 mb-2">
     {title ? <Heading headingType="h3" className="font-medium" title={title} /> : null}
-    {icon ? (
-      <Img className="ml-auto max-w-6 max-h-6" image={icon} width="24px" height="24px" />
-    ) : null}
+    {icon ? <Img className="ml-auto min-w-6" image={icon} width="24" height="24" /> : null}
   </div>
 ));

package/src/components/TariffsTable/TariffsTableRow.tsx

@@ -40,10 +40,10 @@ export const TariffsTableRow = JSX<TariffsTableRowProps>(
           <div className="flex items-center text-primary-text" role="cell">
             {header?.icon ? (
               <Img
-                className="mr-3.5 max-w-6 max-h-6"
+                className="mr-3.5 max-w-6"
                 image={getIconWithVersion(header.icon)}
-                width="24px"
-                height="24px"
+                width="24"
+                height="24"
                 asSVG
               />
             ) : null}

package/bundle/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/dist/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/dist/components/Calculator/getDefaultSum.js

@@ -1,6 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultSum = void 0;
-const constants_1 = require("./constants");
-const getDefaultSum = (minSum, maxSum) => maxSum && minSum ? (maxSum - minSum) / 2 : constants_1.DEFAULT_SUM;
-exports.getDefaultSum = getDefaultSum;
-//# sourceMappingURL=getDefaultSum.js.map

package/dist/components/Calculator/getDefaultSum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultSum.js","sourceRoot":"","sources":["../../../src/components/Calculator/getDefaultSum.ts"],"names":[],"mappings":";;AAAA,2CAA0C;AAEnC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,MAAe,EAAE,EAAE,CAChE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,uBAAW,CAAC;AAD5C,QAAA,aAAa,iBAC+B"}

package/lib/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/lib/components/Calculator/getDefaultSum.js

@@ -1,3 +0,0 @@
-import { DEFAULT_SUM } from './constants.js';
-export const getDefaultSum = (minSum, maxSum) => maxSum && minSum ? (maxSum - minSum) / 2 : DEFAULT_SUM;
-//# sourceMappingURL=getDefaultSum.js.map

package/lib/components/Calculator/getDefaultSum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultSum.js","sourceRoot":"","sources":["../../../src/components/Calculator/getDefaultSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,MAAe,EAAE,EAAE,CAChE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC"}

package/mobile/bundle/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/mobile/dist/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/mobile/dist/components/Calculator/getDefaultSum.js

@@ -1,6 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultSum = void 0;
-const constants_1 = require("./constants");
-const getDefaultSum = (minSum, maxSum) => maxSum && minSum ? (maxSum - minSum) / 2 : constants_1.DEFAULT_SUM;
-exports.getDefaultSum = getDefaultSum;
-//# sourceMappingURL=getDefaultSum.js.map

package/mobile/dist/components/Calculator/getDefaultSum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultSum.js","sourceRoot":"","sources":["../../../src/components/Calculator/getDefaultSum.ts"],"names":[],"mappings":";;AAAA,2CAA0C;AAEnC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,MAAe,EAAE,EAAE,CAChE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,uBAAW,CAAC;AAD5C,QAAA,aAAa,iBAC+B"}

package/mobile/lib/components/Calculator/getDefaultSum.d.ts

@@ -1 +0,0 @@
-export declare const getDefaultSum: (minSum?: number, maxSum?: number) => number;

package/mobile/lib/components/Calculator/getDefaultSum.js

@@ -1,3 +0,0 @@
-import { DEFAULT_SUM } from './constants.js';
-export const getDefaultSum = (minSum, maxSum) => maxSum && minSum ? (maxSum - minSum) / 2 : DEFAULT_SUM;
-//# sourceMappingURL=getDefaultSum.js.map

package/mobile/lib/components/Calculator/getDefaultSum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultSum.js","sourceRoot":"","sources":["../../../src/components/Calculator/getDefaultSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,MAAe,EAAE,EAAE,CAChE,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC"}

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

@@ -1,4 +0,0 @@
-import { DEFAULT_SUM } from './constants';
-
-export const getDefaultSum = (minSum?: number, maxSum?: number) =>
-  maxSum && minSum ? (maxSum - minSum) / 2 : DEFAULT_SUM;

package/src/components/Calculator/getDefaultSum.ts

@@ -1,4 +0,0 @@
-import { DEFAULT_SUM } from './constants';
-
-export const getDefaultSum = (minSum?: number, maxSum?: number) =>
-  maxSum && minSum ? (maxSum - minSum) / 2 : DEFAULT_SUM;