@redneckz/wildless-cms-uni-blocks 0.8.10 → 0.8.12

package/bundle/services/BlockRouter/BlockRouter.d.ts

@@ -1,4 +1,2 @@
-import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
-export declare function gotoBlock(router: Router, anchor?: string): void;
-export declare function trackBlock(router: Router, block?: BlockDef): void;
+export declare function trackBlock(block?: BlockDef): void;

package/bundle/ui-kit/Img/ImgAsPicture.d.ts

@@ -1,4 +1,2 @@
-import type { ImgSource } from '../../model/Picture';
 import type { ImageProps } from './ImgProps';
 export declare const ImgAsPicture: import("@redneckz/uni-jsx").UNIComponent<ImageProps, any, any>;
-export declare function formatToMimeType(format: ImgSource['format']): string | undefined;

package/bundle/utils/adjustHref.d.ts

@@ -0,0 +1,3 @@
+export declare const adjustHref: (router: {
+    pathname: string;
+}) => (href: string | undefined) => string | undefined;

package/bundle/utils/dirname.d.ts

@@ -0,0 +1 @@
+export declare const dirname: (path: string | undefined) => string | undefined;

package/bundle/utils/url.d.ts

@@ -1,6 +1,6 @@
 import type { Target } from '../model/LinkProps';
-export declare const isURL: (href?: string) => href is `${string}//${string}`;
+export declare const isURL: (href?: string) => href is `${string}:${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href?: string) => href is `#${string}`;
 export declare const withoutQuery: (href?: string) => string;
-export declare const joinPath: (...path: string[]) => string;
+export declare const joinPath: (...path: (string | undefined)[]) => string;

package/dist/ProjectSettings.js

@@ -28,12 +28,10 @@ exports.projectSettings = new (class {
         return this._.FOOTER;
     }
     get CDN() {
-        return this._.CDN;
+        return appendSlash(this._.CDN);
     }
     get BASE_PATH() {
-        return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
-            ? `${this._.BASE_PATH}/`
-            : this._.BASE_PATH;
+        return appendSlash(this._.BASE_PATH);
     }
     get YANDEX_MAP_API_KEY() {
         return this._.YANDEX_MAP_API_KEY;
@@ -42,4 +40,5 @@ exports.projectSettings = new (class {
         return this._.YANDEX_METRIKA_ID;
     }
 })();
+const appendSlash = (url) => (url && !url.endsWith('/') ? `${url}/` : url);
 //# sourceMappingURL=ProjectSettings.js.map

package/dist/ProjectSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":";;AAcA,MAAM,wBAAwB,GAAoB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAE/D,QAAA,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB,wBAAwB,CAAC;IAE9C,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,wBAAwB,CAAC,WAAW,CAAC;IACpE,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxD,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
+{"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":";;AAcA,MAAM,wBAAwB,GAAoB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAE/D,QAAA,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB,wBAAwB,CAAC;IAE9C,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,wBAAwB,CAAC,WAAW,CAAC;IACpE,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,SAAS;QACX,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC;AAEL,MAAM,WAAW,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC"}

package/dist/hooks/useLink.js

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLink = void 0;
-const ProjectSettings_1 = require("../ProjectSettings");
-const BlockRouter_1 = require("../services/BlockRouter/BlockRouter");
+const adjustHref_1 = require("../utils/adjustHref");
 const url_1 = require("../utils/url");
 const handlerDecorator_1 = require("./handlerDecorator");
 const useRouter_1 = require("./useRouter");
@@ -9,31 +8,20 @@ function useLink(isRemote) {
     const router = (0, useRouter_1.useRouter)();
     return (props) => ({
         ...props,
-        href: adjustHref(props.href),
+        href: isRemote ? props.href : (0, adjustHref_1.adjustHref)(router)(props.href),
         'aria-label': props.text,
         onClick: (0, handlerDecorator_1.handlerDecorator)(handleHref(props), props),
     });
-    function adjustHref(href) {
-        const isRelativeToBase = !isRemote && href?.startsWith('/');
-        return ProjectSettings_1.projectSettings.BASE_PATH && href && isRelativeToBase
-            ? (0, url_1.joinPath)(ProjectSettings_1.projectSettings.BASE_PATH, href)
-            : href;
-    }
     function handleHref({ href, target, onClick }) {
         return (ev) => {
             onClick && onClick(ev);
-            if (isRemote || !(0, url_1.isLocalURL)(href, target)) {
+            if (!href || isRemote || !(0, url_1.isLocalURL)(href, target)) {
                 // Default routing
                 return;
             }
             // Client routing
             ev?.preventDefault();
-            if ((0, url_1.isHash)(href)) {
-                (0, BlockRouter_1.gotoBlock)(router, href);
-            }
-            else if (href) {
-                router.push(href);
-            }
+            router.push(href);
         };
     }
 }

package/dist/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AACA,wDAAqD;AACrD,qEAAgE;AAChE,sCAA4D;AAC5D,yDAAsD;AACtD,2CAAwC;AAUxC,SAAgB,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,IAAwB;QAC1C,MAAM,gBAAgB,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5D,OAAO,iCAAe,CAAC,SAAS,IAAI,IAAI,IAAI,gBAAgB;YAC1D,CAAC,CAAC,IAAA,cAAQ,EAAC,iCAAe,CAAC,SAAS,EAAE,IAAI,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAED,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,QAAQ,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,IAAI,IAAA,YAAM,EAAC,IAAI,CAAC,EAAE;gBAChB,IAAA,uBAAS,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACzB;iBAAM,IAAI,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AApCD,0BAoCC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AACA,oDAAiD;AACjD,sCAA0C;AAC1C,yDAAsD;AACtD,2CAAwC;AAUxC,SAAgB,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAxBD,0BAwBC"}

package/dist/services/BlockRouter/BlockRouter.d.ts

@@ -1,4 +1,2 @@
-import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
-export declare function gotoBlock(router: Router, anchor?: string): void;
-export declare function trackBlock(router: Router, block?: BlockDef): void;
+export declare function trackBlock(block?: BlockDef): void;

package/dist/services/BlockRouter/BlockRouter.js

@@ -1,14 +1,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trackBlock = exports.gotoBlock = void 0;
+exports.trackBlock = void 0;
 const normalizeAnchor = (anchor) => anchor?.replace('#', '') || '';
-function gotoBlock(router, anchor) {
-    router.replace(`#${normalizeAnchor(anchor)}`);
-}
-exports.gotoBlock = gotoBlock;
-function trackBlock(router, block) {
-    router.replace(`#${normalizeAnchor(block?.anchor)}`, undefined, {
-        scroll: false,
-    });
+function trackBlock(block) {
+    const hash = `#${normalizeAnchor(block?.anchor)}`;
+    if (globalThis.location?.hash !== hash) {
+        globalThis.history?.replaceState(globalThis.history?.state, '', hash);
+    }
 }
 exports.trackBlock = trackBlock;
 //# sourceMappingURL=BlockRouter.js.map

package/dist/services/BlockRouter/BlockRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":";;AAGA,MAAM,eAAe,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAE5E,SAAgB,SAAS,CAAC,MAAc,EAAE,MAAe;IACvD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAFD,8BAEC;AAED,SAAgB,UAAU,CAAC,MAAc,EAAE,KAAgB;IACzD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC;AAJD,gCAIC"}
+{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":";;AAEA,MAAM,eAAe,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAE5E,SAAgB,UAAU,CAAC,KAAgB;IACzC,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;IAElD,IAAI,UAAU,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;QACtC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;KACvE;AACH,CAAC;AAND,gCAMC"}

package/dist/services/BlockRouter/useBlockRouterProvider.js

@@ -1,14 +1,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useBlockRouterProvider = void 0;
 const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
-const useRouter_1 = require("../../hooks/useRouter");
 const debounce_1 = require("../../utils/debounce");
 const BlockRouter_1 = require("./BlockRouter");
 const blockRouterEventBus_1 = require("./blockRouterEventBus");
 const findActiveBlock_1 = require("./findActiveBlock");
 const isScrolledEnough = () => globalThis.scrollY > (globalThis.innerHeight * 3) / 4;
 function useBlockRouterProvider(scrollTarget = globalThis) {
-    const router = (0, useRouter_1.useRouter)();
     const intersectionsMapRef = (0, hooks_1.useRef)(new Map());
     (0, hooks_1.useEffect)(() => blockRouterEventBus_1.blockRouterEventBus.subscribe('intersection', ({ block, intersection }) => {
         if (intersectionsMapRef.current) {
@@ -17,20 +15,14 @@ function useBlockRouterProvider(scrollTarget = globalThis) {
     }), []);
     (0, hooks_1.useEffect)(() => {
         const handleScroll = (0, debounce_1.debounce)(() => {
-            if (isScrolledEnough()) {
-                const activeBlock = (0, findActiveBlock_1.findActiveBlock)([...(intersectionsMapRef.current || [])]);
-                (0, BlockRouter_1.trackBlock)(router, activeBlock);
-            }
-            else {
-                (0, BlockRouter_1.trackBlock)(router);
-            }
+            (0, BlockRouter_1.trackBlock)(isScrolledEnough() ? (0, findActiveBlock_1.findActiveBlock)([...(intersectionsMapRef.current || [])]) : undefined);
         }, 100);
         scrollTarget.addEventListener('scroll', handleScroll);
         return () => {
             handleScroll.dispose();
             scrollTarget.removeEventListener('scroll', handleScroll);
         };
-    }, [router, scrollTarget]);
+    }, [scrollTarget]);
 }
 exports.useBlockRouterProvider = useBlockRouterProvider;
 //# sourceMappingURL=useBlockRouterProvider.js.map

package/dist/services/BlockRouter/useBlockRouterProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBlockRouterProvider.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockRouterProvider.ts"],"names":[],"mappings":";;AAAA,uDAAgE;AAChE,qDAAkD;AAElD,mDAAgD;AAChD,+CAA2C;AAC3C,+DAA4D;AAC5D,uDAAoD;AAEpD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAErF,SAAgB,sBAAsB,CAAC,eAA4B,UAAU;IAC3E,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,MAAM,mBAAmB,GAAG,IAAA,cAAM,EAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAExF,IAAA,iBAAS,EACP,GAAG,EAAE,CACH,yCAAmB,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QACxE,IAAI,mBAAmB,CAAC,OAAO,EAAE;YAC/B,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,EACJ,EAAE,CACH,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,IAAA,mBAAQ,EAAC,GAAG,EAAE;YACjC,IAAI,gBAAgB,EAAE,EAAE;gBACtB,MAAM,WAAW,GAAG,IAAA,iCAAe,EAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9E,IAAA,wBAAU,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;aACjC;iBAAM;gBACL,IAAA,wBAAU,EAAC,MAAM,CAAC,CAAC;aACpB;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEtD,OAAO,GAAG,EAAE;YACV,YAAY,CAAC,OAAO,EAAE,CAAC;YACvB,YAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;AAC7B,CAAC;AAhCD,wDAgCC"}
+{"version":3,"file":"useBlockRouterProvider.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockRouterProvider.ts"],"names":[],"mappings":";;AAAA,uDAAgE;AAEhE,mDAAgD;AAChD,+CAA2C;AAC3C,+DAA4D;AAC5D,uDAAoD;AAEpD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAErF,SAAgB,sBAAsB,CAAC,eAA4B,UAAU;IAC3E,MAAM,mBAAmB,GAAG,IAAA,cAAM,EAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAExF,IAAA,iBAAS,EACP,GAAG,EAAE,CACH,yCAAmB,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QACxE,IAAI,mBAAmB,CAAC,OAAO,EAAE;YAC/B,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,EACJ,EAAE,CACH,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,IAAA,mBAAQ,EAAC,GAAG,EAAE;YACjC,IAAA,wBAAU,EACR,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAC3F,CAAC;QACJ,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEtD,OAAO,GAAG,EAAE;YACV,YAAY,CAAC,OAAO,EAAE,CAAC;YACvB,YAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;AACrB,CAAC;AA3BD,wDA2BC"}

package/dist/setup-fixture.js

@@ -7,10 +7,11 @@ const react_1 = require("react");
 const handlerDecorator_1 = require("./hooks/handlerDecorator");
 const useRouter_1 = require("./hooks/useRouter");
 const ProjectSettings_1 = require("./ProjectSettings");
+const url_1 = require("./utils/url");
 const wlc_json_1 = __importDefault(require("./wlc.json"));
 ProjectSettings_1.projectSettings.setup(wlc_json_1.default);
 useRouter_1.useRouter.setup(() => {
-    const [href, setHref] = (0, react_1.useState)(`${globalThis.location.origin}${ProjectSettings_1.projectSettings.BASE_PATH}cards-credit`);
+    const [href, setHref] = (0, react_1.useState)((0, url_1.joinPath)(globalThis.location.origin, ProjectSettings_1.projectSettings.BASE_PATH, 'cards-credit'));
     (0, react_1.useEffect)(() => {
         const handleHistoryChange = () => {
             setHref(globalThis.location.href);
@@ -22,9 +23,7 @@ useRouter_1.useRouter.setup(() => {
     }, []);
     return {
         href,
-        pathname: ProjectSettings_1.projectSettings.BASE_PATH
-            ? new URL(href).pathname.substring(ProjectSettings_1.projectSettings.BASE_PATH.length - 1)
-            : '',
+        pathname: new URL(href).pathname.substring(ProjectSettings_1.projectSettings.BASE_PATH ? ProjectSettings_1.projectSettings.BASE_PATH.length - 1 : 0),
         query: {},
         push: (url) => {
             globalThis.history.pushState(null, '', url);

package/dist/setup-fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":";;;;AAAA,6CAA2C;AAC3C,iCAA4C;AAC5C,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAoD;AACpD,0DAA6B;AAE7B,iCAAe,CAAC,KAAK,CAAC,kBAAG,CAAC,CAAC;AAE3B,qBAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAC9B,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,iCAAe,CAAC,SAAS,cAAc,CACxE,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,iCAAe,CAAC,SAAS;YACjC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,iCAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YACxE,CAAC,CAAC,EAAE;QACN,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mCAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
+{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":";;;;AAAA,6CAA2C;AAC3C,iCAA4C;AAC5C,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAoD;AACpD,qCAAuC;AACvC,0DAA6B;AAE7B,iCAAe,CAAC,KAAK,CAAC,kBAAG,CAAC,CAAC;AAE3B,qBAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAC9B,IAAA,cAAQ,EAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,iCAAe,CAAC,SAAS,EAAE,cAAc,CAAC,CAChF,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CACxC,iCAAe,CAAC,SAAS,CAAC,CAAC,CAAC,iCAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CACrE;QACD,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mCAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}

package/dist/ui-kit/BlockWrapper.js

@@ -19,8 +19,9 @@ exports.BlockWrapper = (0, uni_jsx_1.JSX)(({ className = '', version = 'primary'
     const [isVisible, setVisible] = (0, hooks_1.useState)(true);
     (0, hooks_1.useEffect)(() => defaultEventBus_1.defaultEventBus.subscribe('tab', (event) => {
         if (event.type === 'group') {
-            const hasSettings = block?.labels?.length || block?.anchor;
-            setVisible(event.label ? !hasSettings || Boolean(block?.labels?.includes(event.label)) : true);
+            setVisible(!block?.labels?.length ||
+                !event.label ||
+                Boolean(block?.labels?.includes(event.label)));
         }
         else {
             setVisible(true);

package/dist/ui-kit/BlockWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAkE;AAClE,iEAA8D;AAG9D,uGAAoG;AACpG,0CAAuC;AAO1B,QAAA,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEW,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,IAAA,2DAA4B,EAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,iBAAS,EACP,GAAG,EAAE,CACH,iCAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,WAAW,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC;YAC3D,UAAU,CACR,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACnF,CAAC;SACH;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,uBAAC,GAAG,IACF,SAAS,EAAE,IAAA,aAAK,EAAC,OAAO,EAAE,mBAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAkE;AAClE,iEAA8D;AAG9D,uGAAoG;AACpG,0CAAuC;AAO1B,QAAA,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEW,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,IAAA,2DAA4B,EAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,iBAAS,EACP,GAAG,EAAE,CACH,iCAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,UAAU,CACR,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM;gBACpB,CAAC,KAAK,CAAC,KAAK;gBACZ,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAChD,CAAC;SACH;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,uBAAC,GAAG,IACF,SAAS,EAAE,IAAA,aAAK,EAAC,OAAO,EAAE,mBAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}

package/dist/ui-kit/Icon/Icon.js

@@ -2,8 +2,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Icon = void 0;
 const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
 const uni_jsx_1 = require("@redneckz/uni-jsx");
+const useRouter_1 = require("../../hooks/useRouter");
 const ProjectSettings_1 = require("../../ProjectSettings");
+const adjustHref_1 = require("../../utils/adjustHref");
 const style_1 = require("../../utils/style");
+const url_1 = require("../../utils/url");
 const svgUseStyleMap = {
     normal: '',
     color: 'text-primary-main',
@@ -11,7 +14,8 @@ const svgUseStyleMap = {
     white: 'text-black',
 };
 exports.Icon = (0, uni_jsx_1.JSX)(({ className = '', imageClassName = '', name = '', alt = `Иконка ${name}`, title = alt, iconVersion = 'color', asSVG, ...imgProps }) => {
-    const href = `${ProjectSettings_1.projectSettings.CDN || ''}icons/${name}.svg`;
+    const router = (0, useRouter_1.useRouter)();
+    const href = (0, adjustHref_1.adjustHref)(router)((0, url_1.joinPath)(ProjectSettings_1.projectSettings.CDN, '/icons', `${name}.svg`));
     if (asSVG && iconVersion !== 'normal') {
         return ((0, jsx_runtime_1.jsx)(Background, { className: className, children: (0, jsx_runtime_1.jsxs)("svg", { className: (0, style_1.style)(getSvgSize(imgProps.width), svgUseStyleMap[iconVersion], iconVersion === 'white' ? 'invert' : '', imageClassName), ...imgProps, "aria-hidden": "true", children: [title ? (0, jsx_runtime_1.jsx)("title", { children: title }) : null, alt ? (0, jsx_runtime_1.jsx)("desc", { children: alt }) : null, (0, jsx_runtime_1.jsx)("use", { href: `${href}#icon`, xlinkHref: `${href}#icon` })] }) }));
     }

package/dist/ui-kit/Icon/Icon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../src/ui-kit/Icon/Icon.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,2DAAwD;AACxD,6CAA0C;AAG1C,MAAM,cAAc,GAAgC;IAClD,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;CACpB,CAAC;AAEW,QAAA,IAAI,GAAG,IAAA,aAAG,EACrB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,cAAc,GAAG,EAAE,EACnB,IAAI,GAAG,EAAE,EACT,GAAG,GAAG,UAAU,IAAI,EAAE,EACtB,KAAK,GAAG,GAAG,EACX,WAAW,GAAG,OAAO,EACrB,KAAK,EACL,GAAG,QAAQ,EACZ,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,GAAG,iCAAe,CAAC,GAAG,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC;IAE7D,IAAI,KAAK,IAAI,WAAW,KAAK,QAAQ,EAAE;QACrC,OAAO,CACL,uBAAC,UAAU,IAAC,SAAS,EAAE,SAAS,YAC9B,iCACE,SAAS,EAAE,IAAA,aAAK,EACd,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1B,cAAc,CAAC,WAAW,CAAC,EAC3B,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EACvC,cAAc,CACf,KACG,QAAQ,iBACA,MAAM,aAEjB,KAAK,CAAC,CAAC,CAAC,4CAAQ,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EACrC,GAAG,CAAC,CAAC,CAAC,2CAAO,GAAG,GAAQ,CAAC,CAAC,CAAC,IAAI,EAChC,gCAAK,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,OAAO,GAAI,IACpD,GACK,CACd,CAAC;KACH;IAED,OAAO,CACL,gCACE,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,KACR,QAAQ,iBACA,MAAM,GAClB,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;AAEtE,MAAM,UAAU,GAAG,IAAA,aAAG,EAAyB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CACzE,SAAS,CAAC,CAAC,CAAC,gCAAK,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAAC,CAAC,CAAC,QAAQ,CACnE,CAAC"}
+{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../src/ui-kit/Icon/Icon.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,qDAAkD;AAElD,2DAAwD;AACxD,uDAAoD;AACpD,6CAA0C;AAC1C,yCAA2C;AAG3C,MAAM,cAAc,GAAgC;IAClD,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;CACpB,CAAC;AAEW,QAAA,IAAI,GAAG,IAAA,aAAG,EACrB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,cAAc,GAAG,EAAE,EACnB,IAAI,GAAG,EAAE,EACT,GAAG,GAAG,UAAU,IAAI,EAAE,EACtB,KAAK,GAAG,GAAG,EACX,WAAW,GAAG,OAAO,EACrB,KAAK,EACL,GAAG,QAAQ,EACZ,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,IAAA,cAAQ,EAAC,iCAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC;IAExF,IAAI,KAAK,IAAI,WAAW,KAAK,QAAQ,EAAE;QACrC,OAAO,CACL,uBAAC,UAAU,IAAC,SAAS,EAAE,SAAS,YAC9B,iCACE,SAAS,EAAE,IAAA,aAAK,EACd,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1B,cAAc,CAAC,WAAW,CAAC,EAC3B,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EACvC,cAAc,CACf,KACG,QAAQ,iBACA,MAAM,aAEjB,KAAK,CAAC,CAAC,CAAC,4CAAQ,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EACrC,GAAG,CAAC,CAAC,CAAC,2CAAO,GAAG,GAAQ,CAAC,CAAC,CAAC,IAAI,EAChC,gCAAK,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,OAAO,GAAI,IACpD,GACK,CACd,CAAC;KACH;IAED,OAAO,CACL,gCACE,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,KACR,QAAQ,iBACA,MAAM,GAClB,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;AAEtE,MAAM,UAAU,GAAG,IAAA,aAAG,EAAyB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,CACzE,SAAS,CAAC,CAAC,CAAC,gCAAK,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAAC,CAAC,CAAC,QAAQ,CACnE,CAAC"}

package/dist/ui-kit/Img/ImgAsPicture.d.ts

@@ -1,4 +1,2 @@
-import type { ImgSource } from '../../model/Picture';
 import type { ImageProps } from './ImgProps';
 export declare const ImgAsPicture: import("@redneckz/uni-jsx").UNIComponent<ImageProps, any, any>;
-export declare function formatToMimeType(format: ImgSource['format']): string | undefined;

package/dist/ui-kit/Img/ImgAsPicture.js

@@ -1,23 +1,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatToMimeType = exports.ImgAsPicture = void 0;
+exports.ImgAsPicture = void 0;
 const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
 const uni_jsx_1 = require("@redneckz/uni-jsx");
-const sourcesComparator = (a, b) => {
-    if (a.media && b.media) {
-        return a.media - b.media;
-    }
-    return 0;
-};
+const useRouter_1 = require("../../hooks/useRouter");
+const adjustHref_1 = require("../../utils/adjustHref");
+const url_1 = require("../../utils/url");
+const sourcesComparator = (a, b) => a?.media && b?.media ? a.media - b.media : 0;
 exports.ImgAsPicture = (0, uni_jsx_1.JSX)(({ className = '', image, imageClassName = '', isMobile = false, pathPrefix }) => {
-    if (!image || (!image?.sources && !image?.src)) {
-        return null;
-    }
+    const router = (0, useRouter_1.useRouter)();
     const pictureStyles = isMobile ? 'flex' : 'flex-none';
     return ((0, jsx_runtime_1.jsxs)("picture", { className: `${pictureStyles} ${className}`, children: [image?.sources?.length
                 ? image.sources
+                    .filter((_) => _?.src)
                     .sort(sourcesComparator)
-                    .map(({ src, format, media }, index) => ((0, jsx_runtime_1.jsx)("source", { srcSet: addPathPrefixToSrcSet(src, pathPrefix), type: formatToMimeType(format), media: media ? `(max-width: ${media}px)` : '', ...image.size }, `${index}_${src}`)))
-                : null, renderImg({ ...image, src: addPathPrefixToSrc(image.src, pathPrefix) }, imageClassName, isMobile)] }));
+                    .map(({ src, format, media }, index) => ((0, jsx_runtime_1.jsx)("source", { srcSet: adjustSrcset(router, pathPrefix)(src), type: formatToMimeType(format), media: media ? `(max-width: ${media}px)` : '', ...image.size }, `${index}_${src}`)))
+                : null, image?.src
+                ? renderImg({ ...image, src: adjustSrcset(router, pathPrefix)(image.src) }, imageClassName, isMobile)
+                : null] }));
 });
 const renderImg = (image, imageClassName = '', isMobile = false) => {
     const style = {
@@ -29,14 +28,12 @@ const renderImg = (image, imageClassName = '', isMobile = false) => {
     const imgStyle = isMobile ? 'm-auto' : 'm-0';
     return ((0, jsx_runtime_1.jsx)("img", { src: image.src, className: `${imgStyle} ${imageClassName}`, alt: alt, title: title, style: style, ...image.size }));
 };
-const normalizePathPrefix = (pathPrefix = '') => pathPrefix && !pathPrefix.endsWith('/') ? `${pathPrefix}/` : pathPrefix;
-const addPathPrefixToSrc = (src, pathPrefix) => !src || src?.startsWith('data:image') ? src : `${normalizePathPrefix(pathPrefix)}${src}`;
-const addPathPrefixToSrcSet = (srcset, pathPrefix) => srcset
-    ?.split(',')
-    .map((src) => addPathPrefixToSrc(src.trim(), pathPrefix))
+const adjustSrcset = (router, pathPrefix) => (srcset) => srcset
+    ?.split(/\s*,\s*/)
+    .map((src) => src.trim())
+    .filter(Boolean)
+    .map((src) => ((0, url_1.isURL)(src) ? src : (0, url_1.joinPath)(pathPrefix, src)))
+    .map((0, adjustHref_1.adjustHref)(router))
     .join(', ');
-function formatToMimeType(format) {
-    return format ? `image/${String(format)}` : undefined;
-}
-exports.formatToMimeType = formatToMimeType;
+const formatToMimeType = (format) => format ? `image/${String(format)}` : undefined;
 //# sourceMappingURL=ImgAsPicture.js.map

package/dist/ui-kit/Img/ImgAsPicture.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImgAsPicture.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/ImgAsPicture.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ImgAsPicture.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/ImgAsPicture.tsx"],"names":[],"mappings":"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"}

package/dist/utils/adjustHref.d.ts

@@ -0,0 +1,3 @@
+export declare const adjustHref: (router: {
+    pathname: string;
+}) => (href: string | undefined) => string | undefined;

package/dist/utils/adjustHref.js

@@ -0,0 +1,14 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adjustHref = void 0;
+const ProjectSettings_1 = require("../ProjectSettings");
+const dirname_1 = require("./dirname");
+const url_1 = require("./url");
+const adjustHref = (router) => (href) => {
+    if (!href || (0, url_1.isURL)(href) || (ProjectSettings_1.projectSettings.CDN && href.startsWith(ProjectSettings_1.projectSettings.CDN))) {
+        return href;
+    }
+    const isRelativeToBase = href.startsWith('/');
+    return (0, url_1.joinPath)(ProjectSettings_1.projectSettings.BASE_PATH, isRelativeToBase ? '/' : (0, dirname_1.dirname)(router.pathname), href);
+};
+exports.adjustHref = adjustHref;
+//# sourceMappingURL=adjustHref.js.map

package/dist/utils/adjustHref.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,uCAAoC;AACpC,+BAAwC;AAEjC,MAAM,UAAU,GAAG,CAAC,MAA4B,EAAE,EAAE,CAAC,CAAC,IAAwB,EAAE,EAAE;IACvF,IAAI,CAAC,IAAI,IAAI,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,CAAC,iCAAe,CAAC,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC,EAAE;QACzF,OAAO,IAAI,CAAC;KACb;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAE9C,OAAO,IAAA,cAAQ,EACb,iCAAe,CAAC,SAAS,EACzB,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,EACjD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB"}

package/dist/utils/dirname.d.ts

@@ -0,0 +1 @@
+export declare const dirname: (path: string | undefined) => string | undefined;

package/dist/utils/dirname.js

@@ -0,0 +1,5 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dirname = void 0;
+const dirname = (path) => path?.split('/').slice(0, -1).join('/');
+exports.dirname = dirname;
+//# sourceMappingURL=dirname.js.map

package/dist/utils/dirname.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dirname.js","sourceRoot":"","sources":["../../src/utils/dirname.ts"],"names":[],"mappings":";;AAAO,MAAM,OAAO,GAAG,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAAhF,QAAA,OAAO,WAAyE"}

package/dist/utils/url.d.ts

@@ -1,6 +1,6 @@
 import type { Target } from '../model/LinkProps';
-export declare const isURL: (href?: string) => href is `${string}//${string}`;
+export declare const isURL: (href?: string) => href is `${string}:${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href?: string) => href is `#${string}`;
 export declare const withoutQuery: (href?: string) => string;
-export declare const joinPath: (...path: string[]) => string;
+export declare const joinPath: (...path: (string | undefined)[]) => string;

package/dist/utils/url.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.joinPath = exports.withoutQuery = exports.isHash = exports.isLocalURL = exports.isURL = void 0;
-const isURL = (href) => Boolean(href?.includes('//'));
+const isURL = (href) => Boolean(href?.includes(':'));
 exports.isURL = isURL;
 const isLocalURL = (href, target) => Boolean(href && !(0, exports.isURL)(href) && (!target || target === '_self'));
 exports.isLocalURL = isLocalURL;

package/dist/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAkC,EAAE,CACrE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AADnB,QAAA,KAAK,SACc;AAEzB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAc,EAAU,EAAE,CACpD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AADzC,QAAA,QAAQ,YACiC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAAvF,QAAA,KAAK,SAAkF;AAE7F,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAA4B,EAAU,EAAE,CAClE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AADzC,QAAA,QAAQ,YACiC"}

package/dist/wlc.json

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

package/lib/ProjectSettings.js

@@ -26,12 +26,10 @@ export const projectSettings = new (class {
         return this._.FOOTER;
     }
     get CDN() {
-        return this._.CDN;
+        return appendSlash(this._.CDN);
     }
     get BASE_PATH() {
-        return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
-            ? `${this._.BASE_PATH}/`
-            : this._.BASE_PATH;
+        return appendSlash(this._.BASE_PATH);
     }
     get YANDEX_MAP_API_KEY() {
         return this._.YANDEX_MAP_API_KEY;
@@ -40,4 +38,5 @@ export const projectSettings = new (class {
         return this._.YANDEX_METRIKA_ID;
     }
 })();
+const appendSlash = (url) => (url && !url.endsWith('/') ? `${url}/` : url);
 //# sourceMappingURL=ProjectSettings.js.map

package/lib/ProjectSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":"AAcA,MAAM,wBAAwB,GAAoB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB,wBAAwB,CAAC;IAE9C,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,wBAAwB,CAAC,WAAW,CAAC;IACpE,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxD,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
+{"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":"AAcA,MAAM,wBAAwB,GAAoB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB,wBAAwB,CAAC;IAE9C,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,wBAAwB,CAAC,WAAW,CAAC;IACpE,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,SAAS;QACX,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC;AAEL,MAAM,WAAW,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC"}

package/lib/hooks/useLink.js

@@ -1,37 +1,25 @@
-import { projectSettings } from '../ProjectSettings.js';
-import { gotoBlock } from '../services/BlockRouter/BlockRouter.js';
-import { isHash, isLocalURL, joinPath } from '../utils/url.js';
+import { adjustHref } from '../utils/adjustHref.js';
+import { isLocalURL } from '../utils/url.js';
 import { handlerDecorator } from './handlerDecorator.js';
 import { useRouter } from './useRouter.js';
 export function useLink(isRemote) {
     const router = useRouter();
     return (props) => ({
         ...props,
-        href: adjustHref(props.href),
+        href: isRemote ? props.href : adjustHref(router)(props.href),
         'aria-label': props.text,
         onClick: handlerDecorator(handleHref(props), props),
     });
-    function adjustHref(href) {
-        const isRelativeToBase = !isRemote && href?.startsWith('/');
-        return projectSettings.BASE_PATH && href && isRelativeToBase
-            ? joinPath(projectSettings.BASE_PATH, href)
-            : href;
-    }
     function handleHref({ href, target, onClick }) {
         return (ev) => {
             onClick && onClick(ev);
-            if (isRemote || !isLocalURL(href, target)) {
+            if (!href || isRemote || !isLocalURL(href, target)) {
                 // Default routing
                 return;
             }
             // Client routing
             ev?.preventDefault();
-            if (isHash(href)) {
-                gotoBlock(router, href);
-            }
-            else if (href) {
-                router.push(href);
-            }
+            router.push(href);
         };
     }
 }

package/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,IAAwB;QAC1C,MAAM,gBAAgB,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5D,OAAO,eAAe,CAAC,SAAS,IAAI,IAAI,IAAI,gBAAgB;YAC1D,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAED,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACzB;iBAAM,IAAI,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/services/BlockRouter/BlockRouter.d.ts

@@ -1,4 +1,2 @@
-import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
-export declare function gotoBlock(router: Router, anchor?: string): void;
-export declare function trackBlock(router: Router, block?: BlockDef): void;
+export declare function trackBlock(block?: BlockDef): void;

package/lib/services/BlockRouter/BlockRouter.js

@@ -1,10 +1,8 @@
 const normalizeAnchor = (anchor) => anchor?.replace('#', '') || '';
-export function gotoBlock(router, anchor) {
-    router.replace(`#${normalizeAnchor(anchor)}`);
-}
-export function trackBlock(router, block) {
-    router.replace(`#${normalizeAnchor(block?.anchor)}`, undefined, {
-        scroll: false,
-    });
+export function trackBlock(block) {
+    const hash = `#${normalizeAnchor(block?.anchor)}`;
+    if (globalThis.location?.hash !== hash) {
+        globalThis.history?.replaceState(globalThis.history?.state, '', hash);
+    }
 }
 //# sourceMappingURL=BlockRouter.js.map

package/lib/services/BlockRouter/BlockRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAGA,MAAM,eAAe,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAE5E,MAAM,UAAU,SAAS,CAAC,MAAc,EAAE,MAAe;IACvD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,KAAgB;IACzD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAE5E,MAAM,UAAU,UAAU,CAAC,KAAgB;IACzC,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;IAElD,IAAI,UAAU,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;QACtC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;KACvE;AACH,CAAC"}