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

package/mobile/src/icons/StrongBoxIcon.svg

@@ -1,4 +1,4 @@
-<svg title="Ящик с замочной скважиной" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg title="Ящик с замочной скважиной" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M2 15C2 20 4 22 9 22H15C20 22 22 20 22 15V9C22 4 20 2 15 2H9C4 2 2 4 2 9V10.91H9.64999" stroke="#000000" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
   <path d="M14.3511 10.9091C14.2511 11.6191 13.8311 12.2191 13.2511 12.5791V14.5591C13.2511 15.2491 12.6911 15.8091 12.0011 15.8091C11.3111 15.8091 10.7511 15.2491 10.7511 14.5591V12.5791C10.1711 12.2191 9.75109 11.6191 9.65109 10.9091C9.63109 10.7991 9.62109 10.6791 9.62109 10.5591C9.62109 9.03914 11.0611 7.85914 12.6411 8.27914C13.4411 8.48914 14.0911 9.13915 14.3011 9.93915C14.3911 10.2691 14.4011 10.5991 14.3511 10.9091Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10"/>
   <path d="M18.0016 10.9102H14.3516" stroke="#000000" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>

package/mobile/src/icons/TelegramIcon.svg

@@ -1,4 +1,4 @@
-<svg title="Лого «Telegram»" viewBox="0 0 20 16" xmlns="http://www.w3.org/2000/svg">
+<svg title="Лого «Telegram»" isInverse="true" viewBox="0 0 20 16" xmlns="http://www.w3.org/2000/svg">
   <path
     fill="currentColor"
     d="M1.226 6.968s8.846-3.512 11.913-4.749c1.177-.495 5.165-2.078 5.165-2.078s1.84-.692 1.687.99c-.051.692-.46 3.116-.87 5.738-.613 3.71-1.278 7.767-1.278 7.767s-.102 1.138-.971 1.336c-.87.197-2.3-.693-2.556-.891-.205-.148-3.835-2.374-5.165-3.463-.358-.297-.767-.89.051-1.583 1.841-1.632 4.04-3.66 5.37-4.947.613-.593 1.226-1.979-1.33-.297-3.63 2.424-7.21 4.7-7.21 4.7s-.818.495-2.352.05C2.146 9.094.357 8.5.357 8.5s-1.227-.741.87-1.533Z"

package/mobile/src/icons/UserSquareIcon.svg

@@ -1,4 +1,4 @@
-<svg title="Пользователь в рамке" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg title="Пользователь в рамке" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M18.1394 21.6207C17.2594 21.8807 16.2194 22.0007 14.9994 22.0007H8.99937C7.77937 22.0007 6.73937 21.8807 5.85938 21.6207C6.07937 19.0207 8.74937 16.9707 11.9994 16.9707C15.2494 16.9707 17.9194 19.0207 18.1394 21.6207Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M2 12.94V15C2 18.78 3.14 20.85 5.86 21.62C6.08 19.02 8.75 16.97 12 16.97C15.25 16.97 17.92 19.02 18.14 21.62C20.86 20.85 22 18.78 22 15V9C22 4 20 2 15 2H9C4 2 2 4 2 9V12.94ZM12 14.17C10.02 14.17 8.42 12.56 8.42 10.58C8.42 8.60002 10.02 7 12 7C13.98 7 15.58 8.60002 15.58 10.58C15.58 12.56 13.98 14.17 12 14.17Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M15.5799 10.58C15.5799 12.56 13.9799 14.17 11.9999 14.17C10.0199 14.17 8.41992 12.56 8.41992 10.58C8.41992 8.60002 10.0199 7 11.9999 7C13.9799 7 15.5799 8.60002 15.5799 10.58Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>

package/mobile/src/icons/UserTickIcon.svg

@@ -1,4 +1,4 @@
-<svg title="Пользователь" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg title="Пользователь" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M15.02 3.01A4.944 4.944 0 0 0 12 2C9.24 2 7 4.24 7 7s2.24 5 5 5 5-2.24 5-5M3.41 22c0-3.87 3.85-7 8.59-7 .96 0 1.89.13 2.76.37" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
   <path d="M22 18c0 .75-.21 1.46-.58 2.06-.21.36-.48.68-.79.94-.7.63-1.62 1-2.63 1a3.97 3.97 0 0 1-3.42-1.94A3.92 3.92 0 0 1 14 18c0-1.26.58-2.39 1.5-3.12A3.999 3.999 0 0 1 22 18Z" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
   <path d="m16.44 18 .99.99 2.13-1.97" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>

package/mobile/src/icons/VKIcon.svg

@@ -1,4 +1,4 @@
-<svg title="Лого «VK»" viewBox="0 0 24 12" xmlns="http://www.w3.org/2000/svg">
+<svg title="Лого «VK»" isInverse="true" viewBox="0 0 24 12" xmlns="http://www.w3.org/2000/svg">
   <path
     fill="currentColor"
     fill-rule="evenodd"

package/mobile/src/icons/WalletAdd2Icon.svg

@@ -1 +1 @@
-<svg title="Пополнение карты" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.19 7.06C6.45 7.02 6.72 7 7 7h10c.26 0 .51.01.75.05C20.33 7.35 22 9.26 22 12v5c0 3-2 5-5 5H7.63c.31-.26.58-.58.79-.94.37-.6.58-1.31.58-2.06 0-2.21-1.79-4-4-4-1.2 0-2.27.53-3 1.36V12c0-.87.17-1.66.48-2.33" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.75 7.05C17.51 7.01 17.26 7 17 7H7c-.28 0-.55.02-.81.06.14-.28.34-.54.58-.78l3.25-3.26a3.525 3.525 0 0 1 4.96 0l1.75 1.77c.64.63.98 1.43 1.02 2.26Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M9 19c0 .75-.21 1.46-.58 2.06A3.97 3.97 0 0 1 5 23a3.97 3.97 0 0 1-3.42-1.94A3.92 3.92 0 0 1 1 19c0-2.21 1.79-4 4-4s4 1.79 4 4ZM6.49 18.98H3.51M5 17.52v2.99" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/><path d="M22 12.5h-3c-1.1 0-2 .9-2 2s.9 2 2 2h3" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
+<svg title="Пополнение карты" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.19 7.06C6.45 7.02 6.72 7 7 7h10c.26 0 .51.01.75.05C20.33 7.35 22 9.26 22 12v5c0 3-2 5-5 5H7.63c.31-.26.58-.58.79-.94.37-.6.58-1.31.58-2.06 0-2.21-1.79-4-4-4-1.2 0-2.27.53-3 1.36V12c0-.87.17-1.66.48-2.33" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.75 7.05C17.51 7.01 17.26 7 17 7H7c-.28 0-.55.02-.81.06.14-.28.34-.54.58-.78l3.25-3.26a3.525 3.525 0 0 1 4.96 0l1.75 1.77c.64.63.98 1.43 1.02 2.26Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M9 19c0 .75-.21 1.46-.58 2.06A3.97 3.97 0 0 1 5 23a3.97 3.97 0 0 1-3.42-1.94A3.92 3.92 0 0 1 1 19c0-2.21 1.79-4 4-4s4 1.79 4 4ZM6.49 18.98H3.51M5 17.52v2.99" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/><path d="M22 12.5h-3c-1.1 0-2 .9-2 2s.9 2 2 2h3" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

package/mobile/src/icons/WalletAddIcon.svg

@@ -1 +1 @@
-<svg title="Кошелёк с плюсом" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 15.44h-5M12 13v5" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 22H8.1c-.24 0-.48-.02-.71-.05-3.18-.21-4.88-1.91-5.09-5.09-.03-.23-.05-.47-.05-.71V14.2c0-2.01 1.22-3.74 2.96-4.49.6-.25 1.24-.39 1.92-.39h9.76c.49 0 .97.07 1.41.2 2 .6 3.46 2.47 3.46 4.67v1.95c0 .2-.01.4-.02.6-.19 3.5-2.14 5.26-5.84 5.26" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="m12.9 2.52-.03.07-2.9 6.73H7.12c-.68 0-1.33.14-1.92.39l1.75-4.18.04-.1.07-.16c.02-.06.04-.12.07-.17 1.31-3.03 2.79-3.72 5.77-2.58Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M18.29 9.52c-.45-.14-.93-.2-1.41-.2H9.97l2.9-6.73.03-.07c.15.05.29.12.44.18l2.21.93c1.23.51 2.09 1.04 2.61 1.68.1.12.18.23.25.36.09.14.16.28.2.43.04.09.07.18.09.26.27.84.11 1.87-.41 3.16ZM6.95 5.53 5.2 9.71a4.894 4.894 0 0 0-2.96 4.49v-2.93c0-2.84 2.02-5.21 4.71-5.74Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M21.76 11.27v2.93c0-2.2-1.46-4.07-3.46-4.67.52-1.3.67-2.32.42-3.17-.02-.09-.05-.18-.09-.26 1.86.96 3.13 2.93 3.13 5.17Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
+<svg title="Кошелёк с плюсом" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 15.44h-5M12 13v5" stroke="currentColor" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 22H8.1c-.24 0-.48-.02-.71-.05-3.18-.21-4.88-1.91-5.09-5.09-.03-.23-.05-.47-.05-.71V14.2c0-2.01 1.22-3.74 2.96-4.49.6-.25 1.24-.39 1.92-.39h9.76c.49 0 .97.07 1.41.2 2 .6 3.46 2.47 3.46 4.67v1.95c0 .2-.01.4-.02.6-.19 3.5-2.14 5.26-5.84 5.26" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="m12.9 2.52-.03.07-2.9 6.73H7.12c-.68 0-1.33.14-1.92.39l1.75-4.18.04-.1.07-.16c.02-.06.04-.12.07-.17 1.31-3.03 2.79-3.72 5.77-2.58Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M18.29 9.52c-.45-.14-.93-.2-1.41-.2H9.97l2.9-6.73.03-.07c.15.05.29.12.44.18l2.21.93c1.23.51 2.09 1.04 2.61 1.68.1.12.18.23.25.36.09.14.16.28.2.43.04.09.07.18.09.26.27.84.11 1.87-.41 3.16ZM6.95 5.53 5.2 9.71a4.894 4.894 0 0 0-2.96 4.49v-2.93c0-2.84 2.02-5.21 4.71-5.74Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M21.76 11.27v2.93c0-2.2-1.46-4.07-3.46-4.67.52-1.3.67-2.32.42-3.17-.02-.09-.05-.18-.09-.26 1.86.96 3.13 2.93 3.13 5.17Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

package/mobile/src/icons/WalletIcon.svg

@@ -1 +1 @@
-<svg title="Кошелёк" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M10.75 16.86v2.03c0 1.72-1.6 3.11-3.57 3.11-1.97 0-3.58-1.39-3.58-3.11v-2.03c0 1.72 1.6 2.94 3.58 2.94 1.97 0 3.57-1.23 3.57-2.94Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M10.75 14.11c0 .5-.14.96-.38 1.36-.59.97-1.8 1.58-3.2 1.58-1.4 0-2.61-.62-3.2-1.58-.24-.4-.38-.86-.38-1.36 0-.86.4-1.63 1.04-2.19.65-.57 1.54-.91 2.53-.91.99 0 1.88.35 2.53.91.66.55 1.06 1.33 1.06 2.19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M10.75 14.11v2.75c0 1.72-1.6 2.94-3.57 2.94-1.97 0-3.58-1.23-3.58-2.94v-2.75C3.6 12.39 5.2 11 7.18 11c.99 0 1.88.35 2.53.91.64.56 1.04 1.34 1.04 2.2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M22 10.97v2.06c0 .55-.44 1-1 1.02h-1.96c-1.08 0-2.07-.79-2.16-1.87-.06-.63.18-1.22.6-1.63.37-.38.88-.6 1.44-.6H21c.56.02 1 .47 1 1.02Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M16 3.5c.26 0 .51.01.75.05C19.33 3.85 21 5.76 21 8.5v1.45h-2.08c-.56 0-1.07.22-1.44.6-.42.41-.66 1-.6 1.63.09 1.08 1.08 1.87 2.16 1.87H21v1.45c0 3-2 5-5 5h-2.5M2 10.5v-2c0-2.72 1.64-4.62 4.19-4.94.26-.04.53-.06.81-.06h5" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
+<svg title="Кошелёк" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M10.75 16.86v2.03c0 1.72-1.6 3.11-3.57 3.11-1.97 0-3.58-1.39-3.58-3.11v-2.03c0 1.72 1.6 2.94 3.58 2.94 1.97 0 3.57-1.23 3.57-2.94Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M10.75 14.11c0 .5-.14.96-.38 1.36-.59.97-1.8 1.58-3.2 1.58-1.4 0-2.61-.62-3.2-1.58-.24-.4-.38-.86-.38-1.36 0-.86.4-1.63 1.04-2.19.65-.57 1.54-.91 2.53-.91.99 0 1.88.35 2.53.91.66.55 1.06 1.33 1.06 2.19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M10.75 14.11v2.75c0 1.72-1.6 2.94-3.57 2.94-1.97 0-3.58-1.23-3.58-2.94v-2.75C3.6 12.39 5.2 11 7.18 11c.99 0 1.88.35 2.53.91.64.56 1.04 1.34 1.04 2.2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M22 10.97v2.06c0 .55-.44 1-1 1.02h-1.96c-1.08 0-2.07-.79-2.16-1.87-.06-.63.18-1.22.6-1.63.37-.38.88-.6 1.44-.6H21c.56.02 1 .47 1 1.02Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M16 3.5c.26 0 .51.01.75.05C19.33 3.85 21 5.76 21 8.5v1.45h-2.08c-.56 0-1.07.22-1.44.6-.42.41-.66 1-.6 1.63.09 1.08 1.08 1.87 2.16 1.87H21v1.45c0 3-2 5-5 5h-2.5M2 10.5v-2c0-2.72 1.64-4.62 4.19-4.94.26-.04.53-.06.81-.06h5" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

package/mobile/src/icons/WalletWithMoneyIcon.svg

@@ -1 +1 @@
-<svg title="Кошелёк с деньгами" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M20 12.063V11a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-1.063" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="m5 7 8.571-5L15 4.308M10 7l8-4 2 2.91" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M16.56 18H21a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1v3" stroke="#000000" stroke-width="2" stroke-linecap="round"/></svg>
+<svg title="Кошелёк с деньгами" isInverse="true" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M20 12.063V11a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-1.063" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="m5 7 8.571-5L15 4.308M10 7l8-4 2 2.91" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M16.56 18H21a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1v3" stroke="#000000" stroke-width="2" stroke-linecap="round"/></svg>

package/mobile/src/model/BlockDecorator.ts

@@ -0,0 +1,17 @@
+import type { BlockDef, Slot, SlotsMap } from './ContentPageDef';
+
+export const DEFAULT_SLOT_NAME = null;
+
+export type BlockAncestors = [keyof SlotsMap | typeof DEFAULT_SLOT_NAME, ...Slot[]];
+
+interface BlockDecoratorProps<VNode> {
+  blockClassName: string;
+  block: BlockDef;
+  ancestors: BlockAncestors; // Is needed to simplify page editor logic
+  render: (props: { blockClassName: string; block: BlockDef }) => VNode;
+}
+
+export type BlockDecorator<VNode = any> = (
+  props: BlockDecoratorProps<VNode>,
+  index?: number | string,
+) => any;

package/mobile/src/model/BlocksRegistry.ts

@@ -0,0 +1,11 @@
+import type { UNIComponent } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from './ContentPageDef';
+import type { VNode } from './VNode';
+
+export type JSXBlock<BlockProps = Record<string, any>> = UNIComponent<
+  BlockProps & UniBlockProps,
+  any,
+  VNode | VNode[]
+>;
+
+export type BlocksRegistry<BlockProps = Record<string, any>> = Record<string, JSXBlock<BlockProps>>;

package/mobile/src/{types.ts → model/ContentPageDef.ts}

@@ -1,6 +1,5 @@
-import type { BlockContent } from './components/BlockContent';
-import type { ContentPageContext } from './components/ContentPage/ContentPageContext';
-import type { BlockVersion } from './model/BlockVersion';
+import type { ContentPageContext } from '../components/ContentPage/ContentPageContext';
+import type { BlockVersion } from './BlockVersion';
 
 /**
  * @title Цветовая палитра
@@ -8,10 +7,9 @@ import type { BlockVersion } from './model/BlockVersion';
  */
 export type ColorPalette = '' | 'pc' | 'bc' | 'eo';
 
-export interface BaseBlockDef {
+export interface BaseBlockDef extends Slot {
   type?: string;
-  style?: string[];
-  content?: BlockContent;
+  content?: Record<string, any>;
   version?: BlockVersion;
   hidden?: boolean;
   anchor?: string;
@@ -45,10 +43,8 @@ export interface ContentPageMeta {
   jsonLd?: string;
 }
 
-export interface ContentPageDef extends ContentPageMeta {
+export interface ContentPageDef extends ContentPageMeta, Slot {
   _customPageType?: string;
-  style?: string[];
-  blocks?: BlockDef[];
   slots?: SlotsMap;
   fallback?: Record<string, unknown>;
   likeControl?: boolean;
@@ -62,17 +58,3 @@ export interface UniBlockProps {
   labels?: string[];
   anchor?: string;
 }
-
-export interface DaDataResult {
-  suggestions?: DaDataSuggestion<DaDataAddress>[];
-}
-
-export interface DaDataSuggestion<T> {
-  value?: string;
-  unrestricted_value?: string;
-  data?: T;
-}
-
-export interface DaDataAddress {
-  city?: string | null;
-}

package/mobile/src/{types → model}/Fallback.ts

@@ -1,4 +1,5 @@
 type Key = string;
 type Data = any;
+
 export type FallbackMap = Record<Key, () => Promise<Data>>;
 export type Fallback = Record<Key, Data>;

package/mobile/src/react/IntersectionObserverTag.tsx

@@ -12,12 +12,19 @@ export const IntersectionObserverTag: IntersectionObserverComponent = (props) =>
   } = props;
 
   const intersectionObserver = useRef<IntersectionObserver>();
+
   const ref = useCallback(
     (tag: HTMLElement | null | undefined) => {
-      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],
   );

package/mobile/src/services/sitemap/useSitemap.ts

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { HeaderContent } from '../../components/Header/HeaderContent';
 import { projectSettings } from '../../ProjectSettings';
-import type { Fallback } from '../../types/Fallback';
+import type { Fallback } from '../../model/Fallback';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON';
 
 export function useSitemap(fallback: Fallback = {}): HeaderContent {

package/mobile/src/ui-kit/BenefitItem/BenefitItemProps.ts

@@ -4,6 +4,7 @@ import type { IconVersion } from '../../model/IconVersion';
 import type { DescriptionProps, LabelProps } from '../../model/HeadlineType';
 
 export interface BenefitItemCommonProps {
+  /** @hidden */
   benefitsVersion?: IconVersion;
   /** @hidden */
   version?: BlockVersion;

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

@@ -1,8 +1,9 @@
 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 type { ContentPageContext } from '../components/ContentPage/ContentPageContext';
+import { AnchorClickScrollingEvent } from '../components/Tabs/Tabs';
 import { EventBus } from '../EventBus/EventBus';
-import type { UniBlockProps } from '../types';
+import type { UniBlockProps } from '../model/ContentPageDef';
 import { changeHashOnObserve } from '../utils/changeHashOnObserve';
 
 interface BlockWrapperProps extends UniBlockProps, Record<string, any> {
@@ -12,26 +13,44 @@ interface BlockWrapperProps extends UniBlockProps, Record<string, any> {
   tag?: keyof HTMLElementTagNameMap;
 }
 
+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<BlockWrapperProps>(
   ({ anchor, className, context, children, tag = 'section', labels }) => {
     const Tag: any = tag;
 
     const { IntersectionObserverTag } = context;
+
     const [shouldRenderBlock, setShouldRenderBlock] = useState(true);
+    const anchorClickRef = useRef<AnchorClickScrollingEvent>({});
 
-    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 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;
     }
@@ -40,8 +59,10 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
       <IntersectionObserverTag
         tag={tag}
         className={className}
-        observerCallback={changeHashOnObserve}
-        observerOptions={{ threshold: 1 }} // Lower threshold when hash change needed
+        observerCallback={observerCallback}
+        observerOptions={{
+          threshold: new Array(THRESHOLD_ARRAY_LENGTH).fill(0).map(getIntersectionThreshold),
+        }}
         anchor={anchor}
       >
         {children}
@@ -52,8 +73,14 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
   },
 );
 
-function scrollToBlock(label?: string) {
-  setTimeout(() =>
-    globalThis.document.getElementById(`#${label}`)?.scrollIntoView({ behavior: 'smooth' }),
-  );
+function getIntersectionThreshold(_: number, i: number): number {
+  const value = (i + 1) / THRESHOLD_ACCURACY + THRESHOLD_ARRAY_START_VALUE;
+
+  return Math.round(value * THRESHOLD_ACCURACY) / THRESHOLD_ACCURACY;
+}
+
+function changeHash(label?: string) {
+  if (label) {
+    globalThis.document.location.hash = label;
+  }
 }

package/mobile/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -1,6 +1,6 @@
-import type { JSXBlock } from '../../components/ContentPage/ContentPage';
 import type { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
-import type { UniBlockProps } from '../../types';
+import type { JSXBlock } from '../../model/BlocksRegistry';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { style2className } from '../../utils/style2className';
 import type { BlockDef } from './BlocksListProps';
 import { EmbeddableBlocks } from './EmbeddableBlocks';

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

@@ -39,6 +39,9 @@ export const Button = JSX<ButtonWithIconProps>(
     ariaLabel,
     ...rest
   }) => {
+    // It isn't a valid HTML attribute. Must be excluded from "rest"
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { asSVG, iconRight, appendRight, icon, ...buttonInnerRest } = rest;
     const buttonInner = children ?? (
       <ButtonInner
         text={text}
@@ -75,7 +78,7 @@ export const Button = JSX<ButtonWithIconProps>(
         onClick={onClick}
         aria-label={ariaLabel}
         role={!href ? 'button' : 'link'}
-        {...rest}
+        {...buttonInnerRest}
       >
         {buttonInner}
       </a>

package/mobile/src/ui-kit/Button/ButtonSection.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { UniBlockProps } from '../../types';
+import { UniBlockProps } from '../../model/ContentPageDef';
 import { Img } from '../Img/Img';
 import { Button } from './Button';
 import type { ButtonContent, ButtonWithIconProps } from './ButtonProps';

package/mobile/src/ui-kit/Button/buttonClassNameConstants.ts

@@ -4,7 +4,8 @@ export const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
   secondary:
     'text-primary-main bg-main-divider hover:text-white hover:bg-primary-hover active:bg-primary-active',
-  white: 'text-primary-main bg-white hover:text-white hover:bg-primary-hover active:bg-white',
+  white:
+    'text-primary-main bg-white hover:text-white hover:bg-primary-hover active:bg-white active:text-primary-main',
   link: '',
 };
 

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

@@ -1,46 +1,31 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { clamp } from '../../utils/clamp';
+import { adjustValue } from './adjustValue ';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { Input } from '../Input/Input';
 import type { CurrencyInputProps } from './CurrencyInputProps';
 
 export const CurrencyInput = JSX<CurrencyInputProps>(
-  ({
-    className = '',
-    label,
-    onChange,
-    value = '',
-    minValue = 0,
-    maxValue = 300000,
-    ...inputProps
-  }) => {
-    const handleChange = (e: any) => {
-      if (!onChange) {
-        return;
-      }
-
-      const newValue =
-        e.target.value === '' ? '' : String(clamp(e.target.value as number, minValue, maxValue));
-
-      onChange(newValue);
-    };
+  ({ className = '', onChange, minValue = 0, maxValue = 300000, ...inputProps }) => {
+    const handleChange = useCallback(
+      (inputValue: string) => {
+        if (!onChange) {
+          return;
+        }
+        const adjustedVal = adjustValue(inputValue);
+        const clampVal = getClampValue(adjustedVal, clamp(Number(adjustedVal), minValue, maxValue));
+        onChange(String(clampVal));
+      },
+      [onChange],
+    );
 
     return (
-      <div className={className}>
-        {label ? <label className="block text-m-light mb-2">{label}</label> : null}
-        <div className="h-[56px] relative flex items-center">
-          <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}
-          />
-          <span className="text-xl-light absolute right-4">₽</span>
-        </div>
-      </div>
+      <Input className={className} inputClassName="w-full" onChange={handleChange} {...inputProps}>
+        <span className="text-xl-light absolute right-4 bottom-4">₽</span>
+      </Input>
     );
   },
 );
+
+const getClampValue = (val: string, clampVal) =>
+  Number(val) === clampVal ? val : String(clampVal);

package/mobile/src/ui-kit/CurrencyInput/CurrencyInputProps.ts

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

package/mobile/src/ui-kit/CurrencyInput/adjustValue .ts

@@ -0,0 +1,17 @@
+export const adjustValue = (val: string) => onlyOneDot(setZeroStart(replaceCommaToDot(val)));
+
+const onlyOneDot = (val: string): string => {
+  const matches = val.match(/\./g) || [];
+
+  return matches.length > 1 ? val.slice(0, val.lastIndexOf('.')) : val;
+};
+
+const setZeroStart = (val: string): string => {
+  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): string =>
+  String(val.replace(',', '.').replace(/[^.\d]/g, ''));

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import { ColorPalette } from '../../model/ContentPageDef';
 import type { VNode } from '../../model/VNode';
-import { ColorPalette } from '../../types';
 import { clamp } from '../../utils/clamp';
 import { Icon } from '../Icon/Icon';
 import { foldableBlockClassNames, useActiveHandler } from './useActiveHandler';

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { IconTitleMap } from '../../icons/IconName';
+import { IconInverseMap, IconTitleMap } from '../../icons/IconName';
 import type { IconVersion } from '../../model/IconVersion';
 import { projectSettings } from '../../ProjectSettings';
 import type { IconProps } from './IconProps';
@@ -7,7 +7,7 @@ import type { IconProps } from './IconProps';
 const svgUseStyleMap: Record<IconVersion, string> = {
   normal: 'text-primary-main',
   black: 'text-black',
-  white: 'text-black invert',
+  white: 'text-black',
 };
 
 export const Icon = JSX<IconProps>(
@@ -23,17 +23,24 @@ export const Icon = JSX<IconProps>(
   }) => {
     const href = `${projectSettings.CDN || ''}icons/${name}.svg`;
 
-    if (asSVG) {
+    if (asSVG && IconInverseMap[name]) {
       return (
-        <svg className={className} {...imgProps} aria-hidden="true">
-          {title ? <title>{title}</title> : null}
-          {alt ? <desc>{alt}</desc> : null}
-          <use
-            className={`${svgUseStyleMap[iconVersion]} ${imageClassName}`}
-            href={`${href}#icon`}
-            xlinkHref={`${href}#icon`}
-          />
-        </svg>
+        <Background className={className}>
+          <svg
+            className={[
+              getSvgSize(className, imgProps.width),
+              svgUseStyleMap[iconVersion],
+              imageClassName,
+              getInvertStyle(name, iconVersion),
+            ].join(' ')}
+            {...imgProps}
+            aria-hidden="true"
+          >
+            {title ? <title>{title}</title> : null}
+            {alt ? <desc>{alt}</desc> : null}
+            <use href={`${href}#icon`} xlinkHref={`${href}#icon`} />
+          </svg>
+        </Background>
       );
     }
 
@@ -49,3 +56,13 @@ export const Icon = JSX<IconProps>(
     );
   },
 );
+
+const getInvertStyle = (name: string, iconVersion: IconVersion) =>
+  iconVersion === 'white' && IconInverseMap[name] ? 'invert' : '';
+
+const getSvgSize = (className?: string, width?: string) =>
+  width ? `width: ${width}px ` : 'w-full h-full';
+
+const Background = JSX<{ className?: string }>(({ className, children }) =>
+  className ? <div className={className}>{children}</div> : children,
+);

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useTariffsInnerTableData } from '../../hooks/useTariffsInnerTableData';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { InnerTableBody } from './InnerTableBody';
 import { TableInnerButton } from './InnerTableButton';
 import { InnerTableHeader } from './InnerTableHeader';

package/mobile/src/ui-kit/InnerTable/InnerTableBody.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type UniBlockProps } from '../../types';
+import { type UniBlockProps } from '../../model/ContentPageDef';
 import { Img } from '../Img/Img';
 import { InnerTableBodyItem } from './InnerTableBodyItem';
 import type { DataItem } from './InnerTableProps';

package/mobile/src/ui-kit/InnerTable/InnerTableBodyItem.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../types';
+import type { UniBlockProps } from '../../model/ContentPageDef';
 import { renderArrows } from '../Button/renderArrows';
 import type { RowsData } from './InnerTableProps';
 

package/mobile/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { EventBus } from '../../EventBus/EventBus';
-import { UniBlockProps } from '../../types';
+import { UniBlockProps } from '../../model/ContentPageDef';
 import { Button } from '../Button/Button';
 import { Icon } from '../Icon/Icon';
 import type { TariffsTableInnerEvent } from './InnerTableProps';