@redneckz/wildless-cms-uni-blocks 0.9.15 → 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),
         });
@@ -1761,7 +1763,7 @@
         }
     };
     const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }) => isExclude || userInputParams[paramKey] === row[paramKey];
-    const getMiddleMonth = (minMonths, maxMonths) => Math.round((maxMonths - minMonths) / 2);
+    const getMiddleMonth = (minMonths, maxMonths) => minMonths + Math.round((maxMonths - minMonths) / 2);
 
     const DepositCalculatorForm = JSX(({ className = '', sourceBookDir, buttons, footnote, paramsViewSettings }) => {
         const [moneyValue, setMoneyValue] = useState(DEPOSIT_DEFAULT_SUM);
@@ -3040,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) => {
@@ -3049,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 }) => {
@@ -3135,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}` }));
     });
@@ -3272,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 }) }));
     });
@@ -4983,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.15";
+    const packageVersion = "0.9.16";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;