@redneckz/wildless-cms-uni-blocks 0.8.15 → 0.8.17

package/mobile/lib/components/Video/Video.js

@@ -1,8 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { useRouter } from '../../hooks/useRouter.js';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
+import { adjustHref } from '../../utils/adjustHref.js';
 import { style } from '../../utils/style.js';
 import { Headline } from '../Headline/Headline.js';
 import { getPaddings } from './getPaddings.js';
-export const Video = JSX(({ className, title, src, previewImg, ...rest }) => (_jsxs(BlockWrapper, { className: style(getPaddings(className), className), ...rest, children: [_jsx(Headline, { title: title, headlineVersion: "M" }), src ? (_jsx("video", { className: "m-auto w-full object-fill", preload: "metadata", poster: previewImg?.src, style: { maxHeight: 524 }, controls: true, children: _jsx("source", { src: src }) })) : null] })));
+export const Video = JSX(({ className, title, src, previewImg, ...rest }) => {
+    const router = useRouter();
+    return (_jsxs(BlockWrapper, { className: style(getPaddings(className), className), ...rest, children: [_jsx(Headline, { title: title, headlineVersion: "M" }), src ? (_jsx("video", { className: "m-auto w-full object-fill", preload: "metadata", poster: adjustHref(router)(previewImg?.src), style: { maxHeight: 524 }, controls: true, children: _jsx("source", { src: adjustHref(router)(src) }) })) : null] }));
+});
 //# sourceMappingURL=Video.js.map

package/mobile/lib/components/Video/Video.js.map

@@ -1 +1 @@
-{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../../src/components/Video/Video.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CACvF,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,aACzE,KAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,GAAG,GAAG,EAC7C,GAAG,CAAC,CAAC,CAAC,CACL,gBACE,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAC,UAAU,EAClB,MAAM,EAAE,UAAU,EAAE,GAAG,EACvB,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EACzB,QAAQ,kBAER,iBAAQ,GAAG,EAAE,GAAG,GAAI,GACd,CACT,CAAC,CAAC,CAAC,IAAI,IACK,CAChB,CAAC,CAAC"}
+{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../../src/components/Video/Video.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACtF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CACL,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,aACzE,KAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,GAAG,GAAG,EAC7C,GAAG,CAAC,CAAC,CAAC,CACL,gBACE,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAC,UAAU,EAClB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAC3C,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EACzB,QAAQ,kBAER,iBAAQ,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAI,GAClC,CACT,CAAC,CAAC,CAAC,IAAI,IACK,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/hooks/useLink.js

@@ -2,7 +2,7 @@ import { adjustHref } from '../utils/adjustHref.js';
 import { isLocalURL } from '../utils/url.js';
 import { handlerDecorator } from './handlerDecorator.js';
 import { useRouter } from './useRouter.js';
-export function useLink(isRemote) {
+export function useLink(isRemote = false) {
     const router = useRouter();
     return (props) => ({
         ...props,

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

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;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,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAQ,GAAG,KAAK;IACtC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/mobile/lib/model/AlignType.d.ts

@@ -7,3 +7,13 @@
  * ]
  */
 export declare type AlignType = 'left' | 'center' | 'right';
+/**
+ * @title Выравнивание
+ * @enumNames [
+ *    "Во всю ширину",
+ *    "По левому краю",
+ *    "По центру",
+ *    "По правому краю"
+ * ]
+ */
+export declare type AlignTypeWithStretch = 'stretch' | 'left' | 'center' | 'right';

package/mobile/lib/services/sitemap/isTopItemActive.d.ts

@@ -1,3 +1,4 @@
 import type { Router } from '../../hooks/useRouter';
-import { TopMenuItem } from './SitemapProps';
-export declare const isTopItemActive: (router: Router) => (topItem: TopMenuItem) => boolean;
+export declare const isTopItemActive: (router: Router) => ({ href }: {
+    href?: string | undefined;
+}) => boolean;

package/mobile/lib/services/sitemap/isTopItemActive.js

@@ -1,6 +1,4 @@
 import { projectSettings } from '../../ProjectSettings.js';
 import { isHrefActive } from './isHrefActive.js';
-export const isTopItemActive = (router) => (topItem) => projectSettings.BASE_PATH
-    ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
-    : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+export const isTopItemActive = (router) => isHrefActive(projectSettings.BASE_PATH ? { pathname: projectSettings.BASE_PATH } : router);
 //# sourceMappingURL=isTopItemActive.js.map

package/mobile/lib/services/sitemap/isTopItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,OAAoB,EAAW,EAAE,CAChC,eAAe,CAAC,SAAS;IACvB,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC;IAChE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE,CAChD,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC"}

package/mobile/lib/ui-kit/Img/ImgAsPicture.js

@@ -11,9 +11,9 @@ export const ImgAsPicture = JSX(({ className = '', image, imageClassName = '', i
                 ? image.sources
                     .filter((_) => _?.src)
                     .sort(sourcesComparator)
-                    .map(({ src, format, media }, index) => (_jsx("source", { srcSet: adjustSrcset(router, pathPrefix)(src), type: formatToMimeType(format), media: media ? `(max-width: ${media}px)` : '', ...image.size }, `${index}_${src}`)))
+                    .map(({ src, format, media }, index) => (_jsx("source", { srcSet: adjustSrc(router, pathPrefix)(src), type: formatToMimeType(format), media: media ? `(max-width: ${media}px)` : '', ...image.size }, `${index}_${src}`)))
                 : null, image?.src
-                ? renderImg({ ...image, src: adjustSrcset(router, pathPrefix)(image.src) }, imageClassName, isMobile)
+                ? renderImg({ ...image, src: adjustSrc(router, pathPrefix)(image.src) }, imageClassName, isMobile)
                 : null] }));
 });
 const renderImg = (image, imageClassName = '', isMobile = false) => {
@@ -26,12 +26,6 @@ const renderImg = (image, imageClassName = '', isMobile = false) => {
     const imgStyle = isMobile ? 'm-auto' : 'm-0';
     return (_jsx("img", { src: image.src, className: `${imgStyle} ${imageClassName}`, alt: alt, title: title, style: style, ...image.size }));
 };
-const adjustSrcset = (router, pathPrefix) => (srcset) => srcset
-    ?.split(/\s*,\s*/)
-    .map((src) => src.trim())
-    .filter(Boolean)
-    .map((src) => (isURL(src) ? src : joinPath(pathPrefix, src)))
-    .map(adjustHref(router))
-    .join(', ');
+const adjustSrc = (router, pathPrefix) => (src) => src && !isURL(src) ? adjustHref(router)(joinPath(pathPrefix, src)) : src;
 const formatToMimeType = (format) => format ? `image/${String(format)}` : undefined;
 //# sourceMappingURL=ImgAsPicture.js.map

package/mobile/lib/ui-kit/Img/ImgAsPicture.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImgAsPicture.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/ImgAsPicture.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ImgAsPicture.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/ImgAsPicture.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/wlc.json

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

package/mobile/src/BlockRenderer/BlockRendererOptions.ts

@@ -10,4 +10,5 @@ export interface BlockRendererOptions {
   parent?: Slot;
   ancestors?: BlockAncestors;
   className?: string;
+  extraProps?: Record<string, any>;
 }

package/mobile/src/BlockRenderer/renderBlock.tsx

@@ -15,6 +15,7 @@ export function renderBlock(block: BlockDef, options: BlockRendererOptions) {
     blocksRegistry = {},
     ancestors = DEFAULT_ANCESTORS,
     className = '',
+    extraProps = {},
   } = options;
   const { type } = block;
 
@@ -44,6 +45,7 @@ export function renderBlock(block: BlockDef, options: BlockRendererOptions) {
             block={block}
             options={options}
             {...content}
+            {...extraProps}
           />
         ) : null;
       },

package/mobile/src/BlockRenderer/renderBlockList.tsx

@@ -7,7 +7,7 @@ import { renderBlock } from './renderBlock';
 
 export interface BlocksListRendererProps extends BlockRendererOptions {
   slotName?: SlotName;
-  renderChild?: (block: BlockDef, options: BlockRendererOptions) => VNode;
+  renderProps?: (block: BlockDef, options: BlockRendererOptions) => VNode;
 }
 
 const EMPTY_ANCESTORS: BlockAncestors = [];
@@ -18,12 +18,12 @@ export const renderBlocksList = (
     key,
     ancestors = EMPTY_ANCESTORS,
     slotName = DEFAULT_SLOT_NAME,
-    renderChild = renderBlock,
+    renderProps = renderBlock,
     ...options
   }: BlocksListRendererProps,
 ): VNode[] =>
   (blocks || []).map((_: BlockDef, j: number) =>
-    renderChild(_, {
+    renderProps(_, {
       ...options,
       key: `${key ? key : _.type}-${j}`,
       ancestors: options.parent

package/mobile/src/BlockRenderer/renderChildren.ts

@@ -6,20 +6,20 @@ import { renderBlocksList } from './renderBlockList';
 
 interface ChildrenRendererProps extends UniBlockProps {
   children?: VNode;
-  renderChild?: (block: BlockDef, options: BlockRendererOptions) => VNode;
+  renderProps?: (block: BlockDef, options: BlockRendererOptions) => VNode;
 }
 
 export function renderChildren({
   children,
   block,
   options,
-  renderChild,
+  renderProps,
 }: ChildrenRendererProps): VNode[] | null {
   if (children) {
     return children;
   }
 
   return block && options
-    ? renderBlocksList(block.blocks, { ...options, parent: block, renderChild })
+    ? renderBlocksList(block.blocks, { ...options, parent: block, renderProps })
     : null;
 }

package/mobile/src/ProjectSettings.ts

@@ -6,6 +6,7 @@ export interface ProjectSettings {
   ASSIST_PROJECT_ID?: string;
   SITEMAP?: string;
   FOOTER?: string;
+  CHAT_BOT?: string; // "personal" or "business"
   CDN?: string; // Should ends with "/"
   BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
@@ -42,6 +43,9 @@ export const projectSettings = new (class implements ProjectSettings {
   get FOOTER() {
     return this._.FOOTER;
   }
+  get CHAT_BOT() {
+    return this._.CHAT_BOT;
+  }
   get CDN() {
     return appendSlash(this._.CDN);
   }

package/mobile/src/components/Blocks.ts

@@ -3,7 +3,6 @@ import { Accordion } from './Accordion/Accordion';
 import { AccordionItem } from './AccordionItem/AccordionItem';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { Footer } from './Footer/Footer';
-import { Gallery } from './Gallery/Gallery';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { LinkDocs } from './LinkDocs/LinkDocs';
@@ -20,7 +19,6 @@ export const Blocks: BlocksRegistry = {
   AccordionItem,
   ComparisonTable,
   Footer,
-  Gallery,
   Header,
   Headline,
   LinkDocs,

package/mobile/src/components/Carousel/Carousel.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
-import { BlockDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { SwipeListContainer } from '../../ui-kit/SwipeListControl/SwipeListContainer';
@@ -25,6 +24,7 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
     isCyclic = false,
     arrowsPadded = true,
     isPadding = true,
+    options,
     ...rest
   }) => {
     const { blocks: childBlocks } = rest.block || {};
@@ -55,9 +55,15 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
             {isBankHistoryCarousel
               ? renderChildren({
                   ...rest,
-                  block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
+                  options: {
+                    ...options,
+                    extraProps: {
+                      blocksLength: childBlocks?.length,
+                      activeIndex: activeIndex,
+                    },
+                  },
                 })
-              : renderChildren(rest)}
+              : renderChildren({ ...rest, options })}
           </SwipeListContainer>
           <CarouselScrollButtons
             scroll={scroll}
@@ -85,22 +91,7 @@ Carousel.childrenTypes = [
   'CarouselRecommendationCard',
   'CarouselTariffsCard',
   'CarouselInvestmentCard',
+  'CarouselEventCard',
 ];
 
-const buildBlocks = (blocks?: BlockDef[], activeIndex?: number) => {
-  return blocks && blocks[0]?.type === 'CarouselBankHistoryCard'
-    ? blocks.map((_, i) => {
-        return {
-          ..._,
-          content: {
-            ..._.content,
-            orderNumber: i,
-            isActive: activeIndex === i,
-            blocksLength: blocks.length,
-          },
-        };
-      })
-    : blocks;
-};
-
 const getPaddingStyle = (isPadding: boolean): string => (isPadding ? 'p-12' : '');

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.tsx

@@ -6,13 +6,15 @@ import { Headline } from '../Headline/Headline';
 import type { CarouselBankHistoryCardContent } from './CarouselBankHistoryCardContent';
 
 interface CarouselBankHistoryCardProps extends CarouselBankHistoryCardContent, UniBlockProps {
-  isActive?: boolean;
-  orderNumber?: number;
   blocksLength?: number;
+  activeIndex?: number;
 }
 
 export const CarouselBankHistoryCard = JSX<CarouselBankHistoryCardProps>(
-  ({ title, description, isActive, orderNumber = 0, blocksLength = 0 }) => {
+  ({ title, description, blocksLength = 0, activeIndex, options, ...rest }) => {
+    const orderNumber = Number(options?.key?.split('-').slice(-1)[0]) || 0;
+    const isActive = orderNumber === activeIndex;
+
     return (
       <BlockWrapper className="flex h-[485px]">
         {isActive ? (

package/mobile/src/components/CarouselCard/CarouselCard.tsx

@@ -1,17 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { CarouselCardVersion } from '../../model/CarouselCardVersion';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Headline } from '../Headline/Headline';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { CarouselCardContent } from './CarouselCardContent';
+import type { SizeVersion } from '../../model/SizeVersion';
 
 export interface CarouselCardProps extends CarouselCardContent, UniBlockProps {}
 
 const BLOCK_CLASSES = 'absolute border border-solid border-gray w-full h-full';
 
-const CARD_WIDTH_MAP: Record<CarouselCardVersion, string> = {
+const CARD_WIDTH_MAP: Record<SizeVersion, string> = {
   normal: 'min-w-[970px]',
-  mini: 'min-w-[355px]',
+  small: 'min-w-[355px]',
 };
 
 export const CarouselCard = JSX<CarouselCardProps>(

package/mobile/src/components/CarouselCard/CarouselCardContent.ts

@@ -1,4 +1,4 @@
-import type { CarouselCardVersion } from '../../model/CarouselCardVersion';
+import type { SizeVersion } from '../../model/SizeVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
@@ -14,5 +14,5 @@ export interface CarouselCardContent extends HeadlineCommonProps {
    * }
    */
   button?: ButtonWithIconProps;
-  carouselVersion?: CarouselCardVersion;
+  carouselVersion?: SizeVersion;
 }

package/mobile/src/components/CarouselCard/constants.ts

@@ -1,11 +1,11 @@
-import type { CarouselCardVersion } from '../../model/CarouselCardVersion';
+import type { SizeVersion } from '../../model/SizeVersion';
 
-export const cardStyleMap: Record<CarouselCardVersion, string> = {
+export const cardStyleMap: Record<SizeVersion, string> = {
   normal: 'min-w-[100%] justify-center items-center m-7 col-span-12',
-  mini: 'min-w-auto justify-center items-center m-9 col-span-4',
+  small: 'min-w-auto justify-center items-center m-9 col-span-4',
 };
 
-export const cardWidthMap: Record<CarouselCardVersion, string> = {
+export const cardWidthMap: Record<SizeVersion, string> = {
   normal: 'w-[1007px]',
-  mini: 'w-[350px]',
+  small: 'w-[350px]',
 };

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

@@ -0,0 +1,14 @@
+{
+  "icon": {
+    "icon": "SignDocsIcon",
+    "format": "webp",
+    "size": {
+      "width": 365,
+      "height": 195
+    }
+  },
+  "title": "Заголовок",
+  "description": "Описание",
+  "target": null,
+  "href": null
+}

package/mobile/src/components/CarouselEventCard/CarouselEventCard.tsx

@@ -0,0 +1,32 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
+import { Text } from '../../ui-kit/Text/Text';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
+import { style } from '../../utils/style';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { CarouselEventCardContent } from './CarouselEventCardContent';
+
+export interface CarouselEventCardProps extends CarouselEventCardContent, UniBlockProps {}
+
+export const CarouselEventCard = JSX<CarouselEventCardProps>(
+  ({ className = '', icon, title, description, href, target, ...rest }) => (
+    <BlockWrapper className={style('flex flex-col w-[365px]', className)} {...rest}>
+      <a href={href} target={target} role="link">
+        {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
+        {icon?.src ? <Img image={icon} /> : null}
+        {title ? (
+          <Heading headingType="h6" as="h4" className="text-left mb-2" title={title} />
+        ) : null}
+        {description ? (
+          <div className="mb-4">
+            <Text font="font-light" size="text-s" color="text-secondary-text">
+              {description}
+            </Text>
+          </div>
+        ) : null}
+      </a>
+    </BlockWrapper>
+  ),
+);

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

@@ -0,0 +1 @@
+{}

package/mobile/src/components/CarouselEventCard/CarouselEventCardContent.ts

@@ -0,0 +1,12 @@
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
+import type { LinkCommonProps } from '../../model/LinkProps';
+import type { Picture } from '../../model/Picture';
+
+/**
+ * @title Карточка мероприятия в карусели
+ */
+export type CarouselEventCardContent = TitleProps &
+  DescriptionProps &
+  LinkCommonProps & {
+    icon?: Picture;
+  };

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

@@ -1,22 +1,22 @@
 {
   "content": {
-   "image": {
-    "format": "webp",
-    "size": {
-      "width": 180,
-      "height": 180
-    }
-  },
-  "title": "Заголовок 1",
-  "description": "Описание 1",
-  "socialMedia": [
-    {
-      "href": "https://t.me",
-      "target": "_blank",
-      "version": "gray",
-      "rounded": false
-    }
-  ],
-  "version": "primary"
+    "image": {
+      "format": "webp",
+      "size": {
+        "width": 180,
+        "height": 180
+      }
+    },
+    "title": "Заголовок 1",
+    "description": "Описание 1",
+    "socialMedia": [
+      {
+        "href": "https://t.me",
+        "target": "_blank",
+        "version": "gray",
+        "rounded": false
+      }
+    ],
+    "version": "primary"
   }
 }

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCard.tsx

@@ -1,20 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
+import { style } from '../../utils/style';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { SocialMedia } from '../Footer/SocialMedia';
 import type { CarouselRecommendationCardContent } from './CarouselRecommendationCardContent';
-import { style } from '../../utils/style';
 
 export interface RecommendationCardProps extends CarouselRecommendationCardContent, UniBlockProps {}
 
 export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
   ({
-    button,
     className = '',
     description,
     image,
@@ -57,7 +55,6 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
               />
             ) : null}
             {socialMedia.length ? <SocialMedia className="pt-10 pb-0" media={socialMedia} /> : null}
-            {renderButtonsSection([button], { className: 'pt-2 mt-16' })}
           </div>
         </BaseTile>
       </BlockWrapper>

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

@@ -2,14 +2,11 @@
   "content": {
     "image": {
       "ui:field": "picture"
-    }, 
+    },
     "socialMedia": {
       "items": {
         "icon": {
           "ui:field": "icon"
-        },
-        "iconRight": {
-          "ui:field": "icon"
         }
       }
     }

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -1,9 +1,16 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { LinkCommonProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps, ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
+export type RecommendationSocialMedia = LinkCommonProps & {
+  version: ButtonVersion;
+  icon?: Picture;
+  rounded?: boolean;
+};
+
 /**
  * @title Карточка рекомендаций
  */
@@ -11,7 +18,7 @@ export interface CarouselRecommendationCardContent extends HeadlineCommonProps,
   /**
    * @title Соц сети
    */
-  socialMedia?: ButtonWithIconProps[];
+  socialMedia?: RecommendationSocialMedia[];
   /**
    * @default {
    *   "format": "webp",
@@ -27,12 +34,5 @@ export interface CarouselRecommendationCardContent extends HeadlineCommonProps,
    * }
    */
   image?: Picture;
-  /**
-   * @default {
-   * "text": "",
-   * "version": "secondary"
-   * }
-   */
-  button?: ButtonProps;
   version?: BlockVersion;
 }