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

package/bundle/bundle.umd.js

@@ -503,13 +503,14 @@
         joinPath: joinPath
     });
 
-    const adjustHref = (router) => (href) => {
-        if (!href || isURL(href) || (projectSettings.CDN && href.startsWith(projectSettings.CDN))) {
+    const adjustHref = (router) => (href, basePath = projectSettings.BASE_PATH) => {
+        if (!href || isURL(href) || hasPrefix(href, projectSettings.CDN)) {
             return href;
         }
         const isRelativeToBase = href.startsWith('/');
-        return joinPath(projectSettings.BASE_PATH, isRelativeToBase ? '/' : dirname(router.pathname), href);
+        return joinPath(hasPrefix(href, basePath) ? '' : basePath, isRelativeToBase ? '/' : dirname(router.pathname), href);
     };
+    const hasPrefix = (href, prefix) => prefix && href && href.startsWith(prefix);
 
     /* eslint-disable @typescript-eslint/ban-types */
     const handlerDecorator = (handler, targetContent) => {
@@ -538,12 +539,13 @@
         useRouter._impl = impl;
     };
 
-    function useLink(isRemote = false) {
+    function useLink(params = {}) {
+        const { isRemote, basePath } = params;
         const router = useRouter();
         const { close } = useDialog();
         return (props) => ({
             ...props,
-            href: isRemote ? props.href : adjustHref(router)(props.href),
+            href: isRemote ? props.href : adjustHref(router)(props.href, basePath),
             'aria-label': props.text,
             onClick: handlerDecorator(handleHref(props), props),
         });
@@ -1178,7 +1180,7 @@
 
     const BonusBenefitsBlock = JSX(({ bonusBenefits, cardTextAlign = 'center', className = '', columnsCount = '4', subtitle, title, ...rest }) => (jsxs(BlockWrapper, { className: `font-sans text-primary-text bg-white p-12 flex flex-col text-center ${className}`, ...rest, children: [jsx(Headline, { className: "!p-0 mb-8", title: title, description: subtitle, headlineVersion: "M" }), bonusBenefits?.length ? (jsx("div", { className: `grid gap-1 ${AlignText[cardTextAlign]} ${getElementsColsValue(columnsCount)}`, children: bonusBenefits.map(renderBonusBenefit) })) : null] })));
     const renderBonusBenefit = ({ icon, title, description }, i) => {
-        return (jsxs("div", { className: style('flex flex-col items-center text-h6', !description && !title ? 'justify-center' : ''), children: [title ? jsx("span", { children: title }) : null, icon ? jsx(ImgInner, { image: icon, height: "180", width: "auto", className: "w-auto" }) : null, description ? jsx("span", { children: description }) : null] }, String(i)));
+        return (jsxs("div", { className: style('flex flex-col items-center text-h6', !description && !title ? 'justify-center' : ''), children: [title ? jsx("span", { children: title }) : null, icon ? jsx(ImgInner, { image: icon, height: "180", className: "w-auto" }) : null, description ? jsx("span", { children: description }) : null] }, String(i)));
     };
     const getElementsColsValue = (colValue) => {
         switch (colValue) {
@@ -1242,9 +1244,10 @@
 
     const CalculatorValueBlock = JSX(({ title, value, postfix = '', prefix, className = '' }) => (jsxs("div", { className: style('mb-7', className), children: [title ? (jsx(Text, { size: "text-l-light", color: "text-secondary-text", children: title })) : null, value ? (jsx("div", { children: jsxs(Text, { size: "text-h3", children: [prefix, " ", addSpacesBetweenNumbers(Math.round(value)), " ", postfix] }) })) : (jsx("div", { children: jsx(Text, { size: "text-h3", children: "-" }) }))] })));
 
-    const DEFAULT_MIN_SUM = 30000;
+    const DEFAULT_MIN_SUM = 10000;
     const DEFAULT_MAX_SUM = 5000000;
-    const DEFAULT_SUM = (DEFAULT_MAX_SUM - DEFAULT_MIN_SUM) / 2;
+    const CREDIT_DEFAULT_SUM = 200000;
+    const DEPOSIT_DEFAULT_SUM = 20000;
     const DEFAULT_MIN_MONTHS = 13;
     const DEFAULT_MAX_MONTHS = 60;
     const DEFAULT_MONTHS = Math.round((DEFAULT_MAX_MONTHS - DEFAULT_MIN_MONTHS) / 2);
@@ -1262,10 +1265,10 @@
         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,
     };
     const DEFAULT_TRAVEL_MIN_SUM = 6000;
@@ -1662,7 +1665,7 @@
         const handleIsPensionClient = useCallback((_) => toggleIsPensionClient(_), []);
         const [isInsurance, toggleIsInsurance] = useState(true);
         const handleIsInsurance = useCallback((_) => toggleIsInsurance(_), []);
-        const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+        const [moneyValue, setMoneyValue] = useState(CREDIT_DEFAULT_SUM);
         const handleMoneyValue = useCallback((_) => setMoneyValue(_), []);
         const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
         const handleMonthsValue = useCallback((_) => setMonthsValue(_), []);
@@ -1713,6 +1716,9 @@
     const useDepositCalculatorParams = (userInputParams, sourceBookDir, paramsViewSettings) => {
         const { moneyValue, monthsValue } = userInputParams;
         const data = useCalculatorParams(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 = data?.rows?.find((row) => checkRowByParam({
@@ -1728,7 +1734,7 @@
                 isExclude: isExcludeRemoteRegistration,
             }) &&
             checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-            checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row)) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
+            checkRangeByKeys(monthsValue || defaultMonth, ['minMonths', 'maxMonths'], row)) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
         const { rate } = depositCalculatorSourceBookParams;
         const income = getDepositIncome(rate, userInputParams);
         const finalSum = moneyValue + income;
@@ -1739,6 +1745,7 @@
             ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
             availableMonths: mergeIntervals(sourceBookRows.map((row) => [row['minMonths'], row['maxMonths']])).flatMap(([start, end]) => arrayByRange(start, end)),
             ...userInputParams,
+            defaultMonth,
             income,
             finalSum,
         };
@@ -1756,11 +1763,12 @@
         }
     };
     const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }) => isExclude || userInputParams[paramKey] === row[paramKey];
+    const getMiddleMonth = (minMonths, maxMonths) => minMonths + Math.round((maxMonths - minMonths) / 2);
 
     const DepositCalculatorForm = JSX(({ className = '', sourceBookDir, buttons, footnote, paramsViewSettings }) => {
-        const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+        const [moneyValue, setMoneyValue] = useState(DEPOSIT_DEFAULT_SUM);
         const handleMoneyValue = useCallback((_) => setMoneyValue(_), []);
-        const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
+        const [monthsValue, setMonthsValue] = useState(0);
         const [isMonthlyInterestPayment, toggleIsMonthlyInterestPayment] = useState(false);
         const handleIsMonthlyInterestPayment = useCallback((_) => toggleIsMonthlyInterestPayment(_), []);
         const [isRemoteRegistration, toggleIsRemoteRegistration] = useState(false);
@@ -1773,7 +1781,10 @@
         };
         const handleMonthsValue = useCallback((_) => setMonthsValue(_), []);
         const calculatorParams = useDepositCalculatorParams(userInputParams, sourceBookDir, paramsViewSettings);
-        const { income, finalSum, rate } = calculatorParams;
+        const { defaultMonth, income, finalSum, rate } = calculatorParams;
+        useEffect(() => {
+            setMonthsValue(defaultMonth);
+        }, [defaultMonth]);
         return (jsxs("section", { className: style('flex justify-between', className), children: [jsxs("div", { className: "w-[468px]", children: [renderWantedSumInput('Сумма вклада, ₽', {
                             ...calculatorParams,
                         }, handleMoneyValue), renderMonthsInput('Срок вклада, месяцев', {
@@ -3031,7 +3042,7 @@
     }
 
     const Sitemap = JSX(({ className, topItems }) => {
-        const link = useLink(true);
+        const link = useLink({ isRemote: true });
         return (jsx("div", { className: style('flex items-start justify-between', className), children: topItems?.map(link).map(renderColumn) }));
     });
     const renderColumn = (menuItem, index) => {
@@ -3040,9 +3051,9 @@
     };
     const ColumnItem = JSX(({ text, index, basePath, ...rest }) => {
         const isAnotherPortal = projectSettings.BASE_PATH && basePath ? !projectSettings.BASE_PATH.startsWith(basePath) : false;
-        const link = useLink(isAnotherPortal);
+        const link = useLink({ isRemote: isAnotherPortal });
         const { href, target, onClick } = link(rest);
-        return (jsx("a", { className: style('text-l-light text-secondary-text hover:text-primary-main no-underline', 'overflow-x-hidden overflow-ellipsis whitespace-nowrap'), href: isAnotherPortal ? joinPath(basePath, href) : href, target: target || '_self', onClick: onClick, children: text || `Раздел ${index}` }));
+        return (jsx("a", { className: style('text-l-light text-secondary-text hover:text-primary-main no-underline', 'overflow-x-hidden overflow-ellipsis whitespace-nowrap'), href: href, target: target || '_self', onClick: onClick, children: text || `Раздел ${index}` }));
     });
 
     const SearchInput = JSX(({ className, isMobile, value, autoFocus, onChange, onFocus }) => {
@@ -3126,7 +3137,7 @@
     });
 
     const TextInformationLink = JSX(({ className = '', index, ...rest }) => {
-        const link = useLink();
+        const link = useLink({ isRemote: true });
         const { href, target, text, onClick } = link(rest);
         return (jsx("a", { className: `text-xs-light text-secondary-text visited:text-secondary-text hover:text-primary-main inline-block no-underline max-w-[292px] ${className}`, href: href, target: target, onClick: onClick, children: text || `Документ ${index}` }));
     });
@@ -3263,7 +3274,7 @@
     });
 
     const TopItem = JSX(({ className = '', active, flat, children, ...rest }) => {
-        const link = useLink(true);
+        const link = useLink({ isRemote: true });
         const { href, target, text, onClick } = link(rest);
         return (jsx("a", { className: style(getLinkStyle(active, flat), className), href: href, target: target, onClick: onClick, rel: "noopener noreferrer", "aria-label": text, children: jsx("span", { className: getTextStyle$1(active, flat), children: text || children }) }));
     });
@@ -3551,7 +3562,7 @@
 
     const LinkDocsListItemBase = JSX(({ className, iconClassName, textClassName, suffixClassName, doc, icon }) => {
         const { text, fileSize, ...linkProps } = doc;
-        return (jsxs("a", { className: className, role: "link", ...linkProps, children: [icon ? (jsx(ImgInner, { className: iconClassName, image: getIconWithVersion(icon), width: "24px", height: "24px", asSVG: true })) : null, text ? (jsxs("span", { className: textClassName, children: [text, jsx("span", { className: suffixClassName, children: linkProps?.href && formatSuffix(getExtFromHref(linkProps.href), fileSize) })] })) : null] }));
+        return (jsxs("a", { className: className, role: "link", ...linkProps, children: [icon ? (jsx(ImgInner, { className: iconClassName, image: getIconWithVersion(icon), width: "24", height: "24", asSVG: true })) : null, text ? (jsxs("span", { className: textClassName, children: [text, jsx("span", { className: suffixClassName, children: linkProps?.href && formatSuffix(getExtFromHref(linkProps.href), fileSize) })] })) : null] }));
     });
     const formatSuffix = (ext, fileSize) => {
         const prefix = ext || fileSize ? ',' : '';
@@ -4713,7 +4724,7 @@
         const [openTableInnerIdx, setOpenTableInnerIdx] = useState(undefined);
         const handleOpenTableInnerIdx = useCallback((_) => setOpenTableInnerIdx(_), []);
         const onHideContentClick = () => setTableInner(undefined);
-        return (jsxs(TariffsTableRowContainer, { onHideContentClick: onHideContentClick, tableInner: tableInner, ...rest, children: [jsx("div", { className: `text-s py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES}`, children: jsxs("div", { className: "flex items-center text-primary-text", role: "cell", children: [header?.icon ? (jsx(ImgInner, { className: "mr-3.5 max-w-6 max-h-6", image: getIconWithVersion(header.icon), width: "24px", height: "24px", asSVG: true })) : null, header?.title ? jsx("div", { className: "text-m-light", children: header?.title }) : null] }) }), data?.length ? (jsx(TableCarouselContainer, { activeIndex: activeIndex, columnWidth: COLUMN_WIDTH$1, version: "tariff", children: data.map((cells, i) => (jsx(TariffsTableCell, { cells: cells, rowIdx: rowIdx, cellIdx: i, setTableInner: handleSetTableInner, tableInner: tableInner, openTableInnerIdx: openTableInnerIdx, setOpenTableInnerIdx: handleOpenTableInnerIdx, ...rest }, String(i)))) })) : null] }));
+        return (jsxs(TariffsTableRowContainer, { onHideContentClick: onHideContentClick, tableInner: tableInner, ...rest, children: [jsx("div", { className: `text-s py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES}`, children: jsxs("div", { className: "flex items-center text-primary-text", role: "cell", children: [header?.icon ? (jsx(ImgInner, { className: "mr-3.5 max-w-6", image: getIconWithVersion(header.icon), width: "24", height: "24", asSVG: true })) : null, header?.title ? jsx("div", { className: "text-m-light", children: header?.title }) : null] }) }), data?.length ? (jsx(TableCarouselContainer, { activeIndex: activeIndex, columnWidth: COLUMN_WIDTH$1, version: "tariff", children: data.map((cells, i) => (jsx(TariffsTableCell, { cells: cells, rowIdx: rowIdx, cellIdx: i, setTableInner: handleSetTableInner, tableInner: tableInner, openTableInnerIdx: openTableInnerIdx, setOpenTableInnerIdx: handleOpenTableInnerIdx, ...rest }, String(i)))) })) : null] }));
     });
 
     const TariffsTable = JSX(({ className = '', title, description, rowHeaders, tariffsColumns: columns, hiddenRowsNum = 0, ...rest }) => {
@@ -4974,7 +4985,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.9.14";
+    const packageVersion = "0.9.16";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;