@redneckz/wildless-cms-uni-blocks 0.11.0 → 0.11.1

package/bundle/bundle.umd.js

@@ -1054,7 +1054,7 @@
     const renderImg = (image, imageClassName = '', isMobile = false) => {
         const style = {
             width: image.size?.width ? `${image.size?.width}px` : '100%',
-            height: image.size?.height ? `${image.size?.height}px` : '100%',
+            height: image.size?.height ? `${image.size?.height}px` : 'auto',
         };
         const title = image.title || '';
         const alt = image.alt || image.title;
@@ -1506,6 +1506,7 @@
     };
 
     const minBy = (discriminator = defaultDiscriminator) => maxBy((_) => -discriminator(_));
+    const min = minBy();
 
     const getLimitRangeByKeys = ([minKey, maxKey], limitParams, rateRows = []) => limitParams && limitParams[minKey] && limitParams[maxKey]
         ? {
@@ -1514,8 +1515,8 @@
         }
         : getRangeByKeys([minKey, maxKey], rateRows);
     const getRangeByKeys = ([minKey, maxKey], rows = []) => ({
-        [minKey]: rows.length ? minBy()(rows.filter((row) => row[minKey]).map((row) => row[minKey])) : 0,
-        [maxKey]: rows.length ? maxBy()(rows.filter((row) => row[maxKey]).map((row) => row[maxKey])) : 0,
+        [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,
     });
     const checkRangeByKeys = (value, [minKey, maxKey], sourceBookRow) => value >= sourceBookRow[minKey] && value <= sourceBookRow[maxKey];
 
@@ -1612,6 +1613,45 @@
         ],
     });
 
+    const checkCreditSourceBookRowCommonParams = (props) => checkRowParam({
+        ...props,
+        fieldKey: 'isSalaryClient',
+        viewSettingFieldKey: 'isShowSalaryClient',
+    }) &&
+        checkRowParam({
+            ...props,
+            fieldKey: 'isStateEmployee',
+            viewSettingFieldKey: 'isShowStateEmployee',
+        }) &&
+        checkRowParam({
+            ...props,
+            fieldKey: 'isPensionClient',
+            viewSettingFieldKey: 'isShowPensionClient',
+        }) &&
+        checkRowParam({
+            ...props,
+            fieldKey: 'isInsurance',
+            viewSettingFieldKey: 'isShowInsurance',
+        });
+    const checkRowParam = ({ row, userInputParams, paramsViewSettings, fieldKey, viewSettingFieldKey, }) => {
+        const isExclude = paramsViewSettings ? !paramsViewSettings[viewSettingFieldKey] : false;
+        return isExclude || userInputParams[fieldKey] === row[fieldKey];
+    };
+
+    const getCreditCalculatorLimitParams = ({ limitRows, userInputParams, paramsViewSettings, }) => limitRows?.find((row) => checkCreditSourceBookRowCommonParams({
+        row,
+        userInputParams,
+        paramsViewSettings,
+    }));
+
+    const getCreditCalculatorRateParams = ({ rateRows = [], userInputParams, paramsViewSettings, moneyValue, monthsValue, }) => rateRows?.find((row) => checkCreditSourceBookRowCommonParams({
+        row,
+        userInputParams,
+        paramsViewSettings,
+    }) &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row)) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
+
     /**
      * Формулы расчёта аннуитетных и дифференцированных платежей:
      * https://finuslugi.ru/potrebitelskie_kredity/stat_annuitetnye_i_differentsirovannye_platezhi
@@ -1631,55 +1671,40 @@
     };
 
     const useCreditCalculatorParams = (userInputParams, sourceBookDir, paramsViewSettings) => {
-        const { moneyValue, monthsValue } = userInputParams;
+        let { moneyValue, monthsValue } = userInputParams;
         const data = useCalculatorParams(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
-        const creditCalculatorSourceBookLimitParams = data?.limitRows?.find((row) => checkRowCommonParams({
-            row,
+        const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
+        const limitRows = data?.limitRows || [];
+        const creditCalculatorSourceBookLimitParams = getCreditCalculatorLimitParams({
+            limitRows,
             userInputParams,
             paramsViewSettings,
-        }));
-        const creditCalculatorSourceBookRateParams = data?.rateRows?.find((row) => checkRowCommonParams({
-            row,
+        });
+        const { minSum, maxSum } = getLimitRangeByKeys(['minSum', 'maxSum'], creditCalculatorSourceBookLimitParams, rateRows);
+        const { minMonths, maxMonths } = getLimitRangeByKeys(['minMonths', 'maxMonths'], creditCalculatorSourceBookLimitParams, rateRows);
+        moneyValue = clamp(moneyValue, minSum, maxSum);
+        monthsValue = clamp(monthsValue, minMonths, maxMonths);
+        const creditCalculatorRateParams = getCreditCalculatorRateParams({
+            rateRows,
             userInputParams,
             paramsViewSettings,
-        }) &&
-            checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-            checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row)) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
-        const { rate } = creditCalculatorSourceBookRateParams;
+            moneyValue,
+            monthsValue,
+        });
+        const { rate } = creditCalculatorRateParams;
         const monthlyPayment = getMonthlyPayment(rate, userInputParams);
-        const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
         return useMemo(() => ({
-            ...creditCalculatorSourceBookRateParams,
-            ...getLimitRangeByKeys(['minSum', 'maxSum'], creditCalculatorSourceBookLimitParams, rateRows),
-            ...getLimitRangeByKeys(['minMonths', 'maxMonths'], creditCalculatorSourceBookLimitParams, rateRows),
+            ...creditCalculatorRateParams,
             ...userInputParams,
+            minSum,
+            maxSum,
+            minMonths,
+            maxMonths,
+            moneyValue,
+            monthsValue,
             monthlyPayment,
         }), [userInputParams, data]);
     };
-    const checkRowCommonParams = (props) => checkRowParam({
-        ...props,
-        fieldKey: 'isSalaryClient',
-        viewSettingFieldKey: 'isShowSalaryClient',
-    }) &&
-        checkRowParam({
-            ...props,
-            fieldKey: 'isStateEmployee',
-            viewSettingFieldKey: 'isShowStateEmployee',
-        }) &&
-        checkRowParam({
-            ...props,
-            fieldKey: 'isPensionClient',
-            viewSettingFieldKey: 'isShowPensionClient',
-        }) &&
-        checkRowParam({
-            ...props,
-            fieldKey: 'isInsurance',
-            viewSettingFieldKey: 'isShowInsurance',
-        });
-    const checkRowParam = ({ row, userInputParams, paramsViewSettings, fieldKey, viewSettingFieldKey, }) => {
-        const isExclude = paramsViewSettings ? !paramsViewSettings[viewSettingFieldKey] : false;
-        return isExclude || userInputParams[fieldKey] === row[fieldKey];
-    };
 
     const CreditCalculatorForm = JSX(({ className, sourceBookDir, buttons, footnote, paramsViewSettings }) => {
         const [userInputParams, { field }] = useForm({
@@ -2232,7 +2257,7 @@
         return (jsx(BlockWrapper, { className: style('w-[365px]', className), ...rest, children: jsxs(LinkWrapper, { className: "flex flex-col", href: href, target: target, children: [icon?.icon ? jsx(ImgInner, { image: icon }) : null, icon?.src ? jsx(ImgInner, { image: icon }) : null, title ? (jsx(Heading, { headingType: "h6", as: "h4", className: "text-left pt-3 mb-2", title: title })) : null, description ? (jsx("div", { className: "mb-4", children: jsx(Text, { font: "font-light", size: "text-m", color: "text-secondary-text", children: description }) })) : null] }) }));
     });
 
-    const BaseTile = JSX(({ className, title = '', insetTitle = '', buttons, leftImage, rightImage, backImage, children, }) => (jsxs("div", { className: style('relative flex flex-col font-sans', className), children: [backImage ? jsx("div", { className: "absolute bottom-0 right-0 z-0", children: backImage }) : null, title, jsxs("div", { className: "grow relative flex flex-wrap justify-between items-stretch gap-8", children: [leftImage, jsxs("div", { className: style('flex flex-col gap-8', leftImage ? '' : 'grow'), children: [insetTitle, jsx("div", { className: "grow", children: children }), buttons] }), rightImage ? jsx("div", { className: "sm:-order-1 md:-order-1", children: rightImage }) : null] })] })));
+    const BaseTile = JSX(({ className, title = '', insetTitle = '', buttons, leftImage, rightImage, backImage, children, }) => (jsxs("div", { className: style('relative flex flex-col font-sans', className), children: [backImage ? jsx("div", { className: "absolute bottom-0 right-0 z-0", children: backImage }) : null, title, jsxs("div", { className: "grow relative flex flex-wrap md:flex-nowrap justify-between items-stretch gap-8", children: [leftImage, jsxs("div", { className: style('flex flex-col gap-8', leftImage ? '' : 'grow'), children: [insetTitle, jsx("div", { className: "grow", children: children }), buttons] }), rightImage ? jsx("div", { className: "-order-1 lg:order-1", children: rightImage }) : null] })] })));
 
     const getItemListFontSize = (colValue) => (colValue === 1 ? 'text-h6' : 'text-l');
     const cardColumnsModeStyleMap = {
@@ -3185,7 +3210,7 @@
 
     const textInformationTextSize = 'text-xs-light';
 
-    const TextInformation = JSX(({ className = '', links }) => (jsxs("div", { className: className, children: [jsx("div", { className: "pt-5 sm:py-4", children: jsx(Text, { size: textInformationTextSize, color: "text-secondary-text", children: `\u00a9\u00A02000-${new Date().getFullYear()}\u00A0АО \u00ABРоссельхозбанк\u00BB Генеральная лицензия Банка России \u2116\u00A03349 от\u00A012.08.2015\u00A0г.` }) }), links?.length ? (jsx("div", { className: "flex justify-start items-start gap-5 pt-2.5", children: links.map((_, i) => (jsx(TextInformationLink, { index: i, ..._ }, String(i)))) })) : null] })));
+    const TextInformation = JSX(({ className = '', links }) => (jsxs("div", { className: className, children: [jsx("div", { className: "pt-4 xl:pt-5", children: jsx(Text, { size: textInformationTextSize, color: "text-secondary-text", children: `\u00a9\u00A02000-${new Date().getFullYear()}\u00A0АО \u00ABРоссельхозбанк\u00BB Генеральная лицензия Банка России \u2116\u00A03349 от\u00A012.08.2015\u00A0г.` }) }), links?.length ? (jsx("div", { className: "flex justify-start items-start gap-5 pt-4", children: links.map((_, i) => (jsx(TextInformationLink, { index: i, ..._ }, String(i)))) })) : null] })));
 
     const LEFT_COL_WIDTH_FULL_HD = 'w-[204px]';
     const Footer = JSX(({ className = '', ...rest }) => {
@@ -4116,7 +4141,7 @@
     const ProductBlockInner = JSX(({ className, version = 'primary', headlineVersion = 'L', title, description, benefits, benefitsVersion, items, isDotted = true, __html, buttons, image, directionRight = true, }) => {
         const benefitsWithLabel = benefits?.filter((_) => _.label);
         const img = image?.src ? jsx(ImgInner, { className: "mt-[-50px]", image: image }) : null;
-        return (jsxs(BaseTile, { className: className, insetTitle: jsx(Headline, { className: "max-w-[600px] xl:max-w-[800px]", title: title, description: description, headlineVersion: headlineVersion, align: "text-left", isPadding: false }), ...(directionRight ? { rightImage: img } : { leftImage: img }), buttons: renderButtonsSection(buttons), children: [benefitsWithLabel?.length ? (jsx("div", { className: "flex flex-wrap gap-6", children: benefitsWithLabel.map(renderBenefit$1(version, benefitsVersion)) })) : null, __html ? (jsx("div", { className: "mt-5", children: jsx(RichText, { __html: __html }) })) : null, items?.length ? jsx(List, { className: "mt-5", items: items, isDotted: isDotted }) : null] }));
+        return (jsxs(BaseTile, { className: className, insetTitle: jsx(Headline, { className: "max-w-[600px] xl:max-w-[728px]", title: title, description: description, headlineVersion: headlineVersion, align: "text-left", isPadding: false }), ...(directionRight ? { rightImage: img } : { leftImage: img }), buttons: renderButtonsSection(buttons), children: [benefitsWithLabel?.length ? (jsx("div", { className: "flex flex-wrap gap-6", children: benefitsWithLabel.map(renderBenefit$1(version, benefitsVersion)) })) : null, __html ? (jsx("div", { className: "mt-5", children: jsx(RichText, { __html: __html }) })) : null, items?.length ? jsx(List, { className: "mt-5", items: items, isDotted: isDotted }) : null] }));
     });
 
     function renderBackwardButton({ text, href, target, icon }, version) {
@@ -4650,7 +4675,7 @@
     const COLUMN_WIDTH$1 = 4 * 80 + 40; // w-80 + pl-10 = 360px
 
     const TableInnerButton = JSX(({ isOpen, onClick }) => {
-        return (jsxs(Button, { version: "primary", onClick: onClick, className: "w-full flex items-center justify-center rounded-none py-5", children: [jsx("div", { className: "text-h4", children: isOpen ? 'Скрыть' : 'Показать ставки по вкладу' }), jsx(Icon, { name: isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon', className: "ml-3", iconVersion: "white", width: "20", height: "20" })] }));
+        return (jsxs(Button, { version: "primary", onClick: onClick, className: "w-full flex items-center justify-center rounded-none py-5", children: [jsx("div", { className: "text-h4", children: isOpen ? 'Скрыть' : 'Показать' }), jsx(Icon, { name: isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon', className: "ml-3", iconVersion: "white", width: "20", height: "20" })] }));
     });
 
     const renderButtonsCellData = ({ buttons }) => renderButtonsSection(buttons);
@@ -5069,7 +5094,7 @@
         return (jsx("div", { className: "flex items-end absolute bottom-0 right-0 h-full pointer-events-none", children: jsx(LikeControl, { className: "rounded-tl-lg sticky bottom-0 pointer-events-auto" }) }));
     }
 
-    const packageVersion = "0.11.0";
+    const packageVersion = "0.11.1";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;