@redneckz/wildless-cms-uni-blocks 0.5.10 → 0.5.11

package/mobile/lib/components/Tabs/renderLinkTab.js

@@ -1,4 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-import { INACTIVE_LINK_CLASSES, INACTIVE_TEXT_CLASSES, LINK_CLASSES, TEXT_CLASSES, } from './tabItemClasses.js';
-export const renderLinkTab = ({ text, onClick, href, target = '_self', i }) => (_jsx("a", { className: `${LINK_CLASSES} ${INACTIVE_LINK_CLASSES}`, target: target, href: href, onClick: onClick, children: _jsx("span", { className: `${TEXT_CLASSES} ${INACTIVE_TEXT_CLASSES}`, children: text }) }, String(i)));
+import { ACTIVE_LINK_CLASSES, ACTIVE_TEXT_CLASSES, INACTIVE_LINK_CLASSES, INACTIVE_TEXT_CLASSES, LINK_CLASSES, TEXT_CLASSES, } from './tabItemClasses.js';
+export const renderLinkTab = ({ text, currentTab, onClick, href, target = '_self', i, }) => {
+    const active = currentTab?.type === 'link' && currentTab.href === href;
+    return (_jsx("a", { className: `${LINK_CLASSES} ${active ? ACTIVE_LINK_CLASSES : INACTIVE_LINK_CLASSES}`, target: target, href: href, onClick: onClick, children: _jsx("span", { className: `${TEXT_CLASSES} ${active ? ACTIVE_TEXT_CLASSES : INACTIVE_TEXT_CLASSES}`, children: text }) }, String(i)));
+};
 //# sourceMappingURL=renderLinkTab.js.map

package/mobile/lib/components/Tabs/renderLinkTab.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderLinkTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/renderLinkTab.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,YAAY,GACb,MAAM,kBAAkB,CAAC;AAQ1B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC,EAAsB,EAAE,EAAE,CAAC,CACjG,YAEE,SAAS,EAAE,GAAG,YAAY,IAAI,qBAAqB,EAAE,EACrD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,YAEhB,eAAM,SAAS,EAAE,GAAG,YAAY,IAAI,qBAAqB,EAAE,YAAG,IAAI,GAAQ,IANrE,MAAM,CAAC,CAAC,CAAC,CAOZ,CACL,CAAC"}
+{"version":3,"file":"renderLinkTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/renderLinkTab.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,YAAY,GACb,MAAM,kBAAkB,CAAC;AAS1B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,EACP,IAAI,EACJ,MAAM,GAAG,OAAO,EAChB,CAAC,GACkB,EAAE,EAAE;IACvB,MAAM,MAAM,GAAG,UAAU,EAAE,IAAI,KAAK,MAAM,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC;IAEvE,OAAO,CACL,YAEE,SAAS,EAAE,GAAG,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,EACpF,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,YAEhB,eAAM,SAAS,EAAE,GAAG,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,YACvF,IAAI,GACA,IARF,MAAM,CAAC,CAAC,CAAC,CASZ,CACL,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/components/Tabs/renderTab.js

@@ -1,3 +1,4 @@
+import { EventBus } from '../../EventBus/EventBus.js';
 import { useLink } from '../../hooks/useLink.js';
 import { assertUnreachable } from '../../utils/assertUnreachable.js';
 import { renderGroupTab } from './renderGroupTab.js';
@@ -15,11 +16,20 @@ export const renderTab = ({ onClick, currentTab, showCounter, page, context }) =
     switch (type) {
         case 'group':
             return renderGroupTab({ onClick, currentTab, showCounter, page, context })(tab, i);
-        case 'link':
+        case 'link': {
+            const link = useLink({ router, handlerDecorator }, tab);
+            const linkClick = link.onClick;
             return renderLinkTab({
-                ...useLink({ router, handlerDecorator }, tab),
+                ...link,
+                onClick: (ev) => {
+                    linkClick(ev);
+                    onClick(tab);
+                    EventBus.inst.fire('anchorClick', { isScrolling: true, label: tab.href });
+                },
+                currentTab,
                 i,
             });
+        }
         default:
             assertUnreachable(type);
     }

package/mobile/lib/components/Tabs/renderTab.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/renderTab.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWhD,MAAM,CAAC,MAAM,SAAS,GACpB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAkB,EAAE,EAAE;AACxE,4DAA4D;AAC5D,6CAA6C;AAC7C,CAAC,GAAQ,EAAE,CAAS,EAAE,EAAE;IACtB,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IAEtB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO;YACV,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrF,KAAK,MAAM;YACT,OAAO,aAAa,CAAC;gBACnB,GAAG,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,GAAG,CAAC;gBAC7C,CAAC;aACF,CAAC,CAAC;QACL;YACE,iBAAiB,CAAC,IAAI,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC"}
+{"version":3,"file":"renderTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/renderTab.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWhD,MAAM,CAAC,MAAM,SAAS,GACpB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAkB,EAAE,EAAE;AACxE,4DAA4D;AAC5D,6CAA6C;AAC7C,CAAC,GAAQ,EAAE,CAAS,EAAE,EAAE;IACtB,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IAEtB,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO;YACV,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrF,KAAK,MAAM,CAAC,CAAC;YACX,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,GAAG,CAAC,CAAC;YACxD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAE/B,OAAO,aAAa,CAAC;gBACnB,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC,EAAmC,EAAE,EAAE;oBAC/C,SAAS,CAAC,EAAE,CAAC,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,CAAC;oBACb,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC5E,CAAC;gBACD,UAAU;gBACV,CAAC;aACF,CAAC,CAAC;SACJ;QACD;YACE,iBAAiB,CAAC,IAAI,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC"}

package/mobile/lib/react/IntersectionObserverTag.js

@@ -3,10 +3,14 @@ export const IntersectionObserverTag = (props) => {
     const { tag: _tag = 'section', observerCallback, observerOptions, className = '', anchor = null, children, } = props;
     const intersectionObserver = useRef();
     const ref = useCallback((tag) => {
-        if (tag && !intersectionObserver.current) {
-            intersectionObserver.current = new IntersectionObserver(observerCallback, observerOptions);
-            intersectionObserver.current.observe(tag);
+        if (!tag) {
+            return;
         }
+        if (intersectionObserver.current) {
+            intersectionObserver.current.disconnect();
+        }
+        intersectionObserver.current = new IntersectionObserver(observerCallback, observerOptions);
+        intersectionObserver.current.observe(tag);
     }, [observerCallback, observerOptions]);
     return React.createElement(_tag, { ref, className, id: anchor }, children);
 };

package/mobile/lib/react/IntersectionObserverTag.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntersectionObserverTag.js","sourceRoot":"","sources":["../../src/react/IntersectionObserverTag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAG9D,MAAM,CAAC,MAAM,uBAAuB,GAAkC,CAAC,KAAK,EAAE,EAAE;IAC9E,MAAM,EACJ,GAAG,EAAE,IAAI,GAAG,SAAS,EACrB,gBAAgB,EAChB,eAAe,EACf,SAAS,GAAG,EAAE,EACd,MAAM,GAAG,IAAI,EACb,QAAQ,GACT,GAAG,KAAK,CAAC;IAEV,MAAM,oBAAoB,GAAG,MAAM,EAAwB,CAAC;IAC5D,MAAM,GAAG,GAAG,WAAW,CACrB,CAAC,GAAmC,EAAE,EAAE;QACtC,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;YACxC,oBAAoB,CAAC,OAAO,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;YAC3F,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;SAC3C;IACH,CAAC,EACD,CAAC,gBAAgB,EAAE,eAAe,CAAC,CACpC,CAAC;IAEF,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,QAAqB,CAAC,CAAC;AAC1F,CAAC,CAAC"}
+{"version":3,"file":"IntersectionObserverTag.js","sourceRoot":"","sources":["../../src/react/IntersectionObserverTag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAG9D,MAAM,CAAC,MAAM,uBAAuB,GAAkC,CAAC,KAAK,EAAE,EAAE;IAC9E,MAAM,EACJ,GAAG,EAAE,IAAI,GAAG,SAAS,EACrB,gBAAgB,EAChB,eAAe,EACf,SAAS,GAAG,EAAE,EACd,MAAM,GAAG,IAAI,EACb,QAAQ,GACT,GAAG,KAAK,CAAC;IAEV,MAAM,oBAAoB,GAAG,MAAM,EAAwB,CAAC;IAE5D,MAAM,GAAG,GAAG,WAAW,CACrB,CAAC,GAAmC,EAAE,EAAE;QACtC,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QAED,IAAI,oBAAoB,CAAC,OAAO,EAAE;YAChC,oBAAoB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;SAC3C;QAED,oBAAoB,CAAC,OAAO,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;QAC3F,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC,EACD,CAAC,gBAAgB,EAAE,eAAe,CAAC,CACpC,CAAC;IAEF,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,QAAqB,CAAC,CAAC;AAC1F,CAAC,CAAC"}

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

@@ -1,27 +1,49 @@
 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 { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { EventBus } from '../EventBus/EventBus.js';
 import { changeHashOnObserve } from '../utils/changeHashOnObserve.js';
+const THRESHOLD_ACCURACY = 100; // Decimals number (100 is for two decimals number, 0.**)
+const THRESHOLD_ARRAY_LENGTH = 18;
+const THRESHOLD_ARRAY_START_VALUE = (THRESHOLD_ACCURACY - THRESHOLD_ARRAY_LENGTH) / THRESHOLD_ACCURACY;
 export const BlockWrapper = JSX(({ anchor, className, context, children, tag = 'section', labels }) => {
     const Tag = tag;
     const { IntersectionObserverTag } = context;
     const [shouldRenderBlock, setShouldRenderBlock] = useState(true);
-    useEffect(() => EventBus.inst.subscribe('tab', (event) => {
-        if (event.type === 'group') {
-            setShouldRenderBlock(!labels?.length || !event.label || labels.includes(event.label));
-        }
-        else {
-            setShouldRenderBlock(true);
-            scrollToBlock(event.label);
-        }
-    }), [labels]);
+    const anchorClickRef = useRef({});
+    const observerCallback = useMemo(() => changeHashOnObserve({ anchor, anchorClickRef }), [anchor, anchorClickRef]);
+    useEffect(() => {
+        const anchorClickCleanup = EventBus.inst.subscribe('anchorClick', (e) => {
+            anchorClickRef.current = e;
+        });
+        const tabCleanup = EventBus.inst.subscribe('tab', (event) => {
+            if (event.type === 'group') {
+                setShouldRenderBlock(!labels?.length || !event.label || labels.includes(event.label));
+            }
+            else {
+                changeHash(event.label);
+                setShouldRenderBlock(true);
+            }
+        });
+        return () => {
+            anchorClickCleanup();
+            tabCleanup();
+        };
+    }, [anchorClickRef]);
     if (!shouldRenderBlock) {
         return null;
     }
-    return anchor ? (_jsx(IntersectionObserverTag, { tag: tag, className: className, observerCallback: changeHashOnObserve, observerOptions: { threshold: 1 }, anchor: anchor, children: children })) : (_jsx(Tag, { className: className, children: children }));
+    return anchor ? (_jsx(IntersectionObserverTag, { tag: tag, className: className, observerCallback: observerCallback, observerOptions: {
+            threshold: new Array(THRESHOLD_ARRAY_LENGTH).fill(0).map(getIntersectionThreshold),
+        }, anchor: anchor, children: children })) : (_jsx(Tag, { className: className, children: children }));
 });
-function scrollToBlock(label) {
-    setTimeout(() => globalThis.document.getElementById(`#${label}`)?.scrollIntoView({ behavior: 'smooth' }));
+function getIntersectionThreshold(_, i) {
+    const value = (i + 1) / THRESHOLD_ACCURACY + THRESHOLD_ARRAY_START_VALUE;
+    return Math.round(value * THRESHOLD_ACCURACY) / THRESHOLD_ACCURACY;
+}
+function changeHash(label) {
+    if (label) {
+        globalThis.document.location.hash = label;
+    }
 }
 //# sourceMappingURL=BlockWrapper.js.map

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;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AASnE,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;IACpE,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjE,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,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3B,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,KAAC,uBAAuB,IACtB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,mBAAmB,EACrC,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EACjC,MAAM,EAAE,MAAM,YAEb,QAAQ,GACe,CAC3B,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IAAC,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAC5C,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,KAAc;IACnC,UAAU,CAAC,GAAG,EAAE,CACd,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,cAAc,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CACxF,CAAC;AACJ,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,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGnF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AASnE,MAAM,kBAAkB,GAAG,GAAG,CAAC,CAAC,yDAAyD;AACzF,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAClC,MAAM,2BAA2B,GAC/B,CAAC,kBAAkB,GAAG,sBAAsB,CAAC,GAAG,kBAAkB,CAAC;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;IACpE,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,cAAc,GAAG,MAAM,CAA4B,EAAE,CAAC,CAAC;IAE7D,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EACrD,CAAC,MAAM,EAAE,cAAc,CAAC,CACzB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;YACtE,cAAc,CAAC,OAAO,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1D,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1B,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aACvF;iBAAM;gBACL,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACxB,oBAAoB,CAAC,IAAI,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,kBAAkB,EAAE,CAAC;YACrB,UAAU,EAAE,CAAC;QACf,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,KAAC,uBAAuB,IACtB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,eAAe,EAAE;YACf,SAAS,EAAE,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,wBAAwB,CAAC;SACnF,EACD,MAAM,EAAE,MAAM,YAEb,QAAQ,GACe,CAC3B,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IAAC,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAC5C,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,wBAAwB,CAAC,CAAS,EAAE,CAAS;IACpD,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAkB,GAAG,2BAA2B,CAAC;IAEzE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,kBAAkB,CAAC,GAAG,kBAAkB,CAAC;AACrE,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,KAAK,EAAE;QACT,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;KAC3C;AACH,CAAC"}

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

@@ -1,14 +1,19 @@
-import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
+import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { clamp } from '../../utils/clamp.js';
-export const CurrencyInput = JSX(({ className = '', label, onChange, value = '', minValue = 0, maxValue = 300000, ...inputProps }) => {
-    const handleChange = (e) => {
+import { adjustValue } from './adjustValue .js';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { Input } from '../Input/Input.js';
+export const CurrencyInput = JSX(({ className = '', onChange, minValue = 0, maxValue = 300000, ...inputProps }) => {
+    const handleChange = useCallback((inputValue) => {
         if (!onChange) {
             return;
         }
-        const newValue = e.target.value === '' ? '' : String(clamp(e.target.value, minValue, maxValue));
-        onChange(newValue);
-    };
-    return (_jsxs("div", { className: className, children: [label ? _jsx("label", { className: "block text-m-light mb-2", children: label }) : null, _jsxs("div", { className: "h-[56px] relative flex items-center", children: [_jsx("input", { type: "number", className: 'text-l pl-4 pr-8 w-full h-full rounded-md border border-solid border-main-stroke hover:border-primary-hover active:border-primary-text focus:border-primary-text', onChange: handleChange, value: value, min: minValue, max: maxValue, ...inputProps }), _jsx("span", { className: "text-xl-light absolute right-4", children: "\u20BD" })] })] }));
+        const adjustedVal = adjustValue(inputValue);
+        const clampVal = getClampValue(adjustedVal, clamp(Number(adjustedVal), minValue, maxValue));
+        onChange(String(clampVal));
+    }, [onChange]);
+    return (_jsx(Input, { className: className, inputClassName: "w-full", onChange: handleChange, ...inputProps, children: _jsx("span", { className: "text-xl-light absolute right-4 bottom-4", children: "\u20BD" }) }));
 });
+const getClampValue = (val, clampVal) => Number(val) === clampVal ? val : String(clampVal);
 //# sourceMappingURL=CurrencyInput.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"CurrencyInput.js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/CurrencyInput.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,KAAK,EACL,QAAQ,EACR,KAAK,GAAG,EAAE,EACV,QAAQ,GAAG,CAAC,EACZ,QAAQ,GAAG,MAAM,EACjB,GAAG,UAAU,EACd,EAAE,EAAE;IACH,MAAM,YAAY,GAAG,CAAC,CAAM,EAAE,EAAE;QAC9B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,MAAM,QAAQ,GACZ,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE3F,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACtB,KAAK,CAAC,CAAC,CAAC,gBAAO,SAAS,EAAC,yBAAyB,YAAE,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EAC1E,eAAK,SAAS,EAAC,qCAAqC,aAClD,gBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EACP,kKAAkK,EAEpK,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,QAAQ,EACb,GAAG,EAAE,QAAQ,KACT,UAAU,GACd,EACF,eAAM,SAAS,EAAC,gCAAgC,uBAAS,IACrD,IACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"CurrencyInput.js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/CurrencyInput.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAC/E,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5F,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7B,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,OAAO,CACL,KAAC,KAAK,IAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAC,QAAQ,EAAC,QAAQ,EAAE,YAAY,KAAM,UAAU,YACzF,eAAM,SAAS,EAAC,yCAAyC,uBAAS,GAC5D,CACT,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,QAAQ,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC"}

package/mobile/lib/ui-kit/CurrencyInput/CurrencyInputProps.d.ts

@@ -1,10 +1,5 @@
-export declare type CurrencyInputProps = {
-    className?: string;
-    label?: string;
-    onChange?: (value: string) => void;
-    name?: string;
-    value?: string;
-    placeholder?: string;
+import type { InputProps } from '../Input/InputProps';
+export declare type CurrencyInputProps = InputProps & {
     minValue?: number;
     maxValue?: number;
 };

package/mobile/lib/ui-kit/CurrencyInput/adjustValue .d.ts

@@ -0,0 +1 @@
+export declare const adjustValue: (val: string) => string;

package/mobile/lib/ui-kit/CurrencyInput/adjustValue .js

@@ -0,0 +1,12 @@
+export const adjustValue = (val) => onlyOneDot(setZeroStart(replaceCommaToDot(val)));
+const onlyOneDot = (val) => {
+    const matches = val.match(/\./g) || [];
+    return matches.length > 1 ? val.slice(0, val.lastIndexOf('.')) : val;
+};
+const setZeroStart = (val) => {
+    const isZeroStart = val.indexOf('0') === 0 && val.length === 2;
+    const newVal = isZeroStart ? val.replace('0', '0.') : val;
+    return newVal.startsWith('.') ? newVal.replace('.', '0.') : newVal;
+};
+const replaceCommaToDot = (val) => String(val.replace(',', '.').replace(/[^.\d]/g, ''));
+//# sourceMappingURL=adjustValue%20.js.map

package/mobile/lib/ui-kit/CurrencyInput/adjustValue .js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustValue .js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue .ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAE7F,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IACzC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/Input/Input.d.ts

@@ -1,2 +1,2 @@
-import { InputProps } from './InputProps';
+import type { InputProps } from './InputProps';
 export declare const Input: import("@redneckz/uni-jsx").UNIComponent<InputProps, any, any>;

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

@@ -1,10 +1,13 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export const Input = JSX(({ className = '', id, name, type = 'text', placeholder, pattern, value, onChange }) => {
-    const handleChange = (e) => {
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+export const Input = JSX(({ className = '', inputClassName = '', id, name, type = 'text', label, value = '', children, onChange, ...inputProps }) => {
+    const handleChange = useCallback((e) => {
         const validInputValue = e.target.validity.valid ? e.target.value : value;
         onChange(validInputValue);
-    };
-    return (_jsx("input", { className: `border rounded-md border-main-stroke hover:border-primary-hover active:border-primary-text focus:border-primary-text text-primary-text outline-none ${className}`, id: id, name: name || id, type: type, pattern: pattern, placeholder: placeholder, value: value, onChange: handleChange }));
+    }, [onChange]);
+    const paddingStyle = children ? 'pr-8' : '';
+    return (_jsxs("div", { className: `relative ${className}`, children: [label ? _jsx("label", { className: "block text-m-light mb-2", children: label }) : null, _jsx("input", { className: `w-full border rounded-md border-main-stroke hover:border-primary-hover active:border-primary-text
+          focus:border-primary-text text-primary-text outline-none p-4 ${paddingStyle} ${inputClassName}`, id: id, name: name || id, type: type, value: value, onChange: handleChange, ...inputProps }), children] }));
 });
 //# sourceMappingURL=Input.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/Input.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CACtB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrF,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE;QACzB,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC,CAAC,KAAK,CAAC;QACrF,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,OAAO,CACL,gBACE,SAAS,EAAE,uJAAuJ,SAAS,EAAE,EAC7K,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,GACtB,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/Input.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CACtB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,cAAc,GAAG,EAAE,EACnB,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,MAAM,EACb,KAAK,EACL,KAAK,GAAG,EAAE,EACV,QAAQ,EACR,QAAQ,EACR,GAAG,UAAU,EACd,EAAE,EAAE;IACH,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAC,EAAE,EAAE;QACJ,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC,CAAC,KAAK,CAAC;QACrF,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5B,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5C,OAAO,CACL,eAAK,SAAS,EAAE,YAAY,SAAS,EAAE,aACpC,KAAK,CAAC,CAAC,CAAC,gBAAO,SAAS,EAAC,yBAAyB,YAAE,KAAK,GAAS,CAAC,CAAC,CAAC,IAAI,EAC1E,gBACE,SAAS,EAAE;yEACoD,YAAY,IAAI,cAAc,EAAE,EAC/F,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,KAClB,UAAU,GACd,EACD,QAAQ,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/ui-kit/Input/InputProps.d.ts

@@ -1,11 +1,14 @@
 import type { InputTypes } from '../../model/InputTypes';
-export interface InputProps {
+import type { LabelProps } from '../../model/HeadlineType';
+export declare type InputProps = LabelProps & {
     className?: string;
+    label?: string;
+    inputClassName?: string;
     id?: string;
     name?: string;
     type?: InputTypes;
     placeholder?: string;
     pattern?: string;
-    value: string;
+    value?: string;
     onChange: (value: string) => void;
-}
+};

package/mobile/lib/ui-kit/Select/Select.d.ts

@@ -1,8 +1,14 @@
+export interface OptionProps {
+    key: string;
+    text: string;
+}
 export interface SelectProps {
     className?: string;
-    id?: string;
-    name?: string;
-    value: string;
-    onChange: (value: string) => void;
+    label?: string;
+    value?: OptionProps;
+    onChange: (value: OptionProps) => void;
+    options: OptionProps[];
+    isBorder?: boolean;
+    placeholder?: string;
 }
 export declare const Select: import("@redneckz/uni-jsx").UNIComponent<SelectProps, any, any>;

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

@@ -1,9 +1,27 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-const selectStyle = {
-    background: `url('/icons/ArrowDownIcon.svg') right 16px top 50% / 21px no-repeat`,
-};
-export const Select = JSX(({ className = '', id, name, children, value, onChange }) => {
-    return (_jsx("select", { className: `appearance-none pl-0.5 ${className}`, style: selectStyle, id: id, name: name || id, value: value, onChange: (e) => onChange(e.target.value), placeholder: "", children: children }));
+import { Icon } from '../Icon/Icon.js';
+import { useState, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+export const Select = JSX(({ className = '', isBorder = true, label, options = [], value, onChange, placeholder = '' }) => {
+    const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
+    const [isOpen, setIsOpen] = useState(false);
+    const choiceOption = (option) => {
+        setSelectedItem(option);
+        setIsOpen(false);
+        onChange(option);
+    };
+    const isSelected = (option) => Boolean(option.key === selectedItem.key);
+    useEffect(() => {
+        setSelectedItem(value || { key: '', text: '' });
+    }, [value]);
+    return (_jsxs("div", { className: `${className}`, children: [label ? _jsx("span", { className: "mb-2 flex", children: label }) : null, _jsxs("div", { className: `relative ${isOpen ? 'z-20' : 'z-10'}`, children: [_jsxs("div", { className: `text-m-light flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
+            ${getBorderStyle(isBorder)}`, onClick: () => setIsOpen(!isOpen), children: [_jsx("p", { className: "p-4 pr-8 h-[56px] overflow-hidden text-ellipsis whitespace-nowrap", children: selectedItem?.text || placeholder }), _jsx(Icon, { name: "ArrowUpIcon", width: "16", height: "16", className: `absolute right-3 ${isOpen ? '' : 'rotate-180'}` })] }), options?.length ? (_jsx("div", { className: `h-0 ${renderOptionsStyle(isOpen)}`, children: _jsx("div", { className: `bg-white text-l max-h-[256px] overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]`, children: options.map(renderOption(choiceOption, isOpen, isSelected)) }) })) : null] })] }));
 });
+const renderOptionsStyle = (isOpen) => (isOpen ? '' : 'overflow-hidden');
+const renderOption = (choiceOption, isOpen, isSelected) => (option, i) => {
+    return (_jsxs("div", { onClick: () => {
+            choiceOption(option);
+        }, className: "flex px-4 py-3 cursor-pointer hover:bg-main-divider pr-11 relative", children: [_jsx("span", { className: "min-h-6", children: option.text }), _jsx(Icon, { name: "DoneSimpleIcon", width: "16", height: "16", className: ['absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden'].join(' ') })] }, String(i)));
+};
+const getBorderStyle = (isBorder) => isBorder ? 'border border-main-stroke rounded-md hover:border-primary-hover' : '';
 //# sourceMappingURL=Select.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAUxC,MAAM,WAAW,GAAG;IAClB,UAAU,EAAE,qEAAqE;CAClF,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CACvB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC1D,OAAO,CACL,iBACE,SAAS,EAAE,0BAA0B,SAAS,EAAE,EAChD,KAAK,EAAE,WAAW,EAClB,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,EACnD,WAAW,EAAC,EAAE,YAEb,QAAQ,GACF,CACV,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}

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

@@ -1 +1,9 @@
-export declare const changeHashOnObserve: (entries: IntersectionObserverEntry[]) => void;
+import { AnchorClickScrollingEvent } from '../components/Tabs/Tabs';
+interface ChangeHashOnObserveProps {
+    anchor?: string;
+    anchorClickRef?: {
+        current: AnchorClickScrollingEvent | null;
+    };
+}
+export declare const changeHashOnObserve: ({ anchor, anchorClickRef }: ChangeHashOnObserveProps) => (entries: IntersectionObserverEntry[]) => void;
+export {};

package/mobile/lib/utils/changeHashOnObserve.js

@@ -1,10 +1,18 @@
-export const changeHashOnObserve = (entries) => {
-    if (!entries.length) {
+import { EventBus } from '../EventBus/EventBus.js';
+export const changeHashOnObserve = ({ anchor, anchorClickRef }) => (entries) => {
+    if (!entries?.length) {
         return;
     }
     const [entry] = entries;
-    if (entry.isIntersecting) {
-        // Here must be logic for block intersection event
+    if (!entry.isIntersecting || entry.boundingClientRect.top > 150) {
+        return;
+    }
+    if (anchorClickRef?.current?.isScrolling && anchorClickRef.current.label === `#${anchor}`) {
+        EventBus.inst.fire('anchorClick', { isScrolling: false, label: undefined });
+        EventBus.inst.fire('tab', { type: 'link', label: anchor });
+    }
+    else if (!anchorClickRef?.current?.isScrolling) {
+        EventBus.inst.fire('tab', { type: 'link', label: anchor });
     }
 };
 //# sourceMappingURL=changeHashOnObserve.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"changeHashOnObserve.js","sourceRoot":"","sources":["../../src/utils/changeHashOnObserve.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAoC,EAAE,EAAE;IAC1E,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO;KACR;IACD,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;IAExB,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,kDAAkD;KACnD;AACH,CAAC,CAAC"}
+{"version":3,"file":"changeHashOnObserve.js","sourceRoot":"","sources":["../../src/utils/changeHashOnObserve.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAShD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,EAAE,MAAM,EAAE,cAAc,EAA4B,EAAE,EAAE,CACzD,CAAC,OAAoC,EAAE,EAAE;IACvC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;QACpB,OAAO;KACR;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;IAExB,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,kBAAkB,CAAC,GAAG,GAAG,GAAG,EAAE;QAC/D,OAAO;KACR;IAED,IAAI,cAAc,EAAE,OAAO,EAAE,WAAW,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,MAAM,EAAE,EAAE;QACzF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5E,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;KAC5D;SAAM,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE;QAChD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;KAC5D;AACH,CAAC,CAAC"}

package/mobile/src/EventBus/EventMap.ts

@@ -1,6 +1,8 @@
-import type { TabActivationEvent } from '../components/Tabs/Tabs';
+import type { AnchorClickScrollingEvent, TabActivationEvent } from '../components/Tabs/Tabs';
 import type { TariffsTableInnerEvent } from '../ui-kit/InnerTable/InnerTableProps';
+
 export interface EventMap {
   tab: TabActivationEvent;
   tariffInnerTable: TariffsTableInnerEvent;
+  anchorClick: AnchorClickScrollingEvent;
 }

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

@@ -0,0 +1,79 @@
+{
+  "content": {
+    "accordionItems": {
+      "items": {
+        "blocks": {
+          "items": {
+            "blockListType": {
+              "ui:widget": "hidden"
+            },
+            "image": {
+              "ui:field": "picture"
+            },
+            "benefitList": {
+              "items": {
+                "description": {
+                  "benefitType": {
+                    "ui:widget": "hidden"
+                  }
+                },
+                "icon": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "style": {
+              "ui:field": "style"
+            },
+            "benefits": {
+              "items": {
+                "icon": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "buttons": {
+              "items": {
+                "icon": {
+                  "ui:field": "icon"
+                },
+                "iconRight": {
+                  "ui:field": "icon"
+                }
+              }
+            },
+            "icon": {
+              "ui:field": "icon"
+            },
+            "backwardButton": {
+              "icon": {
+                "ui:field": "icon"
+              },
+              "iconRight": {
+                "ui:field": "icon"
+              }
+            },
+            "cards": {
+              "items": {
+                "image": {
+                  "ui:field": "picture"
+                },
+                "button": {
+                  "icon": {
+                    "ui:field": "icon"
+                  },
+                  "iconRight": {
+                    "ui:field": "icon"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "labelIcon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "content": {
+    "benefitList": {
+      "items": {
+        "description": {
+          "benefitType": {
+            "ui:widget": "hidden"
+          }
+        },
+        "icon": {
+          "ui:field": "icon"
+        }
+      }
+    }
+  }
+}

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

@@ -5,8 +5,11 @@
     {
       "title": "Плитка 1",
       "description": "Описание плитки 1",
-      "bonusCount": 1,
-      "bonusName": "балл"
+      "bonusItemContent": {
+        "bonusType": "count",
+        "bonusCount": "1",
+        "bonusName": "балл"
+      }
     }
   ]
 }

package/mobile/src/components/Bonus/Bonus.tsx

@@ -1,8 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
+import { Img } from '../../ui-kit/Img/Img';
 import { Headline } from '../Headline/Headline';
-import type { BonusContent } from './BonusContent';
+import type { BonusContent, BonusCountDef, BonusImageDef } from './BonusContent';
 
 export interface BonusProps extends BonusContent, UniBlockProps {}
 
@@ -25,28 +27,26 @@ export const Bonus = JSX<BonusProps>((props) => {
           align="center"
         />
         <div className="flex flex-wrap w-full mt-9">
-          {bonusItems
+          {bonusItems?.length
             ? bonusItems.map((_, i) => {
                 return (
                   <div
                     key={String(i)}
-                    className="flex-grow w-[49%] border border-gray pl-9 pt-9 pr-6 pb-6 mb-[14px] mx-[7px] even:mr-0 odd:ml-0 last:odd:mx-0"
+                    className="flex-grow w-[49%] border border-gray pl-9 pt-9 pr-6 pb-6 mb-3 mx-2 even:mr-0 odd:ml-0 last:odd:mx-0"
                   >
                     <div className="flex justify-between w-full">
-                      <div className="mr-4">
-                        <div className="text-h4">{_.title}</div>
-                        <div className="text-xl-light mt-[14px] max-w-[488px]">{_.description}</div>
-                      </div>
-                      {_.bonusCount ? (
-                        <div className="relative -bottom-3 h-auto flex items-end mt-14 shrink-0">
-                          <span className="font-mohave -tracking-[5px] text-title-extra bg-clip-text text-transparent bg-green-to-yellow -mb-7">
-                            {_.bonusCount}
-                          </span>
-                          <span className="text-h2 bg-clip-text text-transparent bg-green-to-yellow">
-                            {_.bonusName}
-                          </span>
+                      <div className="flex flex-col justify-between mr-4">
+                        <div>
+                          <div className="text-h4">{_.title}</div>
+                          <div className="text-xl-light mt-2 max-w-[488px]">{_.description}</div>
                         </div>
-                      ) : null}
+                        {_?.buttons?.length ? (
+                          <ButtonSection context={context} buttons={_?.buttons} />
+                        ) : null}
+                      </div>
+                      {_.bonusItemContent?.bonusType
+                        ? renderBonusItemContent(_.bonusItemContent)
+                        : null}
                     </div>
                   </div>
                 );
@@ -57,3 +57,31 @@ export const Bonus = JSX<BonusProps>((props) => {
     </BlockWrapper>
   );
 });
+
+const renderBonusItemContent = (bonusItemContent: BonusImageDef | BonusCountDef) => (
+  <div>
+    {bonusItemContent.bonusType === 'count'
+      ? renderBonusCount(bonusItemContent as BonusCountDef)
+      : renderBonusImage(bonusItemContent as BonusImageDef)}
+  </div>
+);
+
+const renderBonusCount = (_: BonusCountDef) => (
+  <div className="relative -bottom-3 h-auto flex items-end mt-14 shrink-0">
+    {_.bonusCount ? (
+      <span className="font-mohave -tracking-[5px] text-title-extra bg-clip-text text-transparent bg-green-to-yellow -mb-7">
+        {_.bonusCount}
+      </span>
+    ) : null}
+    {_.bonusName ? (
+      <span className="text-h2 bg-clip-text text-transparent bg-green-to-yellow">
+        {_.bonusName}
+      </span>
+    ) : null}
+  </div>
+);
+
+const renderBonusImage = (_: BonusImageDef) =>
+  _.image ? (
+    <Img className={`w-[50px] h-[50px] min-w-[50px] p-3 rounded-full`} image={_.image} />
+  ) : null;