@redneckz/wildless-cms-uni-blocks 0.10.6 → 0.10.8

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

@@ -2,16 +2,16 @@ import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { assertUnreachable } from '../../utils/assertUnreachable.js';
 import { LinkTab } from './LinkTab.js';
 import { renderGroupTab } from './renderGroupTab.js';
-export const renderTab = ({ page, currentTab, showCounter, onClick, isScrollable = false }) => (tab, i) => {
+export const renderTab = ({ page, showCounter, ...rest }) => (tab, i) => {
     const type = tab.type;
     if (!(type === 'group' || type === 'link')) {
         return null;
     }
     switch (type) {
         case 'group':
-            return renderGroupTab({ page, currentTab, showCounter, onClick, isScrollable })(tab, i);
+            return renderGroupTab({ page, showCounter, ...rest })(tab, i);
         case 'link': {
-            return (_jsx(LinkTab, { tab: tab, currentTab: currentTab, isScrollable: isScrollable, onClick: onClick }, String(i)));
+            return _jsx(LinkTab, { tab: tab, ...rest }, String(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":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAWlD,MAAM,CAAC,MAAM,SAAS,GACpB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,GAAG,KAAK,EAAkB,EAAE,EAAE,CACrF,CAAC,GAAY,EAAE,CAAS,EAAE,EAAE;IAC1B,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,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC1F,KAAK,MAAM,CAAC,CAAC;YACX,OAAO,CACL,KAAC,OAAO,IAEN,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,OAAO,IAJX,MAAM,CAAC,CAAC,CAAC,CAKd,CACH,CAAC;SACH;QACD;YACE,iBAAiB,CAAC,IAAI,CAAC,CAAC;KAC3B;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"renderTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/renderTab.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAWlD,MAAM,CAAC,MAAM,SAAS,GACpB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,EAAkB,EAAE,EAAE,CACnD,CAAC,GAAY,EAAE,CAAS,EAAE,EAAE;IAC1B,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,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAChE,KAAK,MAAM,CAAC,CAAC;YACX,OAAO,KAAC,OAAO,IAAiB,GAAG,EAAE,GAAG,KAAM,IAAI,IAA7B,MAAM,CAAC,CAAC,CAAC,CAAwB,CAAC;SACxD;QACD;YACE,iBAAiB,CAAC,IAAI,CAAC,CAAC;KAC3B;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/mobile/lib/components/Tabs/tabItemClasses.d.ts

@@ -1,3 +1,4 @@
+import type { TabsMode } from './TabsContent';
 export declare const LINK_CLASSES = "h-12 flex-1 flex items-center justify-center cursor-pointer";
 export declare const ACTIVE_LINK_CLASSES = "bg-primary-main";
 export declare const INACTIVE_LINK_CLASSES = "group/btn bg-white";
@@ -7,5 +8,5 @@ export declare const TEXT_CLASSES = "font-sans text-m text-center";
 export declare const ACTIVE_TEXT_CLASSES = "text-white";
 export declare const INACTIVE_TEXT_CLASSES = "text-secondary-text group-hover/btn:text-primary-main";
 export declare const WHITE_ACTIVE_TEXT_CLASSES = "text-primary-main";
-export declare const getGroupTabClassName: (type: string, active: boolean, isScrollable: boolean) => any;
-export declare const getLinkTabClassName: (type: string, active: boolean, isScrollable: boolean) => any;
+export declare const getGroupTabClassName: (type: string, active: boolean, tabsMode?: TabsMode) => any;
+export declare const getLinkTabClassName: (type: string, active: boolean, tabsMode?: TabsMode) => any;

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

@@ -13,7 +13,11 @@ const GROUP_TAB_CLASSES = {
             active: `inline-flex px-4 grow whitespace-nowrap ${LINK_CLASSES} ${SCROLLABLE_ACTIVE_LINK_CLASSES}`,
             default: `inline-flex px-4 grow whitespace-nowrap ${LINK_CLASSES} ${INACTIVE_LINK_CLASSES}`,
         },
-        default: {
+        centered: {
+            active: `px-4 rounded-md ${LINK_CLASSES} ${WIDESCREEN_ACTIVE_LINK_CLASSES} whitespace-nowrap`,
+            default: `px-4 rounded-md ${LINK_CLASSES} group/btn bg-transparent whitespace-nowrap`,
+        },
+        wideScreen: {
             active: `${LINK_CLASSES} ${WIDESCREEN_ACTIVE_LINK_CLASSES} whitespace-nowrap`,
             default: `${LINK_CLASSES} ${INACTIVE_LINK_CLASSES} whitespace-nowrap`,
         },
@@ -23,7 +27,11 @@ const GROUP_TAB_CLASSES = {
             active: `h-full border-0 border-b-2`,
             default: ``,
         },
-        default: {
+        centered: {
+            active: '',
+            default: '',
+        },
+        wideScreen: {
             active: '',
             default: '',
         },
@@ -35,7 +43,11 @@ const LINK_TAB_CLASSES = {
             active: `inline-flex px-4 grow whitespace-nowrap ${LINK_CLASSES} ${SCROLLABLE_ACTIVE_LINK_CLASSES}`,
             default: `inline-flex px-4 grow whitespace-nowrap ${LINK_CLASSES} ${INACTIVE_LINK_CLASSES}`,
         },
-        default: {
+        centered: {
+            active: `px-4 rounded-md ${LINK_CLASSES} ${WIDESCREEN_ACTIVE_LINK_CLASSES} whitespace-nowrap`,
+            default: `px-4 rounded-md ${LINK_CLASSES} group/btn bg-transparent whitespace-nowrap`,
+        },
+        wideScreen: {
             active: `${LINK_CLASSES} ${WIDESCREEN_ACTIVE_LINK_CLASSES}`,
             default: `${LINK_CLASSES} ${INACTIVE_LINK_CLASSES}`,
         },
@@ -45,20 +57,24 @@ const LINK_TAB_CLASSES = {
             active: `${TEXT_CLASSES} flex items-center h-full border-0 border-b-2 ${WHITE_ACTIVE_TEXT_CLASSES}`,
             default: `${TEXT_CLASSES} ${INACTIVE_TEXT_CLASSES}`,
         },
-        default: {
+        centered: {
+            active: `${TEXT_CLASSES} ${ACTIVE_TEXT_CLASSES}`,
+            default: `${TEXT_CLASSES} ${INACTIVE_TEXT_CLASSES}`,
+        },
+        wideScreen: {
             active: `${TEXT_CLASSES} ${ACTIVE_TEXT_CLASSES}`,
             default: `${TEXT_CLASSES} ${INACTIVE_TEXT_CLASSES}`,
         },
     },
 };
-export const getGroupTabClassName = (type, active, isScrollable) => {
-    const styleType = isScrollable ? 'scrollable' : 'default';
+export const getGroupTabClassName = (type, active, tabsMode) => {
     const styleActive = active ? 'active' : 'default';
-    return GROUP_TAB_CLASSES[type][styleType][styleActive];
+    const mode = tabsMode || 'wideScreen';
+    return GROUP_TAB_CLASSES[type][mode][styleActive];
 };
-export const getLinkTabClassName = (type, active, isScrollable) => {
-    const styleType = isScrollable ? 'scrollable' : 'default';
+export const getLinkTabClassName = (type, active, tabsMode) => {
     const styleActive = active ? 'active' : 'default';
-    return LINK_TAB_CLASSES[type][styleType][styleActive];
+    const mode = tabsMode || 'wideScreen';
+    return LINK_TAB_CLASSES[type][mode][styleActive];
 };
 //# sourceMappingURL=tabItemClasses.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tabItemClasses.js","sourceRoot":"","sources":["../../../src/components/Tabs/tabItemClasses.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,6DAA6D,CAAC;AAC1F,MAAM,CAAC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AACrD,MAAM,CAAC,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAE1D,MAAM,CAAC,MAAM,8BAA8B,GAAG,4BAA4B,CAAC;AAC3E,MAAM,CAAC,MAAM,8BAA8B,GAAG,4BAA4B,CAAC;AAE3E,MAAM,CAAC,MAAM,YAAY,GAAG,8BAA8B,CAAC;AAC3D,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,uDAAuD,CAAC;AAE7F,MAAM,CAAC,MAAM,yBAAyB,GAAG,mBAAmB,CAAC;AAE7D,MAAM,iBAAiB,GAAG;IACxB,GAAG,EAAE;QACH,UAAU,EAAE;YACV,MAAM,EAAE,2CAA2C,YAAY,IAAI,8BAA8B,EAAE;YACnG,OAAO,EAAE,2CAA2C,YAAY,IAAI,qBAAqB,EAAE;SAC5F;QACD,OAAO,EAAE;YACP,MAAM,EAAE,GAAG,YAAY,IAAI,8BAA8B,oBAAoB;YAC7E,OAAO,EAAE,GAAG,YAAY,IAAI,qBAAqB,oBAAoB;SACtE;KACF;IACD,IAAI,EAAE;QACJ,UAAU,EAAE;YACV,MAAM,EAAE,4BAA4B;YACpC,OAAO,EAAE,EAAE;SACZ;QACD,OAAO,EAAE;YACP,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;SACZ;KACF;CACF,CAAC;AACF,MAAM,gBAAgB,GAAG;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE;YACV,MAAM,EAAE,2CAA2C,YAAY,IAAI,8BAA8B,EAAE;YACnG,OAAO,EAAE,2CAA2C,YAAY,IAAI,qBAAqB,EAAE;SAC5F;QACD,OAAO,EAAE;YACP,MAAM,EAAE,GAAG,YAAY,IAAI,8BAA8B,EAAE;YAC3D,OAAO,EAAE,GAAG,YAAY,IAAI,qBAAqB,EAAE;SACpD;KACF;IACD,IAAI,EAAE;QACJ,UAAU,EAAE;YACV,MAAM,EAAE,GAAG,YAAY,iDAAiD,yBAAyB,EAAE;YACnG,OAAO,EAAE,GAAG,YAAY,IAAI,qBAAqB,EAAE;SACpD;QACD,OAAO,EAAE;YACP,MAAM,EAAE,GAAG,YAAY,IAAI,mBAAmB,EAAE;YAChD,OAAO,EAAE,GAAG,YAAY,IAAI,qBAAqB,EAAE;SACpD;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAE,MAAe,EAAE,YAAqB,EAAE,EAAE;IAC3F,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAElD,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,MAAe,EAAE,YAAqB,EAAE,EAAE;IAC1F,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAElD,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC;AACxD,CAAC,CAAC"}
+{"version":3,"file":"tabItemClasses.js","sourceRoot":"","sources":["../../../src/components/Tabs/tabItemClasses.ts"],"names":[],"mappings":"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"}

package/mobile/lib/hooks/useForm.js

@@ -4,7 +4,7 @@ export const useForm = (initialState, onSubmit) => {
     const [isDirtyForm, setDirtyForm] = useState(false);
     const [dirtyFieldsMap, setDirtyFieldsMap] = useState({});
     const handlersMap = useRef({});
-    const field = (fieldName) => {
+    const field = useCallback((fieldName) => {
         if (!handlersMap.current) {
             handlersMap.current = {};
         }
@@ -17,7 +17,7 @@ export const useForm = (initialState, onSubmit) => {
             isDirty: isDirtyForm || dirtyFieldsMap[fieldName],
             onChange: handlersMap.current[fieldName],
         };
-    };
+    }, [formState, isDirtyForm, dirtyFieldsMap]);
     const reset = useCallback(() => {
         setFormState(initialState);
         setDirtyForm(false);

package/mobile/lib/hooks/useForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/hooks/useForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAa5E,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,YAAuB,EACvB,QAAiC,EASjC,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAY,YAAY,CAAC,CAAC;IAEpE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAClD,EAAE,CACH,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,CAAyD,EAAE,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAmC,CAAC,SAAS,EAAE,EAAE;QAC1D,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;SAC1B;QAED,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE;YAC3C,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1D,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,OAAO;YACL,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC;YAC3B,OAAO,EAAE,WAAW,IAAI,cAAc,CAAC,SAAS,CAAC;YACjD,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC;SACzC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,iBAAiB,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAmB,EAAE,EAAE;QACtB,CAAC,CAAC,cAAc,EAAE,CAAC;QAEnB,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC,EACD,CAAC,QAAQ,EAAE,SAAS,CAAC,CACtB,CAAC;IAEF,OAAO;QACL,SAAS;QACT;YACE,OAAO,EAAE,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACnE,KAAK;YACL,KAAK;YACL,QAAQ,EAAE,YAAY;SACvB;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/hooks/useForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAa5E,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,YAAuB,EACvB,QAAiC,EASjC,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAY,YAAY,CAAC,CAAC;IAEpE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAClD,EAAE,CACH,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,CAAyD,EAAE,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAmC,WAAW,CACvD,CAAC,SAAS,EAAE,EAAE;QACZ,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;SAC1B;QAED,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE;YAC3C,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1D,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,OAAO;YACL,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC;YAC3B,OAAO,EAAE,WAAW,IAAI,cAAc,CAAC,SAAS,CAAC;YACjD,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC;SACzC,CAAC;IACJ,CAAC,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CACzC,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,iBAAiB,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAmB,EAAE,EAAE;QACtB,CAAC,CAAC,cAAc,EAAE,CAAC;QAEnB,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC,EACD,CAAC,QAAQ,EAAE,SAAS,CAAC,CACtB,CAAC;IAEF,OAAO;QACL,SAAS;QACT;YACE,OAAO,EAAE,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YACnE,KAAK;YACL,KAAK;YACL,QAAQ,EAAE,YAAY;SACvB;KACF,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/hooks/useLink.js

@@ -9,7 +9,7 @@ export function useLink(params = {}) {
     const { close } = useDialog();
     return (props) => ({
         ...props,
-        href: isRemote ? props.href : adjustHref(router)(props.href, basePath),
+        href: isRemote && !basePath ? props.href : adjustHref(router)(props.href, basePath),
         'aria-label': props.text,
         onClick: handlerDecorator(handleHref(props), props),
     });

package/mobile/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAWxC,MAAM,UAAU,OAAO,CAAC,SAAwB,EAAE;IAChD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAC;IAE9B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;QACtE,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,KAAK,EAAE,CAAC;YAER,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAWxC,MAAM,UAAU,OAAO,CAAC,SAAwB,EAAE;IAChD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAC;IAE9B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;QACnF,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,KAAK,EAAE,CAAC;YAER,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

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

@@ -13,9 +13,12 @@ const CHECK_PATHS = [
 ];
 export const Checkbox = JSX(({ className, value, text, disabled, isRadio, onChange }) => {
     const handleChange = useCallback((e) => {
+        if (disabled) {
+            return;
+        }
         e.preventDefault();
         onChange && onChange(!value);
-    }, [onChange, value]);
+    }, [onChange, disabled, value]);
     const icon = isRadio ? (_jsx("div", { className: "absolute left-1 w-3 h-3 rounded-full bg-primary-main" })) : (_jsx(SVG, { paths: CHECK_PATHS, className: "absolute left-1 ml-px block", width: "11", height: "9", fill: "white", viewBox: "0 0 11 9" }));
     return (_jsx("div", { className: className, children: _jsxs("label", { className: "flex items-center relative cursor-pointer group/box", onClick: handleChange, children: [_jsx("div", { className: style('appearance-none w-5 h-5 border-solid cursor-pointer m-0', isRadio ? 'rounded-full border-2' : checkboxStyle(value), value ? 'border-primary-main' : 'border-gray', disabled ? 'bg-main-disabled' : 'group-hover/box:border-primary-hover'), role: "checkbox", "aria-checked": Boolean(value), "aria-disabled": Boolean(disabled) }), value ? icon : null, text ? _jsx("span", { className: "font-sans ml-3 text-l-light", children: text }) : null] }) }));
 });

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

@@ -1 +1 @@
-{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/ui-kit/Checkbox/Checkbox.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG7B,MAAM,WAAW,GAAG;IAClB;QACE,CAAC,EAAE,4HAA4H;QAC/H,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;QACnB,IAAI,EAAE,OAAO;KACd;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC1D,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAmB,EAAE,EAAE;QACtB,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,QAAQ,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,EACD,CAAC,QAAQ,EAAE,KAAK,CAAC,CAClB,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CACrB,cAAK,SAAS,EAAC,sDAAsD,GAAG,CACzE,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IACF,KAAK,EAAE,WAAW,EAClB,SAAS,EAAC,6BAA6B,EACvC,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,GAAG,EACV,IAAI,EAAC,OAAO,EACZ,OAAO,EAAC,UAAU,GAClB,CACH,CAAC;IAEF,OAAO,CACL,cAAK,SAAS,EAAE,SAAS,YACvB,iBACE,SAAS,EAAC,qDAAqD,EAC/D,OAAO,EAAE,YAAY,aAErB,cACE,SAAS,EAAE,KAAK,CACd,yDAAyD,EACzD,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EACxD,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,EAC7C,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,sCAAsC,CACvE,EACD,IAAI,EAAC,UAAU,kBACD,OAAO,CAAC,KAAK,CAAC,mBACb,OAAO,CAAC,QAAQ,CAAC,GAChC,EACD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EACnB,IAAI,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,6BAA6B,YAAE,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,IACpE,GACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/ui-kit/Checkbox/Checkbox.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG7B,MAAM,WAAW,GAAG;IAClB;QACE,CAAC,EAAE,4HAA4H;QAC/H,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;QACnB,IAAI,EAAE,OAAO;KACd;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC1D,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAmB,EAAE,EAAE;QACtB,IAAI,QAAQ,EAAE;YACZ,OAAO;SACR;QAED,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,QAAQ,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,EACD,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAC5B,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CACrB,cAAK,SAAS,EAAC,sDAAsD,GAAG,CACzE,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IACF,KAAK,EAAE,WAAW,EAClB,SAAS,EAAC,6BAA6B,EACvC,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,GAAG,EACV,IAAI,EAAC,OAAO,EACZ,OAAO,EAAC,UAAU,GAClB,CACH,CAAC;IAEF,OAAO,CACL,cAAK,SAAS,EAAE,SAAS,YACvB,iBACE,SAAS,EAAC,qDAAqD,EAC/D,OAAO,EAAE,YAAY,aAErB,cACE,SAAS,EAAE,KAAK,CACd,yDAAyD,EACzD,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EACxD,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,EAC7C,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,sCAAsC,CACvE,EACD,IAAI,EAAC,UAAU,kBACD,OAAO,CAAC,KAAK,CAAC,mBACb,OAAO,CAAC,QAAQ,CAAC,GAChC,EACD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EACnB,IAAI,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,6BAA6B,YAAE,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,IACpE,GACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}

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

@@ -1,23 +1,29 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers.js';
 import { clamp } from '../../utils/clamp.js';
-import { getSanitizedValue } from '../../utils/getSanitizedValue.js';
+import { style } from '../../utils/style.js';
+import { Text } from '../Text/Text.js';
+import { parseDecimal } from './parseDecimal.js';
+import { renderRangeWithTicks } from './renderRangeWithTicks.js';
 const DISABLED_INPUT_CLASSES = 'disabled:border-gray disabled:bg-main-divider';
-export const InputRange = JSX(({ className, title, items = [], min = 1, max = 100, step = 1, value = min, disabled = false, onChange, }) => {
-    const handleChange = (e) => {
-        if (!onChange) {
-            return;
-        }
-        onChange(clamp(Number(getSanitizedValue(e.target.value)), min, max));
-    };
-    const inputStyle = {
-        backgroundSize: `${(((value - min) * 100) / (max - min)).toFixed(2)}% 100%`,
-    };
-    return (_jsxs("div", { className: className, children: [_jsxs("label", { className: "block relative", children: [title ? _jsx("span", { className: "text-m-light text-primary-text", children: title }) : null, _jsx("input", { className: `m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-gray rounded-md
-            outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-text ${DISABLED_INPUT_CLASSES}`, value: addSpacesBetweenNumbers(value), disabled: disabled, onChange: handleChange, onBlur: handleChange }), _jsx("div", { className: "absolute inset-x-0 -bottom-1 px-4 leading-[18px]", children: _jsx("input", { className: "box-border w-full m-0 cursor-pointer slider", type: "range", min: min, max: max, step: step, value: value, disabled: disabled, onChange: handleChange, style: inputStyle }) })] }), renderRangeCaption(items)] }));
+const DEFAULT_MIN = 1;
+const DEFAULT_MAX = 100;
+export const InputRange = JSX(({ className, title, items = [], list = [], min = list.length ? 0 : DEFAULT_MIN, max = list.length ? list.length - 1 : DEFAULT_MAX, step = 1, value = list[0] || min, disabled = false, onChange, }) => {
+    const [isFocused, setFocused] = useState(false);
+    const handleChange = useCallback((e) => {
+        onChange && onChange(parseDecimal(e.target?.value));
+    }, [onChange]);
+    const handleFocus = useCallback(() => {
+        setFocused(true);
+    }, []);
+    const handleBlur = useCallback(() => {
+        setFocused(false);
+        onChange && onChange(list.length ? closestValue(list)(value) : clamp(value || 0, min, max));
+    }, [onChange, value]);
+    return (_jsxs("div", { className: className, children: [_jsxs("label", { className: "block relative", children: [title ? (_jsx(Text, { size: "text-m", font: "font-light", color: "text-primary-text", children: title })) : null, _jsx("input", { className: style('m-0 mt-2 font-sans text-h3 w-full h-14', 'border border-solid border-gray rounded-md outline-none', 'p-0 pl-4 box-border', 'text-primary-text hover:border-primary-hover focus:border-primary-text', DISABLED_INPUT_CLASSES), value: isFocused ? value : addSpacesBetweenNumbers(value), disabled: disabled, onInput: handleChange, onFocus: handleFocus, onBlur: handleBlur }), renderRangeWithTicks({ list, min, max, step, disabled, value, onChange })] }), renderRangeCaption(items)] }));
 });
-function renderRangeCaption(items) {
-    return (_jsx("div", { className: "flex justify-between my-2", children: items.map((item, i) => (_jsx("span", { className: "text-s-light text-secondary-text", children: item }, String(i)))) }));
-}
+const closestValue = (list) => (_) => list.reduce((prev, curr) => (Math.abs(curr - _) < Math.abs(prev - _) ? curr : prev));
+const renderRangeCaption = (items) => (_jsx("div", { className: "flex justify-between my-2", children: items.map((item, i) => (_jsx(Text, { size: "text-s-light", color: "text-secondary-text", children: item }, String(i)))) }));
 //# sourceMappingURL=InputRange.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,sBAAsB,GAAG,+CAA+C,CAAC;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,GAAG,EACT,IAAI,GAAG,CAAC,EACR,KAAK,GAAG,GAAG,EACX,QAAQ,GAAG,KAAK,EAChB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,YAAY,GAA+C,CAAC,CAAC,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC5E,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,iBAAO,SAAS,EAAC,gBAAgB,aAC9B,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,gCAAgC,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC/E,gBACE,SAAS,EAAE;sHAC+F,sBAAsB,EAAE,EAClI,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,YAAY,GACpB,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,6CAA6C,EACvD,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,UAAU,GACjB,GACE,IACA,EACP,kBAAkB,CAAC,KAAK,CAAC,IACtB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAe;IACzC,OAAO,CACL,cAAK,SAAS,EAAC,2BAA2B,YACvC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAAsB,SAAS,EAAC,kCAAkC,YAC/D,IAAI,IADI,MAAM,CAAC,CAAC,CAAC,CAEb,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/ui-kit/InputRange/InputRangeProps.d.ts

@@ -4,6 +4,7 @@ export interface InputRangeProps extends ListContent {
     items?: string[];
     min?: number;
     max?: number;
+    list?: number[];
     step?: number;
     value?: number;
     title?: string;

package/mobile/lib/ui-kit/InputRange/parseDecimal.d.ts

@@ -0,0 +1 @@
+export declare function parseDecimal(value?: string): number;

package/mobile/lib/ui-kit/InputRange/parseDecimal.js

@@ -0,0 +1,6 @@
+export function parseDecimal(value) {
+    const rawValue = (value || '').replace(/\D/g, '');
+    const unsafeDecimal = parseInt(rawValue, 10);
+    return Number.isNaN(unsafeDecimal) ? 0 : unsafeDecimal;
+}
+//# sourceMappingURL=parseDecimal.js.map

package/mobile/lib/ui-kit/InputRange/parseDecimal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseDecimal.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/parseDecimal.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAE7C,OAAO,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AACzD,CAAC"}

package/mobile/lib/ui-kit/InputRange/renderRangeWithTicks.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+interface RangeWithTicksProps {
+    list: number[];
+    min: number;
+    max: number;
+    step: number;
+    disabled?: boolean;
+    value?: number;
+    onChange?: (value: number) => void;
+}
+export declare function renderRangeWithTicks({ list, min, max, step, value, disabled, onChange, }: RangeWithTicksProps): JSX.Element;
+export {};

package/mobile/lib/ui-kit/InputRange/renderRangeWithTicks.js

@@ -0,0 +1,14 @@
+import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
+import { parseDecimal } from './parseDecimal.js';
+export function renderRangeWithTicks({ list = [], min, max, step, value = list[0] || min, disabled, onChange, }) {
+    const rangeValue = list.length ? list.indexOf(value) : value;
+    const inputStyle = {
+        backgroundSize: `${(((rangeValue - min) * 100) / (max - min)).toFixed(2)}% 100%`,
+    };
+    return (_jsxs("div", { children: [list.length ? (_jsx("div", { className: "absolute w-full flex justify-between -bottom-[3px] px-4", children: list.map((_, i) => (_jsx("div", { className: `w-2 h-2 rounded-full ${rangeValue <= i || disabled ? 'bg-gray' : 'bg-primary-main'}` }, String(i)))) })) : null, _jsx("div", { className: "absolute inset-x-0 -bottom-1 px-4 leading-[18px]", children: _jsx("input", { className: "box-border w-full m-0 cursor-pointer slider relative z-10", style: inputStyle, type: "range", min: min, max: max, step: step, value: rangeValue, disabled: disabled, onInput: ((e) => {
+                        const rawValue = parseDecimal(e.target?.value);
+                        const newValue = list.length ? list[rawValue] : rawValue;
+                        onChange && onChange(newValue || 0);
+                    }) }) })] }));
+}
+//# sourceMappingURL=renderRangeWithTicks.js.map

package/mobile/lib/ui-kit/InputRange/renderRangeWithTicks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderRangeWithTicks.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/renderRangeWithTicks.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAY9C,MAAM,UAAU,oBAAoB,CAAC,EACnC,IAAI,GAAG,EAAE,EACT,GAAG,EACH,GAAG,EACH,IAAI,EACJ,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EACtB,QAAQ,EACR,QAAQ,GACY;IACpB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KACjF,CAAC;IAEF,OAAO,CACL,0BACG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,yDAAyD,YACrE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAClB,cAEE,SAAS,EAAE,wBACT,UAAU,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAC5C,EAAE,IAHG,MAAM,CAAC,CAAC,CAAC,CAId,CACH,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,EACR,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,2DAA2D,EACrE,KAAK,EAAE,UAAU,EACjB,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EACL,CAAC,CAAC,CAAkC,EAAE,EAAE;wBACtC,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACzD,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oBACtC,CAAC,CAAQ,GAEX,GACE,IACF,CACP,CAAC;AACJ,CAAC"}

package/mobile/lib/utils/getSanitizedValue.js

@@ -1,2 +1,2 @@
-export const getSanitizedValue = (_) => _.split(/\s+/).join('');
+export const getSanitizedValue = (_) => _.replace(/\s/g, '');
 //# sourceMappingURL=getSanitizedValue.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getSanitizedValue.js","sourceRoot":"","sources":["../../src/utils/getSanitizedValue.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"getSanitizedValue.js","sourceRoot":"","sources":["../../src/utils/getSanitizedValue.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC"}

package/mobile/lib/wlc.json

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

package/mobile/src/components/ApplicationForm/ApplicationForm.tsx

@@ -39,7 +39,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   }, []);
 
   return (
-    <BlockWrapper className={style('font-sans bg-white p-12 pb-9', className)} {...rest}>
+    <BlockWrapper className={style('font-sans bg-white p-default pb-9', className)} {...rest}>
       <div className="container max-w-[978px]">
         {title ? <Heading headingType="h3" title={title} className="text-center mb-8" /> : null}
         {COMPONENTS_MAP[typeForm]({ button, link, onSubmit: handleSubmit })}

package/mobile/src/components/Blocks.ts

@@ -1,4 +1,7 @@
 import type { BlocksRegistry } from '../model/BlocksRegistry';
+import { Carousel } from './Carousel/Carousel';
+import { CarouselRecommendationCard } from './CarouselRecommendationCard/CarouselRecommendationCard';
+import { CarouselTariffsCard } from './CarouselTariffsCard/CarouselTariffsCard';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { Footer } from './Footer/Footer';
 import { Header } from './Header/Header';
@@ -17,6 +20,8 @@ import { TextBlock } from './TextBlock/TextBlock';
 import { VerticalLayout } from './VerticalLayout/VerticalLayout';
 
 export const Blocks: BlocksRegistry = {
+  Carousel,
+  CarouselTariffsCard,
   ComparisonTable,
   Footer,
   Header,
@@ -33,4 +38,5 @@ export const Blocks: BlocksRegistry = {
   RichTextBlock,
   RollupItem,
   VerticalLayout,
+  CarouselRecommendationCard,
 };

package/mobile/src/components/Calculator/BonusCalculatorForm.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
 import type { CommonCalculatorProps } from './CalculatorContent';
@@ -16,47 +16,43 @@ export interface BonusCalculatorProps extends CommonCalculatorProps {
 
 export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
   ({ className = '', sourceBookDir = '', buttons, footnote }) => {
-    const [travelExpenseValue, setTravelExpenseValue] = useState(DEFAULT_TRAVEL_MIN_SUM);
-    const handleTravelExpenseValue = useCallback((_: number) => setTravelExpenseValue(_), []);
-    const [restExpenseValue, setRestExpenseValue] = useState(DEFAULT_REST_MIN_SUM);
-    const handleRestExpenseValue = useCallback((_: number) => setRestExpenseValue(_), []);
-    const userInputParams = {
-      travelExpenseValue,
-      restExpenseValue,
-    };
+    const [userInputParams, { field }] = useForm({
+      travelExpenseValue: DEFAULT_TRAVEL_MIN_SUM,
+      restExpenseValue: DEFAULT_REST_MIN_SUM,
+    });
+
     const { minSumTravel, maxSumTravel, minSumOther, maxSumOther, monthBonus, yearBonus } =
       useBonusCalculatorParams(userInputParams, sourceBookDir);
 
     return (
       <section className={style('flex justify-between', className)}>
         <div className="w-[468px]">
-          {renderWantedSumInput(
-            'Сумма покупок в категории путешествия, ₽',
-            {
-              minSum: minSumTravel,
-              maxSum: maxSumTravel,
-              moneyValue: travelExpenseValue,
-              step: 500,
-              isShowItems: false,
-            },
-            handleTravelExpenseValue,
-          )}
-          {renderWantedSumInput(
-            'Сумма покупок в остальных категориях, ₽',
-            {
-              className: 'mt-7',
-              minSum: minSumOther,
-              maxSum: maxSumOther,
-              moneyValue: restExpenseValue,
-              step: 500,
-              isShowItems: false,
-            },
-            handleRestExpenseValue,
-          )}
+          {renderWantedSumInput({
+            title: 'Сумма покупок в категории путешествия, ₽',
+            min: minSumTravel,
+            max: maxSumTravel,
+            step: 500,
+            isShowItems: false,
+            ...field('travelExpenseValue'),
+          })}
+          {renderWantedSumInput({
+            title: 'Сумма покупок в остальных категориях, ₽',
+            className: 'mt-7',
+            min: minSumOther,
+            max: maxSumOther,
+            step: 500,
+            isShowItems: false,
+            ...field('restExpenseValue'),
+          })}
         </div>
         <div>
           {monthBonus >= 0 ? (
-            <Rate title="Баллов за месяц" rate={monthBonus} rateBlockClassName="tracking-[-14px]" />
+            <Rate
+              title="Баллов за месяц"
+              rate={monthBonus}
+              rateBlockClassName="tracking-[-14px]"
+              fractionDigits={0}
+            />
           ) : null}
         </div>
         <div className="w-full max-w-[350px]">

package/mobile/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import type { BusinessDepositCalculatorProps } from './CalculatorContent';
@@ -22,29 +22,14 @@ export interface BusinessDepositCalculatorProp extends BusinessDepositCalculator
 
 export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
   ({ className = '', sourceBookDir, buttons, footnote, bottomFootnote, isShowDepositeName }) => {
-    const [moneyValue, setMoneyValue] = useState(BUSINESS_DEFAULT_SUM);
-    const handleMoneyValue = useCallback((_: number) => setMoneyValue(_), []);
-    const [daysValue, setDaysValue] = useState(BUSINESS_DEFAULT_DAYS);
-    const handleDaysValue = useCallback((_: number) => setDaysValue(_), []);
-    const [isReplenished, toggleIsReplenished] = useState(false);
-    const handleIsReplenished = useCallback((_: boolean) => toggleIsReplenished(_), []);
-    const [isPartialWithdrawal, toggleIsPartialWithdrawal] = useState(false);
-    const handleIsPartialWithdrawal = useCallback((_: boolean) => toggleIsPartialWithdrawal(_), []);
-    const [isSmallBusiness, toggleIsSmallBusiness] = useState(false);
-    const handleIsSmallBusiness = useCallback((_: boolean) => toggleIsSmallBusiness(_), []);
-    const [isMonthlyInterestPayment, toggleIsMonthlyInterestPayment] = useState(false);
-    const handleIsMonthlyInterestPayment = useCallback(
-      (_: boolean) => toggleIsMonthlyInterestPayment(_),
-      [],
-    );
-    const userInputParams = {
-      moneyValue,
-      daysValue,
-      isReplenished,
-      isPartialWithdrawal,
-      isSmallBusiness,
-      isMonthlyInterestPayment,
-    };
+    const [userInputParams, { field }] = useForm({
+      moneyValue: BUSINESS_DEFAULT_SUM,
+      daysValue: BUSINESS_DEFAULT_DAYS,
+      isReplenished: false,
+      isPartialWithdrawal: false,
+      isSmallBusiness: false,
+      isMonthlyInterestPayment: false,
+    });
 
     const calculatorParams = useBusinessDepositCalculatorParams(userInputParams, sourceBookDir);
     const { income, finalSum, rate, depositeName, isShowUnknownRate } = calculatorParams;
@@ -53,20 +38,26 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
       <section className={className}>
         <div className="flex justify-between">
           <div className="w-[486px]">
-            {renderWantedSumInput('Сумма вклада, ₽', calculatorParams, handleMoneyValue)}
-            {renderDaysInput('Срок вклада, дни', calculatorParams, handleDaysValue)}
+            {renderWantedSumInput({
+              title: 'Сумма вклада, ₽',
+              min: calculatorParams.minSum,
+              max: calculatorParams.maxSum,
+              ...field('moneyValue'),
+              value: calculatorParams.moneyValue,
+            })}
+            {renderDaysInput({
+              title: 'Срок вклада, дни',
+              min: calculatorParams.minDays,
+              max: calculatorParams.maxDays,
+              ...field('daysValue'),
+              value: calculatorParams.daysValue,
+            })}
             <div className="mt-7 flex justify-between">
-              {renderBusinessDepositParamsForm({
-                ...calculatorParams,
-                handleIsReplenished,
-                handleIsPartialWithdrawal,
-                handleIsSmallBusiness,
-              })}
+              {renderBusinessDepositParamsForm(calculatorParams, field)}
               {renderInterestPayment({
-                isMonthlyInterestPayment,
-                callback: handleIsMonthlyInterestPayment,
                 title: 'Выплата процентов',
                 orientation: 'vertical',
+                ...field('isMonthlyInterestPayment'),
               })}
             </div>
           </div>
@@ -95,40 +86,29 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
   },
 );
 
-interface BusinessDepositParamsFormProps extends BusinessDepositCalculatorParams {
-  handleIsReplenished?: (value: boolean) => void;
-  handleIsPartialWithdrawal?: (value: boolean) => void;
-  handleIsSmallBusiness?: (value: boolean) => void;
-}
-
-const renderBusinessDepositParamsForm = ({
-  isDisabledOperatingDeposit,
-  isReplenished,
-  isPartialWithdrawal,
-  isSmallBusiness,
-  handleIsReplenished,
-  handleIsPartialWithdrawal,
-  handleIsSmallBusiness,
-}: BusinessDepositParamsFormProps) => (
+const renderBusinessDepositParamsForm = (
+  calculatorParams: BusinessDepositCalculatorParams,
+  field: FormFieldRegisterer<any>,
+) => (
   <div>
     <Checkbox
       text="Пополнение"
-      disabled={isDisabledOperatingDeposit}
-      value={isReplenished}
-      onChange={handleIsReplenished}
+      disabled={calculatorParams.isDisabledOperatingDeposit}
+      {...field('isReplenished')}
+      value={calculatorParams.isReplenished}
     />
     <Checkbox
       className="mt-3"
-      disabled={isDisabledOperatingDeposit}
+      disabled={calculatorParams.isDisabledOperatingDeposit}
       text="Частичное снятие"
-      value={isPartialWithdrawal}
-      onChange={handleIsPartialWithdrawal}
+      {...field('isPartialWithdrawal')}
+      value={calculatorParams.isPartialWithdrawal}
     />
     <Checkbox
       className="mt-3"
       text="Являюсь малым предприятием"
-      value={isSmallBusiness}
-      onChange={handleIsSmallBusiness}
+      {...field('isSmallBusiness')}
+      value={calculatorParams.isSmallBusiness}
     />
   </div>
 );