@redneckz/wildless-cms-uni-blocks 0.8.8 → 0.8.9

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

@@ -0,0 +1,11 @@
+import { EventBus } from '../../EventBus/EventBus';
+import type { BlockDef } from '../../model/ContentPageDef';
+export interface BlockIntersectionEvent {
+    block: BlockDef;
+    intersection: IntersectionObserverEntry;
+}
+interface EventMap {
+    intersection: BlockIntersectionEvent;
+}
+export declare const blockRouterEventBus: EventBus<EventMap>;
+export {};

package/mobile/lib/services/BlockRouter/blockRouterEventBus.js

@@ -0,0 +1,3 @@
+import { EventBus } from '../../EventBus/EventBus.js';
+export const blockRouterEventBus = new EventBus();
+//# sourceMappingURL=blockRouterEventBus.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"blockRouterEventBus.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/blockRouterEventBus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAYnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,EAAY,CAAC"}

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

@@ -1,5 +1,4 @@
 import type { BlockDef } from '../../model/ContentPageDef';
-import { BlockRouter } from './BlockRouter';
-export declare function useBlockIntersectionObserver(block?: BlockDef, router?: BlockRouter): {
+export declare function useBlockIntersectionObserver(block?: BlockDef): {
     current: Element | null;
 };

package/mobile/lib/services/BlockRouter/useBlockIntersectionObserver.js

@@ -1,25 +1,14 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useIntersectionObserver } from '../../hooks/useIntersectionObserver.js';
-import { BlockRouter } from './BlockRouter.js';
-export function useBlockIntersectionObserver(block, router = BlockRouter.inst) {
+import { blockRouterEventBus } from './blockRouterEventBus.js';
+export function useBlockIntersectionObserver(block) {
     const observerCallback = useCallback((entries) => {
         if (!block || !entries?.length) {
             return;
         }
         const intersection = entries[entries.length - 1];
-        router.eventBus.fire('intersection', { block, intersection });
-    }, [block, router]);
-    const ref = useIntersectionObserver(observerCallback, { sensitivity: 1 });
-    useEffect(() => {
-        if (!ref.current) {
-            return undefined;
-        }
-        return router.eventBus.subscribe('goto', ({ anchor }) => {
-            if (ref.current && block?.anchor === anchor) {
-                ref.current.scrollIntoView({ behavior: 'smooth', block: 'start' });
-            }
-        });
-    }, [block, router]);
-    return ref;
+        blockRouterEventBus.fire('intersection', { block, intersection });
+    }, [block]);
+    return useIntersectionObserver(observerCallback, { sensitivity: 1 });
 }
 //# sourceMappingURL=useBlockIntersectionObserver.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useBlockIntersectionObserver.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockIntersectionObserver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,UAAU,4BAA4B,CAC1C,KAAgB,EAChB,SAAsB,WAAW,CAAC,IAAI;IAEtC,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,OAAoC,EAAE,EAAE;QACvC,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IAChE,CAAC,EACD,CAAC,KAAK,EAAE,MAAM,CAAC,CAChB,CAAC;IAEF,MAAM,GAAG,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IAE1E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YACtD,IAAI,GAAG,CAAC,OAAO,IAAI,KAAK,EAAE,MAAM,KAAK,MAAM,EAAE;gBAC3C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;aACpE;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"useBlockIntersectionObserver.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockIntersectionObserver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,UAAU,4BAA4B,CAAC,KAAgB;IAC3D,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,OAAoC,EAAE,EAAE;QACvC,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjD,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;IACpE,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC"}

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

@@ -1,2 +1 @@
-import { BlockRouter } from './BlockRouter';
-export declare function useBlockRouterProvider(router?: BlockRouter, scrollTarget?: EventTarget): void;
+export declare function useBlockRouterProvider(scrollTarget?: EventTarget): void;

package/mobile/lib/services/BlockRouter/useBlockRouterProvider.js

@@ -1,27 +1,26 @@
 import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import { useRouter } from '../../hooks/useRouter.js';
 import { debounce } from '../../utils/debounce.js';
-import { BlockRouter } from './BlockRouter.js';
+import { trackBlock } from './BlockRouter.js';
+import { blockRouterEventBus } from './blockRouterEventBus.js';
 import { findActiveBlock } from './findActiveBlock.js';
 const isScrolledEnough = () => globalThis.scrollY > (globalThis.innerHeight * 3) / 4;
-export function useBlockRouterProvider(router = BlockRouter.inst, scrollTarget = globalThis) {
+export function useBlockRouterProvider(scrollTarget = globalThis) {
+    const router = useRouter();
     const intersectionsMapRef = useRef(new Map());
-    useEffect(() => router.eventBus.subscribe('intersection', ({ block, intersection }) => {
+    useEffect(() => blockRouterEventBus.subscribe('intersection', ({ block, intersection }) => {
         if (intersectionsMapRef.current) {
             intersectionsMapRef.current.set(block, intersection);
         }
-    }), [router]);
+    }), []);
     useEffect(() => {
         const handleScroll = debounce(() => {
-            if (!isScrolledEnough()) {
-                router.reset();
-                return;
+            if (isScrolledEnough()) {
+                const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
+                trackBlock(router, activeBlock);
             }
-            const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
-            if (activeBlock?.anchor) {
-                router.replace(activeBlock.anchor);
-            }
-            else if (!activeBlock) {
-                router.reset();
+            else {
+                trackBlock(router);
             }
         }, 100);
         scrollTarget.addEventListener('scroll', handleScroll);

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

@@ -1 +1 @@
-{"version":3,"file":"useBlockRouterProvider.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockRouterProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAErF,MAAM,UAAU,sBAAsB,CACpC,SAAsB,WAAW,CAAC,IAAI,EACtC,eAA4B,UAAU;IAEtC,MAAM,mBAAmB,GAAG,MAAM,CAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAExF,SAAS,CACP,GAAG,EAAE,CACH,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QACpE,IAAI,mBAAmB,CAAC,OAAO,EAAE;YAC/B,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,gBAAgB,EAAE,EAAE;gBACvB,MAAM,CAAC,KAAK,EAAE,CAAC;gBAEf,OAAO;aACR;YAED,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAE9E,IAAI,WAAW,EAAE,MAAM,EAAE;gBACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;aACpC;iBAAM,IAAI,CAAC,WAAW,EAAE;gBACvB,MAAM,CAAC,KAAK,EAAE,CAAC;aAChB;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"}
+{"version":3,"file":"useBlockRouterProvider.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/useBlockRouterProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAErF,MAAM,UAAU,sBAAsB,CAAC,eAA4B,UAAU;IAC3E,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,mBAAmB,GAAG,MAAM,CAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAExF,SAAS,CACP,GAAG,EAAE,CACH,mBAAmB,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,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,EAAE;YACjC,IAAI,gBAAgB,EAAE,EAAE;gBACtB,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9E,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;aACjC;iBAAM;gBACL,UAAU,CAAC,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"}

package/mobile/lib/ui-kit/BlockWrapper.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../EventBus/EventBus.js';
+import { defaultEventBus } from '../EventBus/defaultEventBus.js';
 import { useBlockIntersectionObserver } from '../services/BlockRouter/useBlockIntersectionObserver.js';
 import { style } from '../utils/style.js';
 export const blockStyles = {
@@ -15,7 +15,7 @@ export const BlockWrapper = JSX(({ className = '', version = 'primary', block, t
     const Tag = tag;
     const ref = useBlockIntersectionObserver(block);
     const [isVisible, setVisible] = useState(true);
-    useEffect(() => EventBus.inst.subscribe('tab', (event) => {
+    useEffect(() => 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);

package/mobile/lib/ui-kit/BlockWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,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;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,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,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CACP,GAAG,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,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,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,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,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,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;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,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,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,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,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,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/mobile/src/EventBus/EventBus.ts

@@ -1,10 +1,4 @@
-import type { EventMap } from './EventMap';
-
-export type BaseEventMap = Record<string, any>;
-
-export class EventBus<EM extends BaseEventMap> {
-  public static readonly inst = new EventBus<EventMap>();
-
+export class EventBus<EM extends Record<string, any>> {
   private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
   private subjectsStateMap: Partial<EM> = {};
 

package/mobile/src/EventBus/defaultEventBus.ts

@@ -0,0 +1,8 @@
+import type { TabActivationEvent } from '../components/Tabs/Tabs';
+import { EventBus } from './EventBus';
+
+interface GlobalEventMap {
+  tab: TabActivationEvent;
+}
+
+export const defaultEventBus = new EventBus<GlobalEventMap>();

package/mobile/src/components/ButtonBlock/ButtonBlock.example.json

@@ -1,8 +1,8 @@
 {
   "content": {
     "button": {
-      "href": "/credit-cards",
-      "text": "Подробнее",
+      "href": "#",
+      "text": "Кнопка",
       "target": "_blank",
       "version": "primary"
     }

package/mobile/src/components/ButtonBlock/ButtonBlock.tsx

@@ -2,10 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { style } from '../../utils/style';
 import type { ButtonBlockContent } from './ButtonBlockContent';
 
 interface ButtonBlockProps extends ButtonBlockContent, UniBlockProps {}
 
-export const ButtonBlock = JSX<ButtonBlockProps>(({ button, ...rest }) => (
-  <BlockWrapper {...rest}>{renderButtonsSection([button])}</BlockWrapper>
+export const ButtonBlock = JSX<ButtonBlockProps>(({ button, className, ...rest }) => (
+  <BlockWrapper className={style('!bg-transparent', className)} {...rest}>
+    {renderButtonsSection([button])}
+  </BlockWrapper>
 ));

package/mobile/src/components/ButtonBlock/ButtonBlockContent.ts

@@ -4,6 +4,10 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
  * @title Блок Кнопка
  */
 export interface ButtonBlockContent {
-  /** @title Кнопка */
+  /**
+   * @title Кнопка
+   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
+   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}}
+   */
   button?: ButtonWithIconProps;
 }

package/mobile/src/components/Tabs/Tabs.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../../EventBus/EventBus';
+import { defaultEventBus } from '../../EventBus/defaultEventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderTab } from './renderTab';
@@ -21,7 +21,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   useEffect(
     () =>
-      EventBus.inst.subscribe('tab', (event) => {
+      defaultEventBus.subscribe('tab', (event) => {
         const tab = tabs?.find(checkTab(event));
         if (event.type === 'link' && tab) {
           setCurrentTab(tab);
@@ -35,14 +35,14 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   useEffect(
     () =>
       currentTab?.type === 'group'
-        ? EventBus.inst.subject('tab', { type: currentTab.type, label: currentTab.ref })
+        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
         : undefined,
     [currentTab],
   );
 
   const handleClick = useCallback((selectedTab: TabData) => {
     if (selectedTab?.type === 'group') {
-      EventBus.inst.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
+      defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
     }
     setCurrentTab(selectedTab);
   }, []);

package/mobile/src/hooks/useLink.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../model/LinkProps';
 import { projectSettings } from '../ProjectSettings';
-import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
+import { gotoBlock } from '../services/BlockRouter/BlockRouter';
 import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
@@ -15,7 +15,6 @@ interface Clickable {
 
 export function useLink(isRemote?: boolean) {
   const router = useRouter();
-  const blockRouter = useBlockRouter();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
@@ -44,7 +43,7 @@ export function useLink(isRemote?: boolean) {
       // Client routing
       ev?.preventDefault();
       if (isHash(href)) {
-        blockRouter.goto(href);
+        gotoBlock(router, href);
       } else if (href) {
         router.push(href);
       }

package/mobile/src/hooks/useRouter.ts

@@ -1,10 +1,14 @@
+interface RouterOptions {
+  scroll?: boolean;
+}
+
 export interface Router {
   pathname: string;
   query: Record<string, string | string[] | undefined>;
   href?: string;
   basePath?: string;
-  push: (url: string) => void;
-  replace: (url: string) => void;
+  push: (url: string, as?: string, options?: RouterOptions) => void;
+  replace: (url: string, as?: string, options?: RouterOptions) => void;
 }
 
 export function useRouter(): Router {

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

@@ -1,53 +1,14 @@
-import { EventBus } from '../../EventBus/EventBus';
+import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
 
-export interface GotoAnchorEvent {
-  anchor: string;
-}
-
-export interface BlockIntersectionEvent {
-  block: BlockDef;
-  intersection: IntersectionObserverEntry;
-}
+const normalizeAnchor = (anchor?: string) => anchor?.replace('#', '') || '';
 
-interface EventMap {
-  goto: GotoAnchorEvent;
-  intersection: BlockIntersectionEvent;
+export function gotoBlock(router: Router, anchor?: string) {
+  router.replace(`#${normalizeAnchor(anchor)}`);
 }
 
-const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '') || '';
-const getURLWithAnchor = (rawAnchor?: string) =>
-  `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
-
-export class BlockRouter {
-  public static readonly inst = new BlockRouter();
-
-  readonly eventBus = new EventBus<EventMap>();
-
-  constructor() {
-    const anchor = normalizeAnchor(globalThis.location?.hash);
-    if (anchor) {
-      this.eventBus.subject('goto', { anchor });
-    }
-  }
-
-  goto(rawAnchor?: string) {
-    const anchor = normalizeAnchor(rawAnchor);
-    if (anchor) {
-      this.push(anchor);
-      this.eventBus.fire('goto', { anchor });
-    }
-  }
-
-  push(rawAnchor: string) {
-    globalThis.history?.pushState(null, '', getURLWithAnchor(rawAnchor));
-  }
-
-  replace(rawAnchor: string) {
-    globalThis.history?.replaceState(null, '', getURLWithAnchor(rawAnchor));
-  }
-
-  reset() {
-    globalThis.history?.replaceState(null, '', getURLWithAnchor());
-  }
+export function trackBlock(router: Router, block?: BlockDef) {
+  router.replace(`#${normalizeAnchor(block?.anchor)}`, undefined, {
+    scroll: false,
+  });
 }

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

@@ -0,0 +1,13 @@
+import { EventBus } from '../../EventBus/EventBus';
+import type { BlockDef } from '../../model/ContentPageDef';
+
+export interface BlockIntersectionEvent {
+  block: BlockDef;
+  intersection: IntersectionObserverEntry;
+}
+
+interface EventMap {
+  intersection: BlockIntersectionEvent;
+}
+
+export const blockRouterEventBus = new EventBus<EventMap>();

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

@@ -1,12 +1,9 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useIntersectionObserver } from '../../hooks/useIntersectionObserver';
 import type { BlockDef } from '../../model/ContentPageDef';
-import { BlockRouter } from './BlockRouter';
+import { blockRouterEventBus } from './blockRouterEventBus';
 
-export function useBlockIntersectionObserver(
-  block?: BlockDef,
-  router: BlockRouter = BlockRouter.inst,
-) {
+export function useBlockIntersectionObserver(block?: BlockDef) {
   const observerCallback = useCallback(
     (entries: IntersectionObserverEntry[]) => {
       if (!block || !entries?.length) {
@@ -14,24 +11,10 @@ export function useBlockIntersectionObserver(
       }
 
       const intersection = entries[entries.length - 1];
-      router.eventBus.fire('intersection', { block, intersection });
+      blockRouterEventBus.fire('intersection', { block, intersection });
     },
-    [block, router],
+    [block],
   );
 
-  const ref = useIntersectionObserver(observerCallback, { sensitivity: 1 });
-
-  useEffect(() => {
-    if (!ref.current) {
-      return undefined;
-    }
-
-    return router.eventBus.subscribe('goto', ({ anchor }) => {
-      if (ref.current && block?.anchor === anchor) {
-        ref.current.scrollIntoView({ behavior: 'smooth', block: 'start' });
-      }
-    });
-  }, [block, router]);
-
-  return ref;
+  return useIntersectionObserver(observerCallback, { sensitivity: 1 });
 }

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

@@ -1,41 +1,35 @@
 import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import { useRouter } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
 import { debounce } from '../../utils/debounce';
-import { BlockRouter } from './BlockRouter';
+import { trackBlock } from './BlockRouter';
+import { blockRouterEventBus } from './blockRouterEventBus';
 import { findActiveBlock } from './findActiveBlock';
 
 const isScrolledEnough = () => globalThis.scrollY > (globalThis.innerHeight * 3) / 4;
 
-export function useBlockRouterProvider(
-  router: BlockRouter = BlockRouter.inst,
-  scrollTarget: EventTarget = globalThis,
-) {
+export function useBlockRouterProvider(scrollTarget: EventTarget = globalThis) {
+  const router = useRouter();
+
   const intersectionsMapRef = useRef<Map<BlockDef, IntersectionObserverEntry>>(new Map());
 
   useEffect(
     () =>
-      router.eventBus.subscribe('intersection', ({ block, intersection }) => {
+      blockRouterEventBus.subscribe('intersection', ({ block, intersection }) => {
         if (intersectionsMapRef.current) {
           intersectionsMapRef.current.set(block, intersection);
         }
       }),
-    [router],
+    [],
   );
 
   useEffect(() => {
     const handleScroll = debounce(() => {
-      if (!isScrolledEnough()) {
-        router.reset();
-
-        return;
-      }
-
-      const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
-
-      if (activeBlock?.anchor) {
-        router.replace(activeBlock.anchor);
-      } else if (!activeBlock) {
-        router.reset();
+      if (isScrolledEnough()) {
+        const activeBlock = findActiveBlock([...(intersectionsMapRef.current || [])]);
+        trackBlock(router, activeBlock);
+      } else {
+        trackBlock(router);
       }
     }, 100);
 

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../EventBus/EventBus';
+import { defaultEventBus } from '../EventBus/defaultEventBus';
 import type { BlockVersion } from '../model/BlockVersion';
 import type { UniBlockProps } from '../model/JSXBlock';
 import { useBlockIntersectionObserver } from '../services/BlockRouter/useBlockIntersectionObserver';
@@ -28,7 +28,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
     const [isVisible, setVisible] = useState(true);
     useEffect(
       () =>
-        EventBus.inst.subscribe('tab', (event) => {
+        defaultEventBus.subscribe('tab', (event) => {
           if (event.type === 'group') {
             const hasSettings = block?.labels?.length || block?.anchor;
             setVisible(

package/package.json

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

package/src/EventBus/EventBus.ts

@@ -1,10 +1,4 @@
-import type { EventMap } from './EventMap';
-
-export type BaseEventMap = Record<string, any>;
-
-export class EventBus<EM extends BaseEventMap> {
-  public static readonly inst = new EventBus<EventMap>();
-
+export class EventBus<EM extends Record<string, any>> {
   private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
   private subjectsStateMap: Partial<EM> = {};
 

package/src/EventBus/defaultEventBus.ts

@@ -0,0 +1,8 @@
+import type { TabActivationEvent } from '../components/Tabs/Tabs';
+import { EventBus } from './EventBus';
+
+interface GlobalEventMap {
+  tab: TabActivationEvent;
+}
+
+export const defaultEventBus = new EventBus<GlobalEventMap>();

package/src/components/ButtonBlock/ButtonBlock.example.json

@@ -1,8 +1,8 @@
 {
   "content": {
     "button": {
-      "href": "/credit-cards",
-      "text": "Подробнее",
+      "href": "#",
+      "text": "Кнопка",
       "target": "_blank",
       "version": "primary"
     }

package/src/components/ButtonBlock/ButtonBlock.tsx

@@ -2,10 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { style } from '../../utils/style';
 import type { ButtonBlockContent } from './ButtonBlockContent';
 
 interface ButtonBlockProps extends ButtonBlockContent, UniBlockProps {}
 
-export const ButtonBlock = JSX<ButtonBlockProps>(({ button, ...rest }) => (
-  <BlockWrapper {...rest}>{renderButtonsSection([button])}</BlockWrapper>
+export const ButtonBlock = JSX<ButtonBlockProps>(({ button, className, ...rest }) => (
+  <BlockWrapper className={style('!bg-transparent', className)} {...rest}>
+    {renderButtonsSection([button])}
+  </BlockWrapper>
 ));

package/src/components/ButtonBlock/ButtonBlockContent.ts

@@ -4,6 +4,10 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
  * @title Блок Кнопка
  */
 export interface ButtonBlockContent {
-  /** @title Кнопка */
+  /**
+   * @title Кнопка
+   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
+   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}}
+   */
   button?: ButtonWithIconProps;
 }

package/src/components/Tabs/Tabs.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../../EventBus/EventBus';
+import { defaultEventBus } from '../../EventBus/defaultEventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderTab } from './renderTab';
@@ -21,7 +21,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   useEffect(
     () =>
-      EventBus.inst.subscribe('tab', (event) => {
+      defaultEventBus.subscribe('tab', (event) => {
         const tab = tabs?.find(checkTab(event));
         if (event.type === 'link' && tab) {
           setCurrentTab(tab);
@@ -35,14 +35,14 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   useEffect(
     () =>
       currentTab?.type === 'group'
-        ? EventBus.inst.subject('tab', { type: currentTab.type, label: currentTab.ref })
+        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
         : undefined,
     [currentTab],
   );
 
   const handleClick = useCallback((selectedTab: TabData) => {
     if (selectedTab?.type === 'group') {
-      EventBus.inst.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
+      defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
     }
     setCurrentTab(selectedTab);
   }, []);

package/src/hooks/useLink.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../model/LinkProps';
 import { projectSettings } from '../ProjectSettings';
-import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
+import { gotoBlock } from '../services/BlockRouter/BlockRouter';
 import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
@@ -15,7 +15,6 @@ interface Clickable {
 
 export function useLink(isRemote?: boolean) {
   const router = useRouter();
-  const blockRouter = useBlockRouter();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
@@ -44,7 +43,7 @@ export function useLink(isRemote?: boolean) {
       // Client routing
       ev?.preventDefault();
       if (isHash(href)) {
-        blockRouter.goto(href);
+        gotoBlock(router, href);
       } else if (href) {
         router.push(href);
       }