@redneckz/wildless-cms-uni-blocks 0.14.162 → 0.14.164

package/mobile/src/model/Picture.ts

@@ -4,31 +4,6 @@ import { type ImageSize } from './ImageSize';
 
 export type ImgFormats = 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
 
-/**
- * @title Позиционирование
- * @enumNames [
- *    "Сверху слева",
- *    "Сверху по центру",
- *    "Сверху справа",
- *    "Посередине слева",
- *    "Посередине по центру",
- *    "Посередине справа",
- *    "Снизу слева",
- *    "Снизу по центру",
- *    "Снизу справа"
- *  ]
- */
-export type ImgAlignment =
-  | 'northwest'
-  | 'north'
-  | 'northeast'
-  | 'west'
-  | 'center'
-  | 'east'
-  | 'southwest'
-  | 'south'
-  | 'southeast';
-
 export interface Img {
   /** @title Картинка */
   src?: string;
@@ -45,7 +20,6 @@ export interface Img {
 export type MediaQuery = 1919 | 1439 | 1279;
 
 export interface ImgSource {
-  alignment?: ImgAlignment;
   /** @title Иконка */
   icon?: IconName;
   /** @title Версия иконки */

package/mobile/src/ui-kit/BaseFiltration/BaseFiltrationInner.tsx

@@ -3,7 +3,7 @@ import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import { AdTile } from '../../components/AdTile/AdTile';
 import { type IconName } from '../../icons/IconName';
 import { type BlockDef } from '../../model/ContentPageDef';
-import { type UniBlockProps } from '../../model/JSXBlock';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { isOdd } from '../../utils/isOdd';
 import { style } from '../../utils/style';
 import { DefaultFoldButton } from '../Foldable/DefaultFoldButton';

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

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Headline } from '../../components/Headline/Headline';
 import { type HeadlineVersion } from '../../model/HeadlineType';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { type VNode } from '../../model/VNode';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { BenefitsList } from '../BenefitsList/BenefitsList';
 import { Img } from '../Img/Img';

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

@@ -4,8 +4,8 @@ import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { renderBackwardButton } from '../../components/ProductBlock/renderBackwardButton';
 import { useRouter } from '../../hooks/useRouter';
 import { type Align } from '../../model/Align';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { type VNode } from '../../model/VNode';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { type PreventableEvent } from '../PreventableEvent';
 

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

@@ -3,7 +3,7 @@ import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
 import { useRouter } from '../hooks/useRouter';
 import { type BlockVersion } from '../model/BlockVersion';
-import { type UniBlockProps } from '../model/JSXBlock';
+import { type UniBlockProps } from '../UniBlock/UniBlockProps';
 import { style } from '../utils/style';
 
 interface BlockWrapperProps extends UniBlockProps {

package/mobile/src/ui-kit/DialogManager/isDialogOpen.ts

@@ -1,4 +1,4 @@
 import { type DialogOpenAction } from './DialogAction';
 
-export const isDialogOpen = (id: string, dialogs: DialogOpenAction[]) =>
-  dialogs.find((item) => item.id === id, id);
+export const isDialogOpen = (id: string, dialogs: DialogOpenAction[]): boolean =>
+  Boolean(dialogs.find((item) => item.id === id, id));

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type ColorPalette } from '../../model/ContentPageDef';
+import { type ColorPalette } from '../../model/ContentPageBase';
 import { style } from '../../utils/style';
 import { type IconName } from '../Icon/IconProps';
 import { Img } from '../Img/Img';

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

@@ -1,9 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type ForeignOfficeProps } from '../../data/SitemapData';
 import { useLocation } from '../../hooks/useLocation';
 import { useRegions, type Region } from '../../hooks/useRegions';
-import { type UniBlockProps } from '../../model/JSXBlock';
-import { useSitemap } from '../../services/sitemap/useSitemap';
 import { groupBy } from '../../utils/groupBy';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance';
 import { Dialog } from '../DialogManager/Dialog';
@@ -16,8 +15,12 @@ import { SearchBar } from './SearchBar';
 
 const SEARCH_TERM_MIN_LENGTH = 3;
 
-export const LocationDialog = JSX<UniBlockProps>(() => {
-  const { defaultLocation, foreignOffices } = useSitemap();
+export interface LocationDialogProps {
+  foreignOffices?: ForeignOfficeProps[];
+  defaultLocation?: string;
+}
+
+export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, defaultLocation }) => {
   const [currentLocation, selectCurrentLocation] = useLocation(defaultLocation);
 
   const [query, setQuery] = useState('');

package/mobile/src/ui-kit/LocationDialog/renderForeignOffices.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ForeignOfficeProps } from '../../data/SitemapData';
 import { useLink } from '../../hooks/useLink';
-import { type ForeignOfficeProps } from '../../services/sitemap/SitemapData';
 import { Img } from '../Img/Img';
 import { Text } from '../Text/Text';
 

package/mobile/src/ui-kit/LocationDialog/useLocationDialog.tsx

@@ -1,11 +1,11 @@
 import { useDialogManager, type DialogOptions } from '../DialogManager/useDialogManager';
-import { LocationDialog } from './LocationDialog';
+import { LocationDialog, type LocationDialogProps } from './LocationDialog';
 
-export const useLocationDialog = () => {
+export const useLocationDialog = (props: LocationDialogProps) => {
   const { open, close } = useDialogManager();
 
   return {
-    open: (options: DialogOptions = {}) => open(<LocationDialog />, options),
+    open: (options: DialogOptions = {}) => open(<LocationDialog {...props} />, options),
     close,
   };
 };

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

@@ -1,30 +1,31 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type SitemapData } from '../../data/SitemapData';
 import { style } from '../../utils/style';
 import { CloseButton } from '../DialogManager/CloseButton';
 import { SearchInput } from '../SearchDialog/SearchInput';
 import { useSearchDialog } from '../SearchDialog/useSearchDialog';
 
-interface SearchBarProps {
+interface SearchBarProps extends SitemapData {
   className?: string;
 }
 
 const MIN_QUERY_LEN = 3;
 
-export const SearchBar = JSX<SearchBarProps>(({ className }) => {
+export const SearchBar = JSX<SearchBarProps>(({ className, ...rest }) => {
   const [value, setValue] = useState('');
 
   const resetQueryOnDialogClose = useCallback(() => setValue(''), []);
-  const { open } = useSearchDialog();
+  const searchDialog = useSearchDialog(rest);
 
   const handleInitialInputChange = useCallback(
     (_: string) => {
       setValue(_);
       if (isQueryLongEnough(_)) {
-        open({ initialQuery: _ }, { onClose: resetQueryOnDialogClose });
+        searchDialog.open({ initialQuery: _ }, { onClose: resetQueryOnDialogClose });
       }
     },
-    [resetQueryOnDialogClose],
+    [resetQueryOnDialogClose, searchDialog],
   );
 
   return (

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

@@ -1,9 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { type TopMenuItemProps } from '../../data/SitemapData';
 import { type LinkProps } from '../../model/LinkProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
-import { type TopMenuItemProps } from '../../services/sitemap/SitemapData';
-import { useSitemap } from '../../services/sitemap/useSitemap';
 import { joinPath } from '../../utils/url';
 import { zip } from '../../utils/zip';
 import { Dialog } from '../DialogManager/Dialog';
@@ -12,11 +11,10 @@ import { SearchInput } from './SearchInput';
 
 export interface SearchDialogProps {
   initialQuery?: string;
+  topItems?: TopMenuItemProps[];
 }
 
-export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
-  const { topItems } = useSitemap();
-
+export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery, topItems }) => {
   const basePathList = useMemo(() => topItems?.map((_) => _.href || '/'), [topItems]);
   const [searchResult, searchInputProps] = useSearch({
     basePathList,
@@ -28,8 +26,6 @@ export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
     [topItems, searchResult],
   );
 
-  useEffect(() => printSearchItems(searchItems), [searchItems]); // Temp
-
   return (
     <Dialog head={<SearchInput autoFocus={true} {...searchInputProps} />}>
       <Sitemap topItems={searchItems} />
@@ -48,12 +44,3 @@ const combineTopItemsAndSearchResult =
           ),
         }))
       : [];
-
-// Temp
-function printSearchItems(topItems: TopMenuItemProps[]) {
-  for (const _ of topItems.filter(({ items }) => items?.length)) {
-    console.group(_.text);
-    console.table(_.items, ['text', 'href']);
-    console.groupEnd();
-  }
-}

package/mobile/src/ui-kit/SearchDialog/useSearchDialog.tsx

@@ -1,12 +1,12 @@
 import { useDialogManager, type DialogOptions } from '../DialogManager/useDialogManager';
 import { SearchDialog, type SearchDialogProps } from './SearchDialog';
 
-export const useSearchDialog = () => {
+export const useSearchDialog = (initialProps: SearchDialogProps = {}) => {
   const { open, close } = useDialogManager();
 
   return {
     open: (props: SearchDialogProps = {}, options: DialogOptions = {}) =>
-      open(<SearchDialog {...props} />, options),
+      open(<SearchDialog {...initialProps} {...props} />, options),
     close,
   };
 };

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

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type TopMenuItemProps } from '../../data/SitemapData';
 import { useLink } from '../../hooks/useLink';
 import { type LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import { type TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { appendSlash } from '../../utils/appendSlash';
 import { style } from '../../utils/style';
 

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { type VNode } from '../../model/VNode';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 
 interface TextWithIconProps extends UniBlockProps {

package/mobile/src/wlc.json

@@ -1,7 +1,5 @@
 {
   "PROD_BRANCH": "master",
-  "FORCED_DRAFT_FLOW": false,
   "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
-  "SITEMAP": "sayt-rshb",
   "CHAT_BOT": "personal"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.162",
+  "version": "0.14.164",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -136,7 +136,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@redneckz/json-ref": "^0.0.2",
+    "@redneckz/json-ref": "^0.0.5",
     "@redneckz/uni-jsx": "^2.6.2",
     "@tailwindcss/container-queries": "^0.1.0",
     "@types/json-schema": "^7.0.11",

package/src/BlockRenderer/renderBlock.tsx

@@ -1,6 +1,6 @@
 import { type BlockAncestors } from '../model/BlockDecorator';
 import { type BlockDef } from '../model/ContentPageDef';
-import { type UniBlockProps } from '../model/JSXBlock';
+import { type UniBlockProps } from '../UniBlock/UniBlockProps';
 import { style } from '../utils/style';
 import { type BlockRendererOptions } from './BlockRendererOptions';
 import { defaultBlockDecorator } from './defaultBlockDecorator';

package/src/BlockRenderer/renderChildren.ts

@@ -1,5 +1,5 @@
-import { type UniBlockProps } from '../model/JSXBlock';
 import { type VNode } from '../model/VNode';
+import { type UniBlockProps } from '../UniBlock/UniBlockProps';
 import { type ExtraProps } from './renderBlock';
 import { renderBlocksList, type ChildRenderProps } from './renderBlockList';
 

package/src/ProjectSettings.ts

@@ -1,15 +1,7 @@
 import { appendSlash } from './utils/appendSlash';
 
 export interface ProjectSettings {
-  TEST_BRANCH?: string;
-  RC_BRANCH?: string;
-  PROD_BRANCH?: string;
-  FORCED_DRAFT_FLOW?: boolean;
   ASSIST_PROJECT_ID?: string;
-  SITEMAP?: string;
-  STICKY_MOBILE_MENU?: string;
-  FOOTER?: string;
-  PORTAL_DATA?: string;
   CHAT_BOT?: string; // "personal" or "business"
   CDN?: string; // Should ends with "/"
   BASE_PATH?: string; // Should ends with "/"
@@ -17,55 +9,24 @@ export interface ProjectSettings {
   YANDEX_METRIKA_ID?: string;
 }
 
-const DEFAULT_PROJECT_SETTINGS: ProjectSettings = { PROD_BRANCH: 'master' };
+const URI_KEYS: Array<keyof ProjectSettings> = ['CDN', 'BASE_PATH'];
 
-export const projectSettings = new (class implements ProjectSettings {
-  _: ProjectSettings = DEFAULT_PROJECT_SETTINGS;
+export const projectSettings: ProjectSettings & {
+  _: ProjectSettings;
+  setup: (_: ProjectSettings) => void;
+} = new Proxy(
+  {
+    _: {} as ProjectSettings,
 
-  setup(_: ProjectSettings) {
-    this._ = _;
-  }
+    setup(_: ProjectSettings) {
+      this._ = _;
+    },
+  },
+  {
+    get(target, p) {
+      const result = target._[p] || target[p];
 
-  get TEST_BRANCH() {
-    return this._.TEST_BRANCH;
-  }
-  get RC_BRANCH() {
-    return this._.RC_BRANCH;
-  }
-  get PROD_BRANCH() {
-    return this._.PROD_BRANCH || DEFAULT_PROJECT_SETTINGS.PROD_BRANCH;
-  }
-  get FORCED_DRAFT_FLOW() {
-    return this._.FORCED_DRAFT_FLOW;
-  }
-  get ASSIST_PROJECT_ID() {
-    return this._.ASSIST_PROJECT_ID;
-  }
-  get SITEMAP() {
-    return this._.SITEMAP;
-  }
-  get STICKY_MOBILE_MENU() {
-    return this._.STICKY_MOBILE_MENU;
-  }
-  get FOOTER() {
-    return this._.FOOTER;
-  }
-  get PORTAL_DATA() {
-    return this._.PORTAL_DATA;
-  }
-  get CHAT_BOT() {
-    return this._.CHAT_BOT;
-  }
-  get CDN() {
-    return appendSlash(this._.CDN);
-  }
-  get BASE_PATH() {
-    return appendSlash(this._.BASE_PATH);
-  }
-  get YANDEX_MAP_API_KEY() {
-    return this._.YANDEX_MAP_API_KEY;
-  }
-  get YANDEX_METRIKA_ID() {
-    return this._.YANDEX_METRIKA_ID;
-  }
-})();
+      return URI_KEYS.includes(p as keyof ProjectSettings) ? appendSlash(result as string) : result;
+    },
+  },
+);

package/src/UniBlock/UniBlock.tsx

@@ -0,0 +1,34 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+import { JSX, type UNIComponent } from '@redneckz/uni-jsx';
+import { type JSONSchema7Definition } from 'json-schema';
+import { useJSONRef } from '../hooks/useJSONRef/useJSONRef';
+import { type SlotName } from '../model/BlockDecorator';
+import { type BlockDef } from '../model/ContentPageDef';
+import { type VNode } from '../model/VNode';
+import { extractContent } from './extractContent';
+import { type UniBlockProps } from './UniBlockProps';
+
+export interface UniBlockMeta<Props extends UniBlockProps = UniBlockProps> {
+  displayName?: string;
+  childrenTypes?: string[] | { include?: string[]; exclude?: string[] };
+  childSchema?: (content: BlockDef['content']) => Record<string, JSONSchema7Definition>;
+  slots?: (props: Props) => SlotName[];
+}
+
+export type UniBlockComponent<Props extends UniBlockProps = UniBlockProps> = UniBlockMeta<Props> &
+  UNIComponent<Props, any, VNode | VNode[]>;
+
+export function UniBlock<Props extends UniBlockProps = UniBlockProps>(
+  InputComponent: UniBlockComponent<Props>,
+  meta: UniBlockMeta<Props> = {},
+): UniBlockComponent<Props> {
+  const OutputComponent = JSX<Props>((props) => {
+    const content = useJSONRef(extractContent(props), props.options?.page?.fallback);
+
+    return <InputComponent {...props} {...content} />;
+  });
+
+  Object.assign(OutputComponent, meta);
+
+  return OutputComponent;
+}

package/src/{model/JSXBlock.ts → UniBlock/UniBlockProps.ts}

@@ -1,10 +1,6 @@
-import { type UNIComponent } from '@redneckz/uni-jsx';
-import { type JSONSchema7Definition } from 'json-schema';
 import { type BlockRendererOptions } from '../BlockRenderer/BlockRendererOptions';
-import { type SlotName } from './BlockDecorator';
-import { type BlockVersion } from './BlockVersion';
-import { type BlockDef } from './ContentPageDef';
-import { type VNode } from './VNode';
+import { type BlockVersion } from '../model/BlockVersion';
+import { type BlockDef } from '../model/ContentPageDef';
 
 /**
  * @title Внутренний отступ
@@ -29,13 +25,3 @@ export interface UniBlockProps extends UniBlockContent {
   block?: BlockDef;
   options?: BlockRendererOptions;
 }
-
-export type JSXBlock<BlockProps extends UniBlockProps = UniBlockProps> = UNIComponent<
-  BlockProps,
-  any,
-  VNode | VNode[]
-> & {
-  childrenTypes?: string[] | { include?: string[]; exclude?: string[] };
-  childSchema?: (content: BlockDef['content']) => Record<string, JSONSchema7Definition>;
-  slots?: (props: BlockProps) => SlotName[];
-};

package/src/UniBlock/extractContent.ts

@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { type JSONRecord } from '@redneckz/json-ref';
+import { type VNode } from '../model/VNode';
+import { type UniBlockProps } from './UniBlockProps';
+
+export const extractContent = <Props extends UniBlockProps>({
+  block,
+  options,
+  className,
+  defaultPadding,
+  padding,
+  isTheme,
+  version,
+  children,
+  ...content
+}: Props & { children?: VNode }) => content as JSONRecord;

package/src/components/AdTile/AdTile.tsx

@@ -1,14 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type UniBlockProps } from '../../model/JSXBlock';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { ProductBlock } from '../ProductBlock/ProductBlock';
+import { type ProductBlockContent } from '../ProductBlock/ProductBlockContent';
 import { type AdTileContent } from './AdTileContent';
-import { useAdTile } from './useAdTile';
 
 interface AdTileProps extends AdTileContent, UniBlockProps {}
 
+interface AdvertisingTileSourceBook {
+  items?: ProductBlockContent[];
+}
+
 export const AdTile = JSX<AdTileProps>((props) => {
-  const content = useAdTile(props.options?.page?.adSourceBook);
+  const { items } = (props.options?.page?.adSourceBook ?? {}) as AdvertisingTileSourceBook;
+  const tileIndex = useMemo(() => randomNumber(0, items?.length), [items]);
+
+  const content = items?.[tileIndex];
 
   return content ? (
     <ClientOnly>
@@ -16,3 +24,5 @@ export const AdTile = JSX<AdTileProps>((props) => {
     </ClientOnly>
   ) : null;
 });
+
+const randomNumber = (min = 0, max = 0) => Math.floor(Math.random() * (max - min) + min);

package/src/components/AdTile/AdTileContent.ts

@@ -1,4 +1,4 @@
-import { type UniBlockContent } from '../../model/JSXBlock';
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Рекламная плитка

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { LeadServiceAPI } from '../../api/LeadServiceAPI';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import {
   type ApplicationFormBlockDef,
   type ApplicationFormContent,

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -1,7 +1,7 @@
 import { type TitleProps } from '../../model/HeadlineType';
-import { type UniBlockContent } from '../../model/JSXBlock';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type LinkProps } from '../../model/LinkProps';
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Кнопка

package/src/components/ApplicationForm/ApplicationFormUltraPremium.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable max-lines-per-function,max-lines */
-
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { AlignStyles } from '../../model/AlignStyles';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { RoundedIcon } from '../../ui-kit/Icon/RoundedIcon';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { Text } from '../../ui-kit/Text/Text';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type BenefitBlockItemProps, type BenefitsBlockContent } from './BenefitsBlockContent';
 import { defaultIconSize } from './defaultIconSize';
 

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,8 +1,8 @@
 import { type DescriptionProps, type LabelProps, type TitleProps } from '../../model/HeadlineType';
-import { type UniBlockContent } from '../../model/JSXBlock';
 import { type IconProps } from '../../model/Picture';
 import { type IconBgVersion } from '../../ui-kit/Icon/IconProps';
 import { type ListProps } from '../../ui-kit/List/ListContent';
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Преимущество

package/src/components/Blocks.mobile.ts

@@ -35,6 +35,7 @@ import { RichTextBlock } from './RichTextBlock/RichTextBlock';
 import { RollupItem } from './RollupItem/RollupItem';
 import { SafeDepositRental } from './SafeDepositRental/SafeDepositRental';
 import { StepsBlock } from './StepsBlock/StepsBlock';
+import { StickyBottomMenu } from './StickyBottomMenu/StickyBottomMenu';
 import { Tabs } from './Tabs/Tabs';
 import { TabsLayout } from './TabsLayout/TabsLayout';
 import { TariffsTable } from './TariffsTable/TariffsTable';
@@ -78,6 +79,7 @@ export const Blocks: BlocksRegistry = {
   RollupItem,
   SafeDepositRental,
   StepsBlock,
+  StickyBottomMenu,
   Tabs,
   TabsLayout,
   TariffsTable,

package/src/components/Blocks.ts

@@ -40,6 +40,7 @@ import { RichTextBlock } from './RichTextBlock/RichTextBlock';
 import { RollupItem } from './RollupItem/RollupItem';
 import { SafeDepositRental } from './SafeDepositRental/SafeDepositRental';
 import { StepsBlock } from './StepsBlock/StepsBlock';
+import { StickyBottomMenu } from './StickyBottomMenu/StickyBottomMenu';
 import { SwipeListControlBlock } from './SwipeListControlBlock/SwipeListControlBlock';
 import { Tabs } from './Tabs/Tabs';
 import { TabsLayout } from './TabsLayout/TabsLayout';
@@ -90,6 +91,7 @@ export const Blocks: BlocksRegistry = {
   RollupItem,
   SafeDepositRental,
   StepsBlock,
+  StickyBottomMenu,
   SwipeListControlBlock,
   Tabs,
   TabsLayout,

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 import { type BonusBenefitsBlockContent } from './BonusBenefitsBlockContent';

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -3,9 +3,9 @@ import {
   type SubtitleProps,
   type TitleProps,
 } from '../../model/HeadlineType';
-import { type UniBlockContent } from '../../model/JSXBlock';
 import { type IconProps } from '../../model/Picture';
 import { type TextAlign } from '../../ui-kit/Text/TextProps';
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @title Количество элементов в строке