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

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/Calculator/Rate.tsx

@@ -25,7 +25,7 @@ export const Rate = JSX<RateProps>(
               rateBlockClassName,
             )}
           >
-            {String(rate).replace('.', ',')}
+            {String(rate.toFixed(2)).replace('.', ',')}
           </span>
           {unit ? (
             <span className="gradient-color-text text-[65px] leading-[75px]">{unit}</span>

package/mobile/src/components/Calculator/constants.ts

@@ -54,7 +54,7 @@ export const DEFAULT_DEPOSIT_CALCULATOR_PARAMS: DepositCalculatorSourceBookParam
   maxSum: 5000000,
   minMonths: 2,
   maxMonths: 120,
-  rate: 5.9,
+  rate: 7,
   isMonthlyInterestPayment: true,
 };
 
@@ -64,7 +64,7 @@ export const DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS: BusinessDepositCalculat
     maxSum: 500000,
     minDays: BUSINESS_MIN_DAYS,
     maxDays: BUSINESS_MAX_DAYS,
-    rate: 5.9,
+    rate: 6.6,
     isMonthlyInterestPayment: true,
     isReplenished: false,
     isPartialWithdrawal: false,

package/mobile/src/components/Calculator/rangeHelpers.ts

@@ -0,0 +1,24 @@
+import { maxBy } from '../../utils/maxBy';
+import { minBy } from '../../utils/minBy';
+
+export const getRangeByKeys = <
+  MinKey extends string,
+  MaxKey extends string,
+  T extends Record<MinKey | MaxKey, number>,
+>(
+  [minKey, maxKey]: [MinKey, MaxKey],
+  rows: T[] = [],
+) => ({
+  [minKey]: rows.length ? minBy()(rows.map((row) => row[minKey])) : 0,
+  [maxKey]: rows.length ? maxBy()(rows.map((row) => row[maxKey])) : 0,
+});
+
+export const checkRangeByKeys = <
+  MinKey extends string,
+  MaxKey extends string,
+  T extends Record<MinKey | MaxKey, number>,
+>(
+  value: number,
+  [minKey, maxKey]: [MinKey, MaxKey],
+  sourceBookRow: T,
+): boolean => value >= sourceBookRow[minKey] && value < sourceBookRow[maxKey];

package/mobile/src/components/Calculator/useBusinessDepositCalculatorParams.ts

@@ -5,6 +5,7 @@ import {
   BUSINESS_RATE_MIN_DAYS,
   DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS,
 } from './constants';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 import type { CommonDepositParams } from './useDepositCalculatorParams';
 
@@ -72,9 +73,9 @@ export const useBusinessDepositCalculatorParams = (
       return (
         isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
         isSmallBusiness === _.isSmallBusiness &&
-        (isOperatingDeposit
-          ? _.isReplenished && _.isPartialWithdrawal
-          : !_.isReplenished && !_.isPartialWithdrawal)
+        checkIsOperatingDeposit(isOperatingDeposit, _) &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(daysValue, ['minDays', 'maxDays'], _)
       );
     }) || DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS;
 
@@ -82,9 +83,12 @@ export const useBusinessDepositCalculatorParams = (
 
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
+  const sourceBookRows = data?.rows || [DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS];
 
   return {
     ...businessDepositCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minDays', 'maxDays'], sourceBookRows),
     ...userInputParams,
     isDisabledOperatingDeposit,
     income,
@@ -92,6 +96,14 @@ export const useBusinessDepositCalculatorParams = (
   };
 };
 
+const checkIsOperatingDeposit = (
+  isOperatingDeposit: boolean,
+  sourceBookRow: BusinessDepositCalculatorSourceBookParams,
+) =>
+  isOperatingDeposit
+    ? sourceBookRow.isReplenished && sourceBookRow.isPartialWithdrawal
+    : !sourceBookRow.isReplenished && !sourceBookRow.isPartialWithdrawal;
+
 const getDepositIncome = (
   rate: number,
   userInputParams: BusinessDepositCalculatorUserInputParams,

package/mobile/src/components/Calculator/useCreditCalculatorParams.ts

@@ -1,5 +1,6 @@
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonCreditParams {
@@ -38,7 +39,7 @@ export const useCreditCalculatorParams = (
   userInputParams: CreditCalculatorUserInputParams,
   sourceBookDir?: string,
 ): CreditCalculatorParams => {
-  const { isInsurance, isSalaryClient, isStateEmployee, moneyValue } = userInputParams;
+  const { isInsurance, isSalaryClient, isStateEmployee, moneyValue, monthsValue } = userInputParams;
 
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
   const creditCalculatorSourceBookParams =
@@ -46,16 +47,21 @@ export const useCreditCalculatorParams = (
       return (
         isInsurance === _.isInsurance &&
         isSalaryClient === _.isSalaryClient &&
-        isStateEmployee === _.isStateEmployee
+        isStateEmployee === _.isStateEmployee &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _)
       );
     }) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
   const { rateBottomRange, rateTopRange, sumBorder } = creditCalculatorSourceBookParams;
   const finalRate = moneyValue <= sumBorder ? rateBottomRange : rateTopRange;
   const monthlyPayment = getMonthlyPayment(finalRate, userInputParams);
+  const sourceBookRows = data?.rows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
 
   return {
     ...creditCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
     ...userInputParams,
     finalRate,
     monthlyPayment,

package/mobile/src/components/Calculator/useDepositCalculatorParams.ts

@@ -1,9 +1,11 @@
 import { DEFAULT_DEPOSIT_CALCULATOR_PARAMS, DEPOSIT_CALC_DEFAULT_DIR } from './constants';
+import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonDepositParams {
   isMonthlyInterestPayment: boolean;
 }
+
 export interface DepositCalculatorSourceBookParams extends CommonDepositParams {
   minSum: number;
   maxSum: number;
@@ -32,22 +34,34 @@ export const useDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
   sourceBookDir?: string,
 ): DepositCalculatorParams => {
-  const { isMonthlyInterestPayment, moneyValue } = userInputParams;
+  const { isMonthlyInterestPayment, moneyValue, monthsValue } = userInputParams;
 
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
   );
 
   const depositCalculatorSourceBookParams =
-    data?.rows?.find((_) => isMonthlyInterestPayment === _.isMonthlyInterestPayment) ||
-    DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
+    data?.rows?.find(
+      (_) =>
+        isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
+        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
+        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], _),
+    ) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
 
   const { rate } = depositCalculatorSourceBookParams;
 
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
+  const sourceBookRows = data?.rows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
 
-  return { ...depositCalculatorSourceBookParams, ...userInputParams, income, finalSum };
+  return {
+    ...depositCalculatorSourceBookParams,
+    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
+    ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
+    ...userInputParams,
+    income,
+    finalSum,
+  };
 };
 
 const getDepositIncome = (rate: number, userInputParams: DepositCalculatorUserInputParams) => {

package/mobile/src/components/Carousel/Carousel.tsx

@@ -52,10 +52,12 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
             gap={ITEMS_GAP}
             onVisibleIndicesChange={scroll.handleVisibleIndicesChange}
           >
-            {renderChildren({
-              ...rest,
-              block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
-            })}
+            {isBankHistoryCarousel
+              ? renderChildren({
+                  ...rest,
+                  block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
+                })
+              : renderChildren(rest)}
           </SwipeListContainer>
           <CarouselScrollButtons
             scroll={scroll}

package/mobile/src/components/PictureText/renderBenefit.tsx

@@ -4,6 +4,7 @@ import type { ComplexBenefitProps } from '../../ui-kit/BenefitItem/BenefitItemPr
 import { RichText } from '../../ui-kit/RichText/RichText';
 import { assertUnreachable } from '../../utils/assertUnreachable';
 
+// TODO: Create universal function for this case
 export const renderBenefit =
   // Linter doesn't understand that switch processes all cases
   // eslint-disable-next-line consistent-return

package/mobile/src/components/ProductTile/renderBenefit.tsx

@@ -3,6 +3,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { assertUnreachable } from '../../utils/assertUnreachable';
 import type { Benefit } from './ProductTileContent';
 
+// TODO: Create universal function for this case
 export const renderBenefit =
   // Linter doesn't understand that switch processes all cases
   // eslint-disable-next-line consistent-return

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -5,9 +5,11 @@ import type { SizeVersion } from '../../model/SizeVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
+import { RichText } from '../../ui-kit/RichText/RichText';
+import { assertUnreachable } from '../../utils/assertUnreachable';
 import { getIconWithVersion } from '../../utils/getIconWithVersion';
-import type { Step, StepsBlockContent } from './StepsBlockContent';
+import { checkCanRenderIcon } from './checkCanRenderIcon';
+import type { DefaultStep, Step, StepsBlockContent } from './StepsBlockContent';
 import { STEPS_BLOCK_STYLE_MAPS } from './StepsBlockStyleMaps';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
@@ -50,7 +52,7 @@ export const StepsBlock = JSX<StepsBlockProps>(
         {steps?.length ? (
           <div className={`box-border py-0.5 mb-0.5 mt-5`}>
             <div className="flex flex-col justify-between gap-x-[101px]">
-              {steps.map(renderStepTitle(size, version, showLines))}
+              {steps.map(renderStep(size, version, showLines))}
             </div>
           </div>
         ) : null}
@@ -59,9 +61,31 @@ export const StepsBlock = JSX<StepsBlockProps>(
   },
 );
 
-const renderStepTitle =
+// TODO: Create universal function for this case
+const renderStep =
   (size: SizeVersion, version: BlockVersion, showLines: boolean) =>
+  // Linter doesn't understand that switch processes all cases
+  // eslint-disable-next-line consistent-return
   (step: Step, i: number, steps: Step[]) => {
+    const { type } = step;
+
+    if (!(type === 'default' || type === 'rte')) {
+      return null;
+    }
+
+    switch (type) {
+      case 'default':
+        return renderDefaultStep(size, version, showLines)(step, i, steps);
+      case 'rte':
+        return <RichText __html={step.__html} />;
+      default:
+        assertUnreachable(step);
+    }
+  };
+
+const renderDefaultStep =
+  (size: SizeVersion, version: BlockVersion, showLines: boolean) =>
+  (step: DefaultStep, i: number, steps: Step[]) => {
     const isLastStep = steps.length - 1 === i;
     const margin = size === 'normal' ? 'ml-[34px]' : 'ml-6';
     const styleMap = STEPS_BLOCK_STYLE_MAPS[version];
@@ -106,7 +130,7 @@ const renderIconArea = (size: SizeVersion, version: BlockVersion) => (step: Step
       className={`${iconAreaSize} ${styleMap.iconBackground} rounded-full z-10 mr-3 flex justify-center content-center`}
     >
       <span className={`font-medium flex self-center ${iconTextSize}`}>
-        {checkIsIconRenderable(step?.icon) ? (
+        {checkCanRenderIcon(step?.icon) ? (
           <Img
             image={getIconWithVersion({ ...step.icon }, version)}
             width={iconSize}

package/mobile/src/components/StepsBlock/StepsBlock.ui.json

@@ -12,6 +12,12 @@
           "iconRight": {
             "ui:field": "icon"
           }
+        },
+        "__html": {
+          "ui:widget": "html"
+        },
+        "type": {
+          "ui:widget": "hidden"
         }
       }
     }

package/mobile/src/components/StepsBlock/StepsBlockContent.ts

@@ -1,6 +1,8 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { DefaultListItemType } from '../../model/DefaultListItemType';
 import type { DescriptionProps, HeadlineCommonProps, LabelProps } from '../../model/HeadlineType';
 import type { IconProps } from '../../model/Picture';
+import type { RichTextItem } from '../../model/RichTextItem';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
@@ -16,10 +18,20 @@ type StepCommonProps = IconProps & {
   items?: string[];
 };
 
+/**
+ * @title Стандартный
+ */
+export type DefaultStep = DescriptionProps & LabelProps & StepCommonProps & DefaultListItemType;
+
+/**
+ * @title Форматированный текст
+ */
+type RichTextStep = RichTextItem & IconProps;
+
 /**
  * @title Шаг
  */
-export type Step = DescriptionProps & LabelProps & StepCommonProps;
+export type Step = DefaultStep | RichTextStep;
 
 /**
  * @title Блок шаги

package/mobile/src/components/StepsBlock/checkCanRenderIcon.ts

@@ -0,0 +1,3 @@
+import type { Picture } from '../../model/Picture';
+
+export const checkCanRenderIcon = (icon?: Picture) => Boolean(icon?.icon || icon?.src);

package/mobile/src/components/StepsBlock/renderStep.tsx

@@ -0,0 +1,83 @@
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { VNode } from '../../model/VNode';
+import { Button } from '../../ui-kit/Button/Button';
+import { List } from '../../ui-kit/List/List';
+import { RichText } from '../../ui-kit/RichText/RichText';
+import { Text } from '../../ui-kit/Text/Text';
+import { assertUnreachable } from '../../utils/assertUnreachable';
+import { style } from '../../utils/style';
+import type { DefaultStep, Step } from './StepsBlockContent';
+import type { StyleType } from './StepsBlockStyleMaps';
+
+interface RenderStepProps {
+  styleMap: StyleType;
+  isMainButton: boolean;
+  version?: BlockVersion;
+}
+
+// TODO: Create universal function for this case
+export const renderStep =
+  (props: RenderStepProps) =>
+  // Linter doesn't understand that switch processes all cases
+  // eslint-disable-next-line consistent-return
+  (step: Step, i: number, arr: Step[]): VNode => {
+    const { type } = step;
+
+    if (!(type === 'default' || type === 'rte')) {
+      return null;
+    }
+
+    switch (type) {
+      case 'default':
+        return renderDefaultStep(props)(step, i, arr);
+      case 'rte':
+        return <RichText __html={step.__html} />;
+      default:
+        assertUnreachable(step);
+    }
+  };
+
+const renderDefaultStep =
+  ({ styleMap, isMainButton, version }: RenderStepProps) =>
+  (step: DefaultStep, i: number, arr: Step[]) => {
+    const { label, description, button, items, isDotted } = step;
+
+    return (
+      <div
+        key={String(i)}
+        className={style(
+          'relative flex flex-col items-center text-center whitespace-pre-line overflow-hidden',
+          getContainerWidth(arr.length),
+        )}
+      >
+        <div className={style(button?.text ? 'mb-8' : '', 'text-center')}>
+          {label ? (
+            <div className="mb-2">
+              <Text size="text-h6">{label}</Text>
+            </div>
+          ) : null}
+          <div className="flex flex-col items-center">
+            {description ? <div className={styleMap.description}>{description}</div> : null}
+            <List
+              className={style(description ? `${styleMap.description} mt-0.5` : 'text-h6')}
+              items={items}
+              listItemSize="M"
+              isDotted={isDotted}
+            />
+          </div>
+        </div>
+        {button?.text && !isMainButton ? (
+          <Button
+            className="box-border py-3 h-12 w-full max-w-[240px] mt-auto"
+            version={version as ButtonVersion}
+            {...button}
+          >
+            {button?.text}
+          </Button>
+        ) : null}
+      </div>
+    );
+  };
+
+const getContainerWidth = (length: number): string => (length < 5 ? 'w-[276px]' : 'w-[210px]');