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

package/mobile/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/mobile/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/mobile/src/components/Footer/TextInformationLink.tsx

@@ -10,7 +10,7 @@ interface TextInformationLinkProps extends LinkProps {
 
 export const TextInformationLink = JSX<Partial<TextInformationLinkProps>>(
   ({ className = '', index, ...rest }) => {
-    const link = useLink();
+    const link = useLink({ isRemote: true });
     const { href, target, text, onClick } = link(rest);
 
     return (

package/mobile/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/mobile/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/mobile/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/mobile/src/hooks/useLink.ts

@@ -10,13 +10,20 @@ interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
 
-export function useLink(isRemote = false) {
+interface UseLinkParams {
+  isRemote?: boolean;
+  basePath?: string;
+}
+
+export function useLink(params: UseLinkParams = {}) {
+  const { isRemote, basePath } = params;
+
   const router = useRouter();
   const { close } = useDialog();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...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),
   });

package/mobile/src/services/sitemap/SitemapData.ts

@@ -6,7 +6,7 @@ import type { IconProps, Picture } from '../../model/Picture';
  * @title Ссылка
  * @required ["text", "href"]
  */
-export interface TopMenuItem extends LinkProps {
+export interface TopMenuItemProps extends LinkProps {
   /** @hidden */
   items?: LinkProps[];
 }
@@ -27,7 +27,7 @@ export interface DispositionItem extends LinkProps {
 export type ForeignOffice = LinkProps & IconProps;
 
 export interface SitemapData {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
   dispositions?: DispositionItem[];
   logo?: LogoType;
   foreignOffices?: ForeignOffice[];

package/mobile/src/ui-kit/SearchDialog/SearchDialog.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import type { LinkProps } from '../../model/LinkProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { joinPath } from '../../utils/url';
 import { zip } from '../../utils/zip';
 import { Dialog } from '../Dialog/Dialog';
@@ -11,7 +11,7 @@ import { Sitemap } from '../Sitemap/Sitemap';
 import { SearchInput } from './SearchInput';
 
 export interface SearchDialogProps {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const SEARCH_DIALOG_ID = 'search';
@@ -44,8 +44,8 @@ export const SearchDialog = JSX<SearchDialogProps>(({ topItems }) => {
 });
 
 const combineTopItemsAndSearchResult =
-  (topItems: TopMenuItem[] | undefined) =>
-  (searchResult: SearchResult | null | undefined): TopMenuItem[] =>
+  (topItems: TopMenuItemProps[] | undefined) =>
+  (searchResult: SearchResult | null | undefined): TopMenuItemProps[] =>
     topItems?.length && searchResult?.length
       ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({
           ..._,
@@ -56,7 +56,7 @@ const combineTopItemsAndSearchResult =
       : [];
 
 // Temp
-function printSearchItems(topItems: TopMenuItem[]) {
+function printSearchItems(topItems: TopMenuItemProps[]) {
   for (const _ of topItems.filter(({ items }) => items?.length)) {
     console.group(_.text);
     console.table(_.items, ['text', 'href']);

package/mobile/src/ui-kit/Sitemap/Sitemap.tsx

@@ -2,17 +2,16 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { style } from '../../utils/style';
-import { joinPath } from '../../utils/url';
 
 export interface SitemapProps {
   className?: string;
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
 
   return (
     <div className={style('flex items-start justify-between', className)}>
@@ -21,7 +20,7 @@ export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
   );
 });
 
-const renderColumn = (menuItem: TopMenuItem & { onClick: () => void }, index: number) => {
+const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, index: number) => {
   const { text, items, href, target, onClick } = menuItem;
 
   return (
@@ -50,7 +49,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ 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 (
@@ -59,7 +58,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ text, index, basePath, ...rest }) =>
         '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}
+      href={href}
       target={target || '_self'}
       onClick={onClick}
     >

package/mobile/src/ui-kit/TopItem/TopItem.tsx

@@ -15,7 +15,7 @@ export interface TopItemProps extends TopItemContent {
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
   const { href, target, text, onClick } = link(rest);
 
   return (

package/mobile/src/utils/adjustHref.ts

@@ -2,16 +2,21 @@ import { projectSettings } from '../ProjectSettings';
 import { dirname } from './dirname';
 import { isURL, joinPath } from './url';
 
-export const adjustHref = (router: { pathname: string }) => (href: string | undefined) => {
-  if (!href || isURL(href) || (projectSettings.CDN && href.startsWith(projectSettings.CDN))) {
-    return href;
-  }
+export const adjustHref =
+  (router: { pathname: string }) =>
+  (href: string | undefined, basePath = projectSettings.BASE_PATH) => {
+    if (!href || isURL(href) || hasPrefix(href, projectSettings.CDN)) {
+      return href;
+    }
 
-  const isRelativeToBase = href.startsWith('/');
+    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: string, prefix: string | undefined) =>
+  prefix && href && href.startsWith(prefix);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

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 =>
+  minMonths + 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/Footer/TextInformationLink.tsx

@@ -10,7 +10,7 @@ interface TextInformationLinkProps extends LinkProps {
 
 export const TextInformationLink = JSX<Partial<TextInformationLinkProps>>(
   ({ className = '', index, ...rest }) => {
-    const link = useLink();
+    const link = useLink({ isRemote: true });
     const { href, target, text, onClick } = link(rest);
 
     return (

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/src/hooks/useLink.ts

@@ -10,13 +10,20 @@ interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
 
-export function useLink(isRemote = false) {
+interface UseLinkParams {
+  isRemote?: boolean;
+  basePath?: string;
+}
+
+export function useLink(params: UseLinkParams = {}) {
+  const { isRemote, basePath } = params;
+
   const router = useRouter();
   const { close } = useDialog();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...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),
   });

package/src/services/sitemap/SitemapData.ts

@@ -6,7 +6,7 @@ import type { IconProps, Picture } from '../../model/Picture';
  * @title Ссылка
  * @required ["text", "href"]
  */
-export interface TopMenuItem extends LinkProps {
+export interface TopMenuItemProps extends LinkProps {
   /** @hidden */
   items?: LinkProps[];
 }
@@ -27,7 +27,7 @@ export interface DispositionItem extends LinkProps {
 export type ForeignOffice = LinkProps & IconProps;
 
 export interface SitemapData {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
   dispositions?: DispositionItem[];
   logo?: LogoType;
   foreignOffices?: ForeignOffice[];

package/src/ui-kit/SearchDialog/SearchDialog.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import type { LinkProps } from '../../model/LinkProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { joinPath } from '../../utils/url';
 import { zip } from '../../utils/zip';
 import { Dialog } from '../Dialog/Dialog';
@@ -11,7 +11,7 @@ import { Sitemap } from '../Sitemap/Sitemap';
 import { SearchInput } from './SearchInput';
 
 export interface SearchDialogProps {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const SEARCH_DIALOG_ID = 'search';
@@ -44,8 +44,8 @@ export const SearchDialog = JSX<SearchDialogProps>(({ topItems }) => {
 });
 
 const combineTopItemsAndSearchResult =
-  (topItems: TopMenuItem[] | undefined) =>
-  (searchResult: SearchResult | null | undefined): TopMenuItem[] =>
+  (topItems: TopMenuItemProps[] | undefined) =>
+  (searchResult: SearchResult | null | undefined): TopMenuItemProps[] =>
     topItems?.length && searchResult?.length
       ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({
           ..._,
@@ -56,7 +56,7 @@ const combineTopItemsAndSearchResult =
       : [];
 
 // Temp
-function printSearchItems(topItems: TopMenuItem[]) {
+function printSearchItems(topItems: TopMenuItemProps[]) {
   for (const _ of topItems.filter(({ items }) => items?.length)) {
     console.group(_.text);
     console.table(_.items, ['text', 'href']);

package/src/ui-kit/Sitemap/Sitemap.tsx

@@ -2,17 +2,16 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { style } from '../../utils/style';
-import { joinPath } from '../../utils/url';
 
 export interface SitemapProps {
   className?: string;
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
 
   return (
     <div className={style('flex items-start justify-between', className)}>
@@ -21,7 +20,7 @@ export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
   );
 });
 
-const renderColumn = (menuItem: TopMenuItem & { onClick: () => void }, index: number) => {
+const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, index: number) => {
   const { text, items, href, target, onClick } = menuItem;
 
   return (
@@ -50,7 +49,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ 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 (
@@ -59,7 +58,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ text, index, basePath, ...rest }) =>
         '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}
+      href={href}
       target={target || '_self'}
       onClick={onClick}
     >

package/src/ui-kit/TopItem/TopItem.tsx

@@ -15,7 +15,7 @@ export interface TopItemProps extends TopItemContent {
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
   const { href, target, text, onClick } = link(rest);
 
   return (