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

package/lib/components/StepsBlock/StepsBlockContent.d.ts

@@ -3,10 +3,7 @@ import type { DescriptionProps, HeadlineCommonProps, LabelProps } from '../../mo
 import type { IconProps } from '../../model/Picture';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-/**
- * @title Шаг
- */
-export declare type Step = DescriptionProps & LabelProps & IconProps & {
+declare type StepCommonProps = IconProps & {
     /** @title Кнопка */
     button?: ButtonWithIconProps;
     /**
@@ -17,6 +14,10 @@ export declare type Step = DescriptionProps & LabelProps & IconProps & {
     /** @title Список */
     items?: string[];
 };
+/**
+ * @title Шаг
+ */
+export declare type Step = DescriptionProps & LabelProps & StepCommonProps;
 /**
  * @title Блок шаги
  */
@@ -41,3 +42,4 @@ export declare type StepsBlockContent = HeadlineCommonProps & {
     size?: SizeVersion;
     version?: BlockVersion;
 };
+export {};

package/lib/components/Tabs/Tabs.js

@@ -1,14 +1,14 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../../EventBus/EventBus.js';
+import { defaultEventBus } from '../../EventBus/defaultEventBus.js';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
 import { renderTab } from './renderTab.js';
 import { ScrollableTabs } from './ScrollableTabs.js';
 export const Tabs = JSX((props) => {
     const { className = '', tabs, showCounter, isSticky, tabsMode, ...rest } = props;
     const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
-    useEffect(() => EventBus.inst.subscribe('tab', (event) => {
+    useEffect(() => defaultEventBus.subscribe('tab', (event) => {
         const tab = tabs?.find(checkTab(event));
         if (event.type === 'link' && tab) {
             setCurrentTab(tab);
@@ -16,11 +16,11 @@ export const Tabs = JSX((props) => {
         return [];
     }), [tabs]);
     useEffect(() => currentTab?.type === 'group'
-        ? EventBus.inst.subject('tab', { type: currentTab.type, label: currentTab.ref })
+        ? defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref })
         : undefined, [currentTab]);
     const handleClick = useCallback((selectedTab) => {
         if (selectedTab?.type === 'group') {
-            EventBus.inst.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
+            defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
         }
         setCurrentTab(selectedTab);
     }, []);

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

@@ -1 +1 @@
-{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/components/Tabs/Tabs.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUlD,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAiB,CAAC,KAAK,EAAE,EAAE;IAChD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEzE,SAAS,CACP,GAAG,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,EAAE;YAChC,aAAa,CAAC,GAAG,CAAC,CAAC;SACpB;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EACJ,CAAC,IAAI,CAAC,CACP,CAAC;IAEF,SAAS,CACP,GAAG,EAAE,CACH,UAAU,EAAE,IAAI,KAAK,OAAO;QAC1B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC;QAChF,CAAC,CAAC,SAAS,EACf,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,WAAoB,EAAE,EAAE;QACvD,IAAI,WAAW,EAAE,IAAI,KAAK,OAAO,EAAE;YACjC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC;SAC/E;QACD,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,YAAY,IACX,SAAS,EAAE,2CACT,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACpC,IAAI,SAAS,EAAE,EACf,IAAI,EAAC,SAAS,KACV,IAAI,YAEP,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,CAC3B,KAAC,cAAc,IACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,KACpB,IAAI,GACR,CACH,CAAC,CAAC,CAAC,CACF,IAAI,EAAE,GAAG,CACP,SAAS,CAAC;YACR,OAAO,EAAE,WAAW;YACpB,UAAU;YACV,WAAW;YACX,GAAG,IAAI;SACR,CAAC,CACH,CACF,GACY,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC"}
+{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/components/Tabs/Tabs.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUlD,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAiB,CAAC,KAAK,EAAE,EAAE;IAChD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEzE,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,EAAE;YAChC,aAAa,CAAC,GAAG,CAAC,CAAC;SACpB;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EACJ,CAAC,IAAI,CAAC,CACP,CAAC;IAEF,SAAS,CACP,GAAG,EAAE,CACH,UAAU,EAAE,IAAI,KAAK,OAAO;QAC1B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC;QAClF,CAAC,CAAC,SAAS,EACf,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,WAAoB,EAAE,EAAE;QACvD,IAAI,WAAW,EAAE,IAAI,KAAK,OAAO,EAAE;YACjC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC;SACjF;QACD,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,YAAY,IACX,SAAS,EAAE,2CACT,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACpC,IAAI,SAAS,EAAE,EACf,IAAI,EAAC,SAAS,KACV,IAAI,YAEP,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,CAC3B,KAAC,cAAc,IACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,KACpB,IAAI,GACR,CACH,CAAC,CAAC,CAAC,CACF,IAAI,EAAE,GAAG,CACP,SAAS,CAAC;YACR,OAAO,EAAE,WAAW;YACpB,UAAU;YACV,WAAW;YACX,GAAG,IAAI;SACR,CAAC,CACH,CACF,GACY,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC"}

package/lib/components/TextBlock/TextBlock.js

@@ -3,15 +3,16 @@ import { JSX } from '@redneckz/uni-jsx';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
 import { Img } from '../../ui-kit/Img/Img.js';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph.js';
+import { RichText } from '../../ui-kit/RichText/RichText.js';
 import { Text } from '../../ui-kit/Text/Text.js';
 const textBlockBack = {
     primary: 'bg-white',
     secondary: 'bg-primary-main',
     'secondary-light': 'bg-primary-main/10',
 };
-export const TextBlock = JSX(({ className = '', title, description, blockVersion = 'primary', iconVersion, image, ...rest }) => {
+export const TextBlock = JSX(({ className = '', title, description, blockVersion = 'primary', iconVersion, image, __html, ...rest }) => {
     const isSecondaryBlock = blockVersion === 'secondary';
-    return (_jsxs(BlockWrapper, { className: `px-9 py-4 flex gap-3 ${textBlockBack[blockVersion]} ${className}`, ...rest, children: [iconVersion === 'small' ? (_jsx("div", { className: "mt-1", children: renderIcon(isSecondaryBlock) })) : null, iconVersion === 'big' ? renderImage(image) : null, _jsxs("div", { children: [title ? renderTitle(title, isSecondaryBlock) : null, description ? (_jsx("div", { className: "mt-1", children: renderDescription(description, isSecondaryBlock) })) : null] })] }));
+    return (_jsxs(BlockWrapper, { className: `px-9 py-4 flex gap-3 ${textBlockBack[blockVersion]} ${className}`, ...rest, children: [iconVersion === 'small' ? (_jsx("div", { className: "mt-1", children: renderIcon(isSecondaryBlock) })) : null, iconVersion === 'big' ? renderImage(image) : null, _jsxs("div", { children: [title ? renderTitle(title, isSecondaryBlock) : null, description ? (_jsx("div", { className: "mt-1", children: renderDescription(description, isSecondaryBlock) })) : null, __html ? _jsx(RichText, { __html: __html }) : null] })] }));
 });
 const renderIcon = (isSecondaryBlock) => (_jsx("div", { className: `rounded-full h-4 w-4 text-center text-xs-light ${isSecondaryBlock ? 'bg-white text-primary-main' : 'bg-primary-main text-white'}`, children: "i" }));
 const renderImage = (image) => (image?.src ? _jsx(Img, { image: image }) : null);

package/lib/components/TextBlock/TextBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextBlock.js","sourceRoot":"","sources":["../../../src/components/TextBlock/TextBlock.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAK9C,MAAM,aAAa,GAAqC;IACtD,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,oBAAoB;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAC1B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,KAAK,EACL,WAAW,EACX,YAAY,GAAG,SAAS,EACxB,WAAW,EACX,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,gBAAgB,GAAG,YAAY,KAAK,WAAW,CAAC;IAEtD,OAAO,CACL,MAAC,YAAY,IACX,SAAS,EAAE,wBAAwB,aAAa,CAAC,YAAY,CAAC,IAAI,SAAS,EAAE,KACzE,IAAI,aAEP,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,CACzB,cAAK,SAAS,EAAC,MAAM,YAAE,UAAU,CAAC,gBAAgB,CAAC,GAAO,CAC3D,CAAC,CAAC,CAAC,IAAI,EACP,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAClD,0BACG,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EACnD,WAAW,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,MAAM,YAAE,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAO,CAC/E,CAAC,CAAC,CAAC,IAAI,IACJ,IACO,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,gBAAyB,EAAE,EAAE,CAAC,CAChD,cACE,SAAS,EAAE,kDACT,gBAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,4BACpD,EAAE,kBAGE,CACP,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,KAAC,GAAG,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAErF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,gBAAyB,EAAE,EAAE,CAAC,CAChE,KAAC,IAAI,IACH,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,aAAa,EAClB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAmB,YAE3D,KAAK,GACD,CACR,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAE,gBAAyB,EAAE,EAAE,CAAC,CAC5E,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,qBAAqB,YACpF,WAAW,GACF,CACb,CAAC"}
+{"version":3,"file":"TextBlock.js","sourceRoot":"","sources":["../../../src/components/TextBlock/TextBlock.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAK9C,MAAM,aAAa,GAAqC;IACtD,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,iBAAiB;IAC5B,iBAAiB,EAAE,oBAAoB;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAC1B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,KAAK,EACL,WAAW,EACX,YAAY,GAAG,SAAS,EACxB,WAAW,EACX,KAAK,EACL,MAAM,EACN,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,gBAAgB,GAAG,YAAY,KAAK,WAAW,CAAC;IAEtD,OAAO,CACL,MAAC,YAAY,IACX,SAAS,EAAE,wBAAwB,aAAa,CAAC,YAAY,CAAC,IAAI,SAAS,EAAE,KACzE,IAAI,aAEP,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,CACzB,cAAK,SAAS,EAAC,MAAM,YAAE,UAAU,CAAC,gBAAgB,CAAC,GAAO,CAC3D,CAAC,CAAC,CAAC,IAAI,EACP,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAClD,0BACG,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EACnD,WAAW,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAC,MAAM,YAAE,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAO,CAC/E,CAAC,CAAC,CAAC,IAAI,EACP,MAAM,CAAC,CAAC,CAAC,KAAC,QAAQ,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAC,CAAC,IAAI,IACzC,IACO,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,gBAAyB,EAAE,EAAE,CAAC,CAChD,cACE,SAAS,EAAE,kDACT,gBAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,4BACpD,EAAE,kBAGE,CACP,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,KAAC,GAAG,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAErF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,gBAAyB,EAAE,EAAE,CAAC,CAChE,KAAC,IAAI,IACH,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,aAAa,EAClB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAmB,YAE3D,KAAK,GACD,CACR,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAE,gBAAyB,EAAE,EAAE,CAAC,CAC5E,KAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,qBAAqB,YACpF,WAAW,GACF,CACb,CAAC"}

package/lib/components/TextBlock/TextBlockContent.d.ts

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { Picture } from '../../model/Picture';
+import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 /**
  * @title Цвет блока
  * @enumNames ["Основная", "Второстепенная", "Второстепенная прозрачная"]
@@ -13,7 +14,7 @@ export declare type TextBlockIconVersion = 'none' | 'small' | 'big';
 /**
  * @title Текстовый блок
  */
-export declare type TextBlockContent = HeadlineCommonProps & {
+export declare type TextBlockContent = HeadlineCommonProps & RichTextProps & {
     iconVersion?: TextBlockIconVersion;
     image?: Picture;
     blockVersion?: TextBlockVersion;

package/lib/hooks/useLink.js

@@ -1,11 +1,10 @@
 import { projectSettings } from '../ProjectSettings.js';
-import { useBlockRouter } from '../services/BlockRouter/useBlockRouter.js';
+import { gotoBlock } from '../services/BlockRouter/BlockRouter.js';
 import { isHash, isLocalURL, joinPath } from '../utils/url.js';
 import { handlerDecorator } from './handlerDecorator.js';
 import { useRouter } from './useRouter.js';
 export function useLink(isRemote) {
     const router = useRouter();
-    const blockRouter = useBlockRouter();
     return (props) => ({
         ...props,
         href: adjustHref(props.href),
@@ -28,7 +27,7 @@ export function useLink(isRemote) {
             // Client routing
             ev?.preventDefault();
             if (isHash(href)) {
-                blockRouter.goto(href);
+                gotoBlock(router, href);
             }
             else if (href) {
                 router.push(href);

package/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,IAAwB;QAC1C,MAAM,gBAAgB,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5D,OAAO,eAAe,CAAC,SAAS,IAAI,IAAI,IAAI,gBAAgB;YAC1D,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAED,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,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM,IAAI,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,IAAwB;QAC1C,MAAM,gBAAgB,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5D,OAAO,eAAe,CAAC,SAAS,IAAI,IAAI,IAAI,gBAAgB;YAC1D,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAED,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,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACzB;iBAAM,IAAI,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/hooks/useRouter.d.ts

@@ -1,13 +1,17 @@
+interface RouterOptions {
+    scroll?: boolean;
+}
 export interface Router {
     pathname: string;
     query: Record<string, string | string[] | undefined>;
     href?: string;
     basePath?: string;
-    push: (url: string) => void;
-    replace: (url: string) => void;
+    push: (url: string, as?: string, options?: RouterOptions) => void;
+    replace: (url: string, as?: string, options?: RouterOptions) => void;
 }
 export declare function useRouter(): Router;
 export declare namespace useRouter {
     var _impl: () => Router;
     var setup: (impl: () => Router) => void;
 }
+export {};

package/lib/hooks/useRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.js","sourceRoot":"","sources":["../../src/hooks/useRouter.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,SAAS;IACvB,OAAO,SAAS,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,CAAC,KAAK,GAAG,GAAW,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,IAAI,GAAG;IACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,GAAG;IAC9C,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,GAAG,EAAE;QACT,aAAa;IACf,CAAC;IACD,OAAO,EAAE,GAAG,EAAE;QACZ,aAAa;IACf,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,GAAG,CAAC,IAAkB,EAAE,EAAE;IACvC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;AACzB,CAAC,CAAC"}
+{"version":3,"file":"useRouter.js","sourceRoot":"","sources":["../../src/hooks/useRouter.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,SAAS;IACvB,OAAO,SAAS,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,CAAC,KAAK,GAAG,GAAW,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,IAAI,GAAG;IACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,GAAG;IAC9C,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,GAAG,EAAE;QACT,aAAa;IACf,CAAC;IACD,OAAO,EAAE,GAAG,EAAE;QACZ,aAAa;IACf,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,GAAG,CAAC,IAAkB,EAAE,EAAE;IACvC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;AACzB,CAAC,CAAC"}

package/lib/model/DefaultListItemType.d.ts

@@ -0,0 +1,4 @@
+export interface DefaultListItemType {
+    /** @default default */
+    type: 'default';
+}

package/lib/model/DefaultListItemType.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=DefaultListItemType.js.map

package/lib/model/DefaultListItemType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DefaultListItemType.js","sourceRoot":"","sources":["../../src/model/DefaultListItemType.ts"],"names":[],"mappings":""}

package/lib/model/RichTextItem.d.ts

@@ -0,0 +1,8 @@
+import type { RichTextProps } from '../ui-kit/RichText/RichTextProps';
+/**
+ * @title Форматированный текст
+ */
+export interface RichTextItem extends RichTextProps {
+    /** @default rte */
+    type: 'rte';
+}

package/lib/model/RichTextItem.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RichTextItem.js.map

package/lib/model/RichTextItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RichTextItem.js","sourceRoot":"","sources":["../../src/model/RichTextItem.ts"],"names":[],"mappings":""}

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

@@ -1,23 +1,4 @@
-import { EventBus } from '../../EventBus/EventBus';
+import type { Router } from '../../hooks/useRouter';
 import type { BlockDef } from '../../model/ContentPageDef';
-export interface GotoAnchorEvent {
-    anchor: string;
-}
-export interface BlockIntersectionEvent {
-    block: BlockDef;
-    intersection: IntersectionObserverEntry;
-}
-interface EventMap {
-    goto: GotoAnchorEvent;
-    intersection: BlockIntersectionEvent;
-}
-export declare class BlockRouter {
-    static readonly inst: BlockRouter;
-    readonly eventBus: EventBus<EventMap>;
-    constructor();
-    goto(rawAnchor?: string): void;
-    push(rawAnchor: string): void;
-    replace(rawAnchor: string): void;
-    reset(): void;
-}
-export {};
+export declare function gotoBlock(router: Router, anchor?: string): void;
+export declare function trackBlock(router: Router, block?: BlockDef): void;

package/lib/services/BlockRouter/BlockRouter.js

@@ -1,30 +1,10 @@
-import { EventBus } from '../../EventBus/EventBus.js';
-const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '') || '';
-const getURLWithAnchor = (rawAnchor) => `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
-export class BlockRouter {
-    static inst = new BlockRouter();
-    eventBus = new EventBus();
-    constructor() {
-        const anchor = normalizeAnchor(globalThis.location?.hash);
-        if (anchor) {
-            this.eventBus.subject('goto', { anchor });
-        }
-    }
-    goto(rawAnchor) {
-        const anchor = normalizeAnchor(rawAnchor);
-        if (anchor) {
-            this.push(anchor);
-            this.eventBus.fire('goto', { anchor });
-        }
-    }
-    push(rawAnchor) {
-        globalThis.history?.pushState(null, '', getURLWithAnchor(rawAnchor));
-    }
-    replace(rawAnchor) {
-        globalThis.history?.replaceState(null, '', getURLWithAnchor(rawAnchor));
-    }
-    reset() {
-        globalThis.history?.replaceState(null, '', getURLWithAnchor());
-    }
+const normalizeAnchor = (anchor) => anchor?.replace('#', '') || '';
+export function gotoBlock(router, anchor) {
+    router.replace(`#${normalizeAnchor(anchor)}`);
+}
+export function trackBlock(router, block) {
+    router.replace(`#${normalizeAnchor(block?.anchor)}`, undefined, {
+        scroll: false,
+    });
 }
 //# sourceMappingURL=BlockRouter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAClF,MAAM,gBAAgB,GAAG,CAAC,SAAkB,EAAE,EAAE,CAC9C,GAAG,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;AAEnE,MAAM,OAAO,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAkB;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACjE,CAAC"}
+{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAGA,MAAM,eAAe,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAE5E,MAAM,UAAU,SAAS,CAAC,MAAc,EAAE,MAAe;IACvD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,KAAgB;IACzD,MAAM,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC"}

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

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

package/lib/services/BlockRouter/blockRouterEventBus.js

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

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

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

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

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

package/lib/services/BlockRouter/useBlockIntersectionObserver.js

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

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

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

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

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

package/lib/services/BlockRouter/useBlockRouterProvider.js

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

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

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

package/lib/ui-kit/BenefitItem/BenefitItemProps.d.ts

@@ -1,8 +1,9 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { DefaultListItemType } from '../../model/DefaultListItemType';
 import type { DescriptionProps, LabelProps } from '../../model/HeadlineType';
 import type { IconVersion } from '../../model/IconVersion';
 import type { IconProps } from '../../model/Picture';
-import { RichTextProps } from '../RichText/RichTextProps';
+import type { RichTextItem } from '../../model/RichTextItem';
 export interface BenefitItemCommonProps {
     /** @hidden */
     benefitsVersion?: IconVersion;
@@ -15,24 +16,14 @@ export declare type BenefitItemProps = DescriptionProps & LabelProps & IconProps
 /**
  * @title Стандартный бенефит
  */
-declare type DefaultBenefit = BenefitItemProps & {
-    /** @default default */
-    type: 'default';
-};
-/**
- * @title Форматированный текст
- */
-declare type RichText = RichTextProps & {
-    /** @default rte */
-    type: 'rte';
-};
+declare type DefaultBenefit = BenefitItemProps & DefaultListItemType;
 /**
  * @title Преимущество
  * @default{
  *  "type": "default"
  * }
  */
-export declare type ComplexBenefitProps = DefaultBenefit | RichText;
+export declare type ComplexBenefitProps = DefaultBenefit | RichTextItem;
 /**
  * @title Преимущество
  */

package/lib/ui-kit/BlockWrapper.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../EventBus/EventBus.js';
+import { defaultEventBus } from '../EventBus/defaultEventBus.js';
 import { useBlockIntersectionObserver } from '../services/BlockRouter/useBlockIntersectionObserver.js';
 import { style } from '../utils/style.js';
 export const blockStyles = {
@@ -15,7 +15,7 @@ export const BlockWrapper = JSX(({ className = '', version = 'primary', block, t
     const Tag = tag;
     const ref = useBlockIntersectionObserver(block);
     const [isVisible, setVisible] = useState(true);
-    useEffect(() => EventBus.inst.subscribe('tab', (event) => {
+    useEffect(() => defaultEventBus.subscribe('tab', (event) => {
         if (event.type === 'group') {
             const hasSettings = block?.labels?.length || block?.anchor;
             setVisible(event.label ? !hasSettings || Boolean(block?.labels?.includes(event.label)) : true);

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

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CACP,GAAG,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,WAAW,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC;YAC3D,UAAU,CACR,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACnF,CAAC;SACH;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAOvC,MAAM,CAAC,MAAM,WAAW,GAAiC;IACvD,OAAO,EAAE,4BAA4B;IACrC,SAAS,EAAE,4BAA4B;IACvC,IAAI,EAAE,mCAAmC;IACzC,WAAW,EAAE,kCAAkC;IAC/C,EAAE,EAAE,EAAE;CACP,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IAClF,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,GAAG,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,WAAW,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC;YAC3D,UAAU,CACR,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACnF,CAAC;SACH;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,EACJ,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,KAAC,GAAG,IACF,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACL,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC"}

package/mobile/bundle/EventBus/EventBus.d.ts

@@ -1,7 +1,4 @@
-import type { EventMap } from './EventMap';
-export declare type BaseEventMap = Record<string, any>;
-export declare class EventBus<EM extends BaseEventMap> {
-    static readonly inst: EventBus<EventMap>;
+export declare class EventBus<EM extends Record<string, any>> {
     private subscribers;
     private subjectsStateMap;
     subscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void): () => void;

package/mobile/bundle/EventBus/defaultEventBus.d.ts

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