@redneckz/wildless-cms-uni-blocks 0.6.43 → 0.6.45

package/mobile/lib/setup-fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAS,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnE,OAAO;QACL,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC7D,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
+{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAS,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE/D,OAAO;QACL,IAAI,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,cAAc;QAC7E,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC7D,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}

package/mobile/lib/utils/normalizeURLPath.d.ts

@@ -0,0 +1 @@
+export declare const normalizeURLPath: (href?: string) => string | undefined;

package/mobile/lib/utils/normalizeURLPath.js

@@ -0,0 +1,9 @@
+import { projectSettings } from '../ProjectSettings.js';
+import { isURL } from './url.js';
+export const normalizeURLPath = (href) => {
+    if (isURL(href) || href?.startsWith('/')) {
+        return href;
+    }
+    return `${projectSettings.BASE_PATH || ''}${href}`;
+};
+//# sourceMappingURL=normalizeURLPath.js.map

package/mobile/lib/utils/normalizeURLPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeURLPath.js","sourceRoot":"","sources":["../../src/utils/normalizeURLPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,GAAG,eAAe,CAAC,SAAS,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;AACrD,CAAC,CAAC"}

package/mobile/lib/utils/url.d.ts

@@ -1,5 +1,6 @@
 export declare const isURL: (href?: string) => boolean | undefined;
 export declare const withoutQuery: (href?: string) => string;
 export declare const getOrigin: (href?: string) => string | undefined;
+export declare const getPathname: (href?: string) => string | undefined;
 export declare const getHash: (href?: string) => string | undefined;
 export declare const isHash: (href?: string) => boolean | undefined;

package/mobile/lib/utils/url.js

@@ -10,6 +10,13 @@ export const getOrigin = (href) => {
     const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
     return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
+export const getPathname = (href) => {
+    if (!href || !isURL(href)) {
+        return undefined;
+    }
+    const url = new URL(href);
+    return url.pathname;
+};
 export const getHash = (href) => {
     if (!href || !isURL(href)) {
         return undefined;

package/mobile/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE;IAC3C,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAE1B,OAAO,GAAG,CAAC,QAAQ,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC"}

package/mobile/lib/wlc.json

@@ -1,5 +1,7 @@
 {
     "PROD_BRANCH": "master",
     "FORCED_DRAFT_FLOW": false,
-    "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
+    "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+    "BASE_PATH": "/natural/",
+    "SITEMAP": "sayt-rshb"
 }

package/mobile/src/ProjectSettings.ts

@@ -7,6 +7,7 @@ export interface ProjectSettings {
   SITEMAP?: string;
   FOOTER?: string;
   CDN?: string; // Should ends with "/"
+  BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
   YANDEX_METRIKA_ID?: string;
 }
@@ -45,6 +46,11 @@ export const projectSettings = new (class implements ProjectSettings {
   get CDN() {
     return this._.CDN;
   }
+  get BASE_PATH() {
+    return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
+      ? `${this._.BASE_PATH}/`
+      : this._.BASE_PATH;
+  }
   get YANDEX_MAP_API_KEY() {
     return this._.YANDEX_MAP_API_KEY;
   }

package/mobile/src/api/LikeAPI.ts

@@ -114,7 +114,7 @@ export function LikeAPI() {
 
   async function auth(): Promise<UserData> {
     try {
-      const userData: UserData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
+      const userData: UserData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
       if (userData?.token) {
         return userData;
       }
@@ -136,7 +136,7 @@ export function LikeAPI() {
 
       const { token, name } = await response.json();
 
-      globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
+      globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
 
       return { token, name } as UserData;
     } catch (e) {

package/mobile/src/hooks/useLink.ts

@@ -1,4 +1,4 @@
-import type { LinkProps } from '../model/LinkProps';
+import type { LinkProps, Target } from '../model/LinkProps';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
 import { adjustHref } from '../utils/adjustHref';
 import { isHash, isURL } from '../utils/url';
@@ -25,11 +25,7 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
       onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
         props.onClick && props.onClick(ev);
 
-        const isLocalHref = href && !isURL(href);
-        const isLocalTarget = !props.target || props.target === '_self';
-
-        if (!isLocalHref || !isLocalTarget) {
-          // Default handle
+        if (isRemoteHref(href, props.target)) {
           return;
         }
 
@@ -37,9 +33,12 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
         if (isHash(href)) {
           blockRouter.goto(href);
         } else {
-          router.push(href);
+          href && router.push(href);
         }
       }, props),
     };
   };
 }
+
+const isRemoteHref = (href?: string, target?: Target) =>
+  isURL(href) || (target && target !== '_self') || href?.startsWith('/');

package/mobile/src/hooks/useLocation.ts

@@ -15,14 +15,10 @@ interface LocationStorageData {
   region: RegionData;
 }
 
-const localStorageLocation = globalThis?.localStorage.getItem('location');
-const currentLocation: LocationStorageData | null = localStorageLocation
-  ? JSON.parse(localStorageLocation)
-  : null;
-
 export function useLocation(
   defaultLocation: string,
 ): [RegionData, (newLocation: RegionData) => void] {
+  const currentLocation = getLocalStorageLocation();
   const [location, setLocation] = useState<RegionData>(
     currentLocation?.region ?? { name: defaultLocation },
   );
@@ -38,7 +34,7 @@ export function useLocation(
 
   const onChangeLocation = useCallback(
     (region: RegionData) => {
-      globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
+      globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
       setLocation(region);
     },
     [setLocation],
@@ -46,3 +42,13 @@ export function useLocation(
 
   return [location, onChangeLocation];
 }
+
+const getLocalStorageLocation = (): LocationStorageData | null => {
+  const localStorageLocation = globalThis.localStorage?.getItem('location');
+
+  try {
+    return localStorageLocation ? JSON.parse(localStorageLocation) : null;
+  } catch (_) {
+    return null;
+  }
+};

package/mobile/src/services/BlockRouter/BlockRouter.ts

@@ -29,7 +29,7 @@ export class BlockRouter {
     }
   }
 
-  goto(rawAnchor: string) {
+  goto(rawAnchor?: string) {
     const anchor = normalizeAnchor(rawAnchor);
     if (anchor) {
       this.push(anchor);

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

@@ -1,6 +1,7 @@
+import type { Router } from '../../hooks/useRouter';
 import { getOrigin } from '../../utils/url';
 
-export const checkIsHrefSameOrigin = (
-  href: string | undefined,
-  router: { pathname?: string; href?: string },
-) => getOrigin(href) === getOrigin(router.href);
+export const checkIsHrefSameOrigin = (href: string | undefined, router: Router) =>
+  [getOrigin(href), getOrigin(router.href)].every(
+    (link, _, arr) => Boolean(link) && link === arr[0],
+  );

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

@@ -1,10 +1,13 @@
-import { isURL, withoutQuery } from '../../utils/url';
+import { normalizeURLPath } from '../../utils/normalizeURLPath';
+import { getPathname, isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive = (
   href: string | undefined,
   router: { pathname?: string; href?: string },
   cmp: (targetHref: string, baseHref: string) => boolean = (targetHref, baseHref) =>
     baseHref.startsWith(targetHref),
-) => {
-  return cmp(withoutQuery(href), withoutQuery(isURL(href) ? router.href : router.pathname));
-};
+) =>
+  cmp(
+    withoutQuery(normalizeURLPath(href)),
+    withoutQuery(isURL(href) ? router.href : getPathname(router.href)),
+  );

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

@@ -1,4 +1,5 @@
 import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
 import { checkIsHrefSameOrigin } from './checkIsHrefSameOrigin';
 import { isHrefActive } from './isHrefActive';
 import { isSubItemActive } from './isSubItemActive';
@@ -9,4 +10,5 @@ export const isTopItemActive =
   (topItem: TopMenuItem): boolean =>
     topItem.items?.some(isSubItemActive(router)) ||
     isHrefActive(topItem.href, router) ||
-    checkIsHrefSameOrigin(topItem.href, router);
+    checkIsHrefSameOrigin(topItem.href, router) ||
+    Boolean(projectSettings.BASE_PATH?.startsWith(topItem.href || '/'));

package/mobile/src/setup-fixture.ts

@@ -8,11 +8,11 @@ import wlc from './wlc.json';
 projectSettings.setup(wlc);
 
 useRouter.setup(() => {
-  const [href, setHref] = useState<string>(globalThis.location.href);
+  const [, setHref] = useState<string>(globalThis.location.href);
 
   return {
-    href: href,
-    pathname: '/credits',
+    href: `${globalThis.location.origin}${projectSettings.BASE_PATH}cards-credit`, //for header active links
+    pathname: '/cards-credit',
     query: {},
     push: (url: string) => {
       globalThis.history.pushState(null, '', url);

package/mobile/src/utils/normalizeURLPath.ts

@@ -0,0 +1,10 @@
+import { projectSettings } from '../ProjectSettings';
+import { isURL } from './url';
+
+export const normalizeURLPath = (href?: string) => {
+  if (isURL(href) || href?.startsWith('/')) {
+    return href;
+  }
+
+  return `${projectSettings.BASE_PATH || ''}${href}`;
+};

package/mobile/src/utils/url.ts

@@ -15,6 +15,16 @@ export const getOrigin = (href?: string) => {
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 
+export const getPathname = (href?: string) => {
+  if (!href || !isURL(href)) {
+    return undefined;
+  }
+
+  const url = new URL(href);
+
+  return url.pathname;
+};
+
 export const getHash = (href?: string) => {
   if (!href || !isURL(href)) {
     return undefined;

package/mobile/src/wlc.json

@@ -1,5 +1,7 @@
 {
   "PROD_BRANCH": "master",
   "FORCED_DRAFT_FLOW": false,
-  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
+  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+  "BASE_PATH": "/natural/",
+  "SITEMAP": "sayt-rshb"
 }

package/package.json

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

package/src/ProjectSettings.ts

@@ -7,6 +7,7 @@ export interface ProjectSettings {
   SITEMAP?: string;
   FOOTER?: string;
   CDN?: string; // Should ends with "/"
+  BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
   YANDEX_METRIKA_ID?: string;
 }
@@ -45,6 +46,11 @@ export const projectSettings = new (class implements ProjectSettings {
   get CDN() {
     return this._.CDN;
   }
+  get BASE_PATH() {
+    return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
+      ? `${this._.BASE_PATH}/`
+      : this._.BASE_PATH;
+  }
   get YANDEX_MAP_API_KEY() {
     return this._.YANDEX_MAP_API_KEY;
   }

package/src/api/LikeAPI.ts

@@ -114,7 +114,7 @@ export function LikeAPI() {
 
   async function auth(): Promise<UserData> {
     try {
-      const userData: UserData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
+      const userData: UserData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
       if (userData?.token) {
         return userData;
       }
@@ -136,7 +136,7 @@ export function LikeAPI() {
 
       const { token, name } = await response.json();
 
-      globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
+      globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
 
       return { token, name } as UserData;
     } catch (e) {

package/src/components/Header/Header.tsx

@@ -1,8 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Router, useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../hooks/useRouter';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { TopMenuItem } from '../../model/SitemapProps';
 import { projectSettings } from '../../ProjectSettings';
 import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
 import type { SitemapDataProps } from '../../services/sitemap/SitemapProps';
@@ -31,7 +30,7 @@ export const Header = JSX<HeaderProps>(
         rest.options?.page?.fallback,
       );
 
-    const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;
+    const activeTopItem = topItems?.find(isTopItemActive(router));
 
     const topMenu = topItems?.map((_, i) => (
       <TopItem
@@ -72,10 +71,3 @@ export const Header = JSX<HeaderProps>(
     );
   },
 );
-
-const getActiveItem = (topItems: TopMenuItem[] | undefined, router: Router) => {
-  const [firstPortal] = topItems || [];
-
-  // Если по слагу невозможно понять к какому подпорталу этот слаг относиться, то выбираем первый подпортал.
-  return topItems?.find(isTopItemActive(router)) || firstPortal;
-};

package/src/hooks/useLink.ts

@@ -1,4 +1,4 @@
-import type { LinkProps } from '../model/LinkProps';
+import type { LinkProps, Target } from '../model/LinkProps';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
 import { adjustHref } from '../utils/adjustHref';
 import { isHash, isURL } from '../utils/url';
@@ -25,11 +25,7 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
       onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
         props.onClick && props.onClick(ev);
 
-        const isLocalHref = href && !isURL(href);
-        const isLocalTarget = !props.target || props.target === '_self';
-
-        if (!isLocalHref || !isLocalTarget) {
-          // Default handle
+        if (isRemoteHref(href, props.target)) {
           return;
         }
 
@@ -37,9 +33,12 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
         if (isHash(href)) {
           blockRouter.goto(href);
         } else {
-          router.push(href);
+          href && router.push(href);
         }
       }, props),
     };
   };
 }
+
+const isRemoteHref = (href?: string, target?: Target) =>
+  isURL(href) || (target && target !== '_self') || href?.startsWith('/');

package/src/hooks/useLocation.ts

@@ -15,14 +15,10 @@ interface LocationStorageData {
   region: RegionData;
 }
 
-const localStorageLocation = globalThis?.localStorage.getItem('location');
-const currentLocation: LocationStorageData | null = localStorageLocation
-  ? JSON.parse(localStorageLocation)
-  : null;
-
 export function useLocation(
   defaultLocation: string,
 ): [RegionData, (newLocation: RegionData) => void] {
+  const currentLocation = getLocalStorageLocation();
   const [location, setLocation] = useState<RegionData>(
     currentLocation?.region ?? { name: defaultLocation },
   );
@@ -38,7 +34,7 @@ export function useLocation(
 
   const onChangeLocation = useCallback(
     (region: RegionData) => {
-      globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
+      globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
       setLocation(region);
     },
     [setLocation],
@@ -46,3 +42,13 @@ export function useLocation(
 
   return [location, onChangeLocation];
 }
+
+const getLocalStorageLocation = (): LocationStorageData | null => {
+  const localStorageLocation = globalThis.localStorage?.getItem('location');
+
+  try {
+    return localStorageLocation ? JSON.parse(localStorageLocation) : null;
+  } catch (_) {
+    return null;
+  }
+};

package/src/services/BlockRouter/BlockRouter.ts

@@ -29,7 +29,7 @@ export class BlockRouter {
     }
   }
 
-  goto(rawAnchor: string) {
+  goto(rawAnchor?: string) {
     const anchor = normalizeAnchor(rawAnchor);
     if (anchor) {
       this.push(anchor);

package/src/services/sitemap/checkIsHrefSameOrigin.ts

@@ -1,6 +1,7 @@
+import type { Router } from '../../hooks/useRouter';
 import { getOrigin } from '../../utils/url';
 
-export const checkIsHrefSameOrigin = (
-  href: string | undefined,
-  router: { pathname?: string; href?: string },
-) => getOrigin(href) === getOrigin(router.href);
+export const checkIsHrefSameOrigin = (href: string | undefined, router: Router) =>
+  [getOrigin(href), getOrigin(router.href)].every(
+    (link, _, arr) => Boolean(link) && link === arr[0],
+  );

package/src/services/sitemap/isHrefActive.ts

@@ -1,10 +1,13 @@
-import { isURL, withoutQuery } from '../../utils/url';
+import { normalizeURLPath } from '../../utils/normalizeURLPath';
+import { getPathname, isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive = (
   href: string | undefined,
   router: { pathname?: string; href?: string },
   cmp: (targetHref: string, baseHref: string) => boolean = (targetHref, baseHref) =>
     baseHref.startsWith(targetHref),
-) => {
-  return cmp(withoutQuery(href), withoutQuery(isURL(href) ? router.href : router.pathname));
-};
+) =>
+  cmp(
+    withoutQuery(normalizeURLPath(href)),
+    withoutQuery(isURL(href) ? router.href : getPathname(router.href)),
+  );

package/src/services/sitemap/isTopItemActive.ts

@@ -1,4 +1,5 @@
 import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
 import { checkIsHrefSameOrigin } from './checkIsHrefSameOrigin';
 import { isHrefActive } from './isHrefActive';
 import { isSubItemActive } from './isSubItemActive';
@@ -9,4 +10,5 @@ export const isTopItemActive =
   (topItem: TopMenuItem): boolean =>
     topItem.items?.some(isSubItemActive(router)) ||
     isHrefActive(topItem.href, router) ||
-    checkIsHrefSameOrigin(topItem.href, router);
+    checkIsHrefSameOrigin(topItem.href, router) ||
+    Boolean(projectSettings.BASE_PATH?.startsWith(topItem.href || '/'));

package/src/setup-fixture.ts

@@ -8,11 +8,11 @@ import wlc from './wlc.json';
 projectSettings.setup(wlc);
 
 useRouter.setup(() => {
-  const [href, setHref] = useState<string>(globalThis.location.href);
+  const [, setHref] = useState<string>(globalThis.location.href);
 
   return {
-    href: href,
-    pathname: '/credits',
+    href: `${globalThis.location.origin}${projectSettings.BASE_PATH}cards-credit`, //for header active links
+    pathname: '/cards-credit',
     query: {},
     push: (url: string) => {
       globalThis.history.pushState(null, '', url);

package/src/utils/normalizeURLPath.ts

@@ -0,0 +1,10 @@
+import { projectSettings } from '../ProjectSettings';
+import { isURL } from './url';
+
+export const normalizeURLPath = (href?: string) => {
+  if (isURL(href) || href?.startsWith('/')) {
+    return href;
+  }
+
+  return `${projectSettings.BASE_PATH || ''}${href}`;
+};

package/src/utils/url.ts

@@ -15,6 +15,16 @@ export const getOrigin = (href?: string) => {
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 
+export const getPathname = (href?: string) => {
+  if (!href || !isURL(href)) {
+    return undefined;
+  }
+
+  const url = new URL(href);
+
+  return url.pathname;
+};
+
 export const getHash = (href?: string) => {
   if (!href || !isURL(href)) {
     return undefined;

package/src/wlc.json

@@ -1,5 +1,7 @@
 {
   "PROD_BRANCH": "master",
   "FORCED_DRAFT_FLOW": false,
-  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
+  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+  "BASE_PATH": "/natural/",
+  "SITEMAP": "sayt-rshb"
 }