@redneckz/wildless-cms-uni-blocks 0.13.22 → 0.13.24

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

@@ -1,5 +1,4 @@
 {
-  "visibleItemCount": 1,
   "isBlur": false,
   "arrowsPadded": true,
   "isCycle": false,

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

@@ -10,6 +10,7 @@ import type { CarouselContent } from './CarouselContent';
 import { CarouselScrollButtons } from './CarouselScrollButtons';
 import { ITEMS_GAP } from './itemsGap';
 import { renderCarouselCards } from './renderCarouselCards';
+import { VISIBLE_ITEM_COUNT } from './visibleItemCount';
 
 export interface CarouselProps extends CarouselContent, UniBlockProps {
   itemCount?: number;
@@ -19,7 +20,7 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
   ({
     className,
     itemCount,
-    visibleItemCount = 0,
+    visibleItemCount = VISIBLE_ITEM_COUNT,
     noCardBorder,
     isAlignCenter,
     arrowsPadded = true,

package/mobile/src/components/Carousel/visibleItemCount.ts

@@ -0,0 +1 @@
+export const VISIBLE_ITEM_COUNT = 0;

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

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
@@ -7,8 +9,6 @@ import { style } from '../../utils/style';
 import { SocialMedia } from '../Footer/SocialMedia';
 import { Headline } from '../Headline/Headline';
 import type { CarouselRecommendationCardContent } from './CarouselRecommendationCardContent';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { Picture } from '../../model/Picture';
 
 export interface RecommendationCardProps extends CarouselRecommendationCardContent, UniBlockProps {}
 

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

@@ -2,10 +2,8 @@ import type { AlignProps, HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import type { ListContent } from '../../ui-kit/List/ListContent';
-
-export type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonContent;
+import type { SocialMediaLink } from '../Footer/FooterContent';
 
 /**
  * @title Карточка рекомендаций
@@ -17,5 +15,5 @@ export type CarouselRecommendationCardContent = UniBlockContent &
   LinkCommonProps &
   AlignProps & {
     /** @title Соц сети */
-    socialMedia?: RecommendationSocialMedia[];
+    socialMedia?: SocialMediaLink[];
   };

package/mobile/src/components/Footer/FooterContent.ts

@@ -1,7 +1,11 @@
 import type { DescriptionProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
-import type { IconProps } from '../../model/Picture';
+import type { IconProps, Picture } from '../../model/Picture';
+
+export interface SocialMediaLink extends LinkProps {
+  icon?: Picture;
+}
 
 /**
  * @title Тип контакта

package/mobile/src/components/Footer/FooterDataProps.ts

@@ -1,18 +1,12 @@
-import type { LinkCommonProps, LinkProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
+import type { LinkProps } from '../../model/LinkProps';
 import type { SitemapData } from '../../services/sitemap/SitemapData';
-import type { ContactGroup, SubMenuItem } from './FooterContent';
+import type { ContactGroup, SocialMediaLink } from './FooterContent';
 
 export interface FooterDataProps extends SitemapData {
   documents?: LinkProps[];
   relatedEnterprises?: LinkProps[];
   contacts?: ContactGroup[];
-  socialMedia?: LinkCommonProps[];
-  mobileApps?: LinkCommonProps[];
+  socialMedia?: SocialMediaLink[];
+  mobileApps?: SocialMediaLink[];
   horizontalNavigationTitle?: string; // TODO: для мобильной версии
-  subMenu?: SubMenuItem[]; // TODO: для мобильной версии
-  logo?: {
-    image?: Picture;
-    title?: string;
-  };
 }

package/mobile/src/components/Footer/MediaButton.tsx

@@ -1,55 +1,50 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { IconProps, Picture } from '../../model/Picture';
+import type { Picture } from '../../model/Picture';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { Img } from '../../ui-kit/Img/Img';
 import { style } from '../../utils/style';
-import { buttonStylesWithText } from './buttonStylesWithText';
+import { buttonSizeStyle } from './buttonSizeStyle';
 import { findIconByHref } from './findIconByHref';
 
 export type ButtonSize = 'default' | 'stretched';
 
-interface MediaButtonProps extends ButtonProps, IconProps {
+interface MediaButtonProps extends ButtonContent {
   buttonSize?: ButtonSize;
 }
 
-export const MediaButton = JSX<MediaButtonProps>(
-  ({ buttonSize = 'default', rounded = false, icon, ...rest }) => {
-    const { href, version, text = '' } = rest;
+//TODO: Refactor this.
+export const MediaButton = JSX<MediaButtonProps>(({ buttonSize = 'default', icon, ...rest }) => {
+  const { href } = rest;
 
-    const { iconMapped, label } = findIconByHref(href);
+  const { iconMapped, label } = findIconByHref(href);
 
-    const iconCustom = getFilteredIcon(icon) ?? iconMapped;
+  const iconCustom = getFilteredIcon(icon) ?? iconMapped;
 
-    return (
-      <Button
-        className={style(
-          rounded ? 'rounded-full' : 'rounded-md',
-          'border border-solid hover:border-transparent',
-          'group-data-primary:border-main-divider',
-          'hover:bg-primary-main hover:text-black',
-          'group-data-secondary:bg-white border-main-divider group-data-secondary:hover:bg-secondary-hover',
-          'group-data-gray:border-green',
-          buttonStylesWithText(text, buttonSize),
-        )}
-        aria-label={label}
-        rel="noopener noreferrer"
-        target="_blank"
-        text={text}
-        version={version}
-        {...rest}
-      >
-        {iconCustom && !text ? (
-          <Img
-            image={iconCustom}
-            imageClassName="group-hover/media:text-white"
-            width="24"
-            height="24"
-          />
-        ) : null}
-      </Button>
-    );
-  },
-);
+  return (
+    <Button
+      className={style(
+        'border border-solid hover:border-transparent',
+        'group-data-primary:border-main-divider',
+        'hover:bg-primary-main hover:text-black',
+        'group-data-secondary:bg-white border-main-divider group-data-secondary:hover:bg-secondary-hover',
+        'group-data-gray:border-green',
+        'py-m group/media flex items-center justify-center box-border',
+        buttonSizeStyle[buttonSize],
+      )}
+      aria-label={label}
+      rel="noopener noreferrer"
+      target="_blank"
+      {...rest}
+    >
+      <Img
+        image={iconCustom}
+        imageClassName="group-hover/media:text-white"
+        width="24"
+        height="24"
+      />
+    </Button>
+  );
+});
 
 const getFilteredIcon = (icon: Picture | undefined) => (icon?.src || icon?.icon ? icon : undefined);

package/mobile/src/components/Footer/SocialMedia.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { Text } from '../../ui-kit/Text/Text';
-import { MediaButton } from './MediaButton';
-import type { ButtonSize } from './MediaButton';
 import { style } from '../../utils/style';
+import type { ButtonSize } from './MediaButton';
+import { MediaButton } from './MediaButton';
 
 export interface SocialMediaProps {
   className?: string;

package/mobile/src/components/Footer/{buttonSizeStyles.ts → buttonSizeStyle.ts}

@@ -1,6 +1,6 @@
 import { ButtonSize } from './MediaButton';
 
-export const buttonSizeStyles: { [key in ButtonSize]: string } = {
+export const buttonSizeStyle: { [key in ButtonSize]: string } = {
   default: 'w-14 h-14',
   stretched: 'flex-1 h-14',
 };

package/mobile/src/components/ProductBlock/ProductBlock.tsx

@@ -32,7 +32,6 @@ export const ProductBlock = JSX<ProductBlockProps>(
               handleClick,
             )
           : null}
-
         <BaseProductTile className="grow h-full" {...rest} />
       </BlockWrapper>
     );

package/mobile/src/components/ProductBlock/ProductBlockContent.ts

@@ -6,6 +6,6 @@ import type { BaseProductTileContent } from '../../ui-kit/BaseProductTile/BasePr
  */
 export type ProductBlockContent = UniBlockContent &
   BaseProductTileContent & {
-    /** @title Отображать кнопку возврата */
+    /** @title Отображать кнопку возврата (только для десктопной версии) */
     backwardButton?: boolean;
   };

package/mobile/src/components/ProductBlock/renderBackwardButton.tsx

@@ -9,7 +9,7 @@ export function renderBackwardButton(version: ButtonVersion, handleClick: () =>
   const text = 'Вернуться назад';
 
   return (
-    <div className="flex items-center gap-s">
+    <div className="hidden sm:flex items-center gap-s">
       <div
         className={getRegularButtonClasses({ className, version, rounded: true })}
         onClick={handleClick}

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

@@ -1,6 +1,8 @@
 {
   "title": "Заголовок",
+  "description": "Описание",
   "__html": "<p>Описание</p>",
+  "richVersion": "",
   "button": {
     "text": "Информация о регионе",
     "version": "link",

package/mobile/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.tsx

@@ -11,6 +11,7 @@ import { RichText } from '../../ui-kit/RichText/RichText';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
 import type { RepresentativeOfficeInfoContent } from './RepresentativeOfficeInfoContent';
+import type { TextColor } from '../../ui-kit/Text/TextProps';
 
 export interface RepresentativeOfficeInfoProps
   extends RepresentativeOfficeInfoContent,
@@ -36,13 +37,22 @@ export const RepresentativeOfficeInfo = JSX<RepresentativeOfficeInfoProps>(
     >
       <div className="w-full flex justify-between flex-row-reverse">
         {renderIconBlock(icon)}
-        {title ? <Heading headingType="h4" as="h3" title={title} /> : null}
+        {title ? <Heading headingType="h3" as="h3" title={title} /> : null}
       </div>
       <div className="w-full space-y-m">
         {__html ? renderDescriptionBlock(__html) : null}
-        {renderBlock('Адрес', address, 'GeolocationIcon')}
-        {renderBlock('Телефон', telephone, 'PhoneIcon')}
-        {renderBlock('E-mail', email, 'MailIcon')}
+        {renderBlock({
+          label: 'Адрес',
+          data: address,
+          iconName: 'GeolocationIcon',
+        })}
+        {renderBlock({ label: 'Телефон(факс)', data: telephone, iconName: 'PhoneIcon' })}
+        {renderBlock({
+          label: 'E-mail',
+          data: email,
+          iconName: 'MailIcon',
+          dataColor: 'text-primary-main',
+        })}
         {button?.text ? renderButtonsSection([button]) : null}
       </div>
     </BlockWrapper>
@@ -56,23 +66,29 @@ const renderIconBlock = (icon?: Picture) => (
 );
 
 const renderDescriptionBlock = (__html?: string) => (
-  <div className="border-b border-main-divider">
+  <div className="border-b border-main-divider pb-lg">
     <RichText __html={__html} />
   </div>
 );
 
-const renderBlock = (blockName: string, data?: string, iconName?: IconName | undefined) => (
-  <div className="flex gap-m">
-    <Icon iconVersion="black" name={iconName} width="24" height="24" />
-    <div className="flex flex-col">
-      <Text size="text-m" font="font-light">
-        {blockName}
-      </Text>
-      {data ? (
-        <Text size="text-h6" color="text-green">
+interface renderBlockProps {
+  label?: string;
+  data?: string;
+  iconName?: IconName | undefined;
+  dataColor?: TextColor;
+}
+
+const renderBlock = ({ label, data, iconName, dataColor = '' }: renderBlockProps) =>
+  data ? (
+    <div className="flex gap-s">
+      <Icon iconVersion="black" name={iconName} width="24" height="24" />
+      <div className="flex flex-col gap-2xs">
+        <Text size="text-m" font="font-light" color="text-secondary-text">
+          {label}
+        </Text>
+        <Text size="text-xl" color={dataColor}>
           {data}
         </Text>
-      ) : null}
+      </div>
     </div>
-  </div>
-);
+  ) : null;

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -128,10 +128,11 @@ const renderIconArea = (size: SizeVersion, version: BlockVersion) => (step: Step
         'z-10 mr-s flex justify-center content-center',
       )}
     >
-      <span className="flex self-center text-h4 text-secondary-text group-data-secondary:text-white">
+      <span className="flex max-w-full max-h-full self-center text-h4 text-secondary-text group-data-secondary:text-white">
         {checkCanRenderIcon(step?.icon) ? (
           <Img
             image={{ ...step.icon, iconVersion: step.icon?.iconVersion || iconVersion }}
+            imageClassName="max-w-full max-h-full"
             width={iconSize}
             height={iconSize}
           />

package/mobile/src/icons/IconName.ts

@@ -3,7 +3,7 @@
 /* eslint-disable max-len, max-lines */
 
 export const IconsWithoutInversion = new Set([
-  'ActualBalanceIcon', 'AirPlaneIcon', 'BagIcon', 'BelarusianFlag', 'BriefcaseIcon', 'CardWithGemIcon', 'CarIcon', 'ChartIcon', 'ChevronLeftIcon', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HouseIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MailIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MapOpenedIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PhoneIcon', 'PowerIcon', 'PumpkinIcon', 'ResponseFailIcon', 'ResponseOKIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
+  'ActualBalanceIcon', 'AirPlaneIcon', 'BagIcon', 'BelarusianFlag', 'BriefcaseIcon', 'CardWithGemIcon', 'CarIcon', 'ChartIcon', 'ChevronLeftIcon', 'CinemaIcon', 'ClientIcon', 'ClockIcon', 'ComfortableCompIcon', 'CreditCardsIcon', 'DocsIcon', 'DollarIcon', 'DoneIcon', 'EarthIcon', 'EuroIcon', 'FullScreenIcon', 'GlassIcon', 'HeadphonesIcon', 'HeartIcon', 'HouseIcon', 'HuaweiIcon', 'InterestGrowthIcon', 'JCBIcon', 'MapMarkerClusterIcon', 'MapMarkerSingleIcon', 'MapOpenedIcon', 'MasterCardIcon', 'MirIcon', 'MoneyInsuranceIcon', 'NewDocIcon', 'OfficeIcon', 'PackA4Icon', 'PassSendIcon', 'PercentIcon', 'PowerIcon', 'PumpkinIcon', 'ResponseFailIcon', 'ResponseOKIcon', 'SignDocsIcon', 'SoundIcon', 'UnionPayIcon', 'UserGeoLocationIcon', 'VisaIcon', 'WateringCanIcon'
 ]);
 
 export enum IconMap {

package/mobile/src/icons/MailIcon.svg

@@ -1 +1,4 @@
-<svg title="E-mail" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M22 12.98v2.52c0 3.5-2 5-5 5H7c-3 0-5-1.5-5-5v-7c0-3.5 2-5 5-5h10c3 0 5 1.5 5 5"/><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="m17 9-3.13 2.5c-1.03.82-2.72.82-3.75 0L7 9"/></svg>
+<svg title="E-mail" isInverse="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M22 12.98v2.52c0 3.5-2 5-5 5H7c-3 0-5-1.5-5-5v-7c0-3.5 2-5 5-5h10c3 0 5 1.5 5 5"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="m17 9-3.13 2.5c-1.03.82-2.72.82-3.75 0L7 9"/>
+</svg>

package/mobile/src/icons/PhoneIcon.svg

@@ -1 +1,3 @@
-<svg title="Телефон" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path stroke="#7D7E7F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M9.39 6.01c.18.25.31.48.4.7.09.21.14.42.14.61 0 .24-.07.48-.21.71-.13.23-.32.47-.56.71l-.76.79c-.11.11-.16.24-.16.4 0 .08.01.15.03.23.03.08.06.14.08.2.18.33.49.76.93 1.28.45.52.93 1.05 1.45 1.58.54.53 1.06 1.02 1.59 1.47.52.44.95.74 1.29.92.05.02.11.05.18.08.08.03.16.04.25.04.17 0 .3-.06.41-.17l.76-.75c.25-.25.49-.44.72-.56.23-.14.46-.21.71-.21.19 0 .39.04.61.13.22.09.45.22.7.39l3.31 2.35c.26.18.44.39.55.64.1.25.16.5.16.78 0 .36-.08.73-.25 1.09-.17.36-.39.7-.68 1.02-.49.54-1.03.93-1.64 1.18-.6.25-1.25.38-1.95.38-1.02 0-2.11-.24-3.26-.73s-2.3-1.15-3.44-1.98a28.75 28.75 0 0 1-3.28-2.8 28.414 28.414 0 0 1-2.79-3.27c-.82-1.14-1.48-2.28-1.96-3.41C2.24 8.67 2 7.58 2 6.54c0-.68.12-1.33.36-1.93.24-.61.62-1.17 1.15-1.67C4.15 2.31 4.85 2 5.59 2c.28 0 .56.06.81.18.26.12.49.3.67.56"/></svg>
+<svg title="Телефон" isInverse="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M9.39 6.01c.18.25.31.48.4.7.09.21.14.42.14.61 0 .24-.07.48-.21.71-.13.23-.32.47-.56.71l-.76.79c-.11.11-.16.24-.16.4 0 .08.01.15.03.23.03.08.06.14.08.2.18.33.49.76.93 1.28.45.52.93 1.05 1.45 1.58.54.53 1.06 1.02 1.59 1.47.52.44.95.74 1.29.92.05.02.11.05.18.08.08.03.16.04.25.04.17 0 .3-.06.41-.17l.76-.75c.25-.25.49-.44.72-.56.23-.14.46-.21.71-.21.19 0 .39.04.61.13.22.09.45.22.7.39l3.31 2.35c.26.18.44.39.55.64.1.25.16.5.16.78 0 .36-.08.73-.25 1.09-.17.36-.39.7-.68 1.02-.49.54-1.03.93-1.64 1.18-.6.25-1.25.38-1.95.38-1.02 0-2.11-.24-3.26-.73s-2.3-1.15-3.44-1.98a28.75 28.75 0 0 1-3.28-2.8 28.414 28.414 0 0 1-2.79-3.27c-.82-1.14-1.48-2.28-1.96-3.41C2.24 8.67 2 7.58 2 6.54c0-.68.12-1.33.36-1.93.24-.61.62-1.17 1.15-1.67C4.15 2.31 4.85 2 5.59 2c.28 0 .56.06.81.18.26.12.49.3.67.56"/>
+</svg>

package/mobile/src/icons/RutubeIcon.svg

@@ -1 +1 @@
-<svg title="Лого «Rutube»" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><g fill="#1C1C1C" clip-path="url(#clip0_21939_18954)"><path d="M18.165 4.692a1.835 1.835 0 1 0 0-3.67 1.835 1.835 0 0 0 0 3.67ZM12.711 4.489H-.187v14.338h3.59v-4.665h6.88l3.138 4.665h4.02l-3.462-4.686c1.075-.172 1.85-.58 2.322-1.226.473-.644.71-1.676.71-3.052V8.788c0-.817-.087-1.462-.237-1.956A3.268 3.268 0 0 0 16 5.521a3.5 3.5 0 0 0-1.333-.796c-.516-.15-1.16-.236-1.956-.236Zm-.58 6.513H3.403V7.65h8.728c.494 0 .838.086 1.01.236.172.15.28.43.28.839v1.204c0 .43-.108.709-.28.86-.172.15-.516.214-1.01.214Z"/></g><defs><clipPath id="clip0_21939_18954"><path fill="#fff" d="M0 0h20v20H0z"/></clipPath></defs></svg>
+<svg title="Лого «Rutube»" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><g fill="currentColor" clip-path="url(#clip0_21939_18954)"><path d="M18.165 4.692a1.835 1.835 0 1 0 0-3.67 1.835 1.835 0 0 0 0 3.67ZM12.711 4.489H-.187v14.338h3.59v-4.665h6.88l3.138 4.665h4.02l-3.462-4.686c1.075-.172 1.85-.58 2.322-1.226.473-.644.71-1.676.71-3.052V8.788c0-.817-.087-1.462-.237-1.956A3.268 3.268 0 0 0 16 5.521a3.5 3.5 0 0 0-1.333-.796c-.516-.15-1.16-.236-1.956-.236Zm-.58 6.513H3.403V7.65h8.728c.494 0 .838.086 1.01.236.172.15.28.43.28.839v1.204c0 .43-.108.709-.28.86-.172.15-.516.214-1.01.214Z"/></g><defs><clipPath id="clip0_21939_18954"><path fill="#fff" d="M0 0h20v20H0z"/></clipPath></defs></svg>

package/mobile/src/services/search/useSearch.ts

@@ -1,19 +1,18 @@
-import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import type { Nullable } from '../../utils/Nullable';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { joinPath } from '../../utils/url';
 import { useDebouncedEffect } from '../../utils/useDebouncedEffect';
-import { CorpusItem, search, SearchIndex } from './search';
+import { CorpusItem, SearchIndex, search } from './search';
 
 const SEARCH_INDEX_FILENAME = 'search.index.json';
-const DEFAULT_BASE_PATH = ['/'];
 
 export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
 
 interface SearchParams {
-  basePathList?: string[];
+  basePathList: Nullable<string[]>;
   initialQuery?: string;
-  wasOpened?: boolean;
 }
 
 export interface SearchInputProps {
@@ -22,9 +21,8 @@ export interface SearchInputProps {
 }
 
 export const useSearch = ({
-  basePathList = DEFAULT_BASE_PATH,
+  basePathList,
   initialQuery = '',
-  wasOpened,
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
   const [query, setQuery] = useState(initialQuery || '');
 
@@ -34,12 +32,7 @@ export const useSearch = ({
     }
   }, [initialQuery]);
 
-  const key = useMemo(
-    () => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, basePathList],
-  );
-
-  const { data } = useAsyncData(key, fetchSearchIndex);
+  const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
 
   const [result, setResult] = useState<SearchResult | null>(null);
 

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

@@ -33,7 +33,12 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
     tags = [],
     buttons,
     image,
-    imageOptions: { imageAlign = 'end', directionRight = true, isBackground } = {},
+    imageOptions: {
+      imageAlign = 'end',
+      directionRight = true,
+      isBackground,
+      isImageAlwaysOnRight,
+    } = {},
     children,
   }) => {
     const img = image?.src ? <Img image={image} /> : null;
@@ -58,6 +63,7 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
         {...(isFullWidthTitle ? { insetTitle: headline } : { title: headline })}
         {...(isBackground ? { backImage: img } : leftOrRightImage(img, directionRight))}
         imageAlign={imageAlign}
+        isImageAlwaysOnRight={isImageAlwaysOnRight}
         buttons={renderButtonsSection(buttons)}
       >
         <div className="flex flex-col gap-xl">

package/mobile/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -16,6 +16,8 @@ export interface TileImageOptions {
   imageAlign?: Align;
   /** @title Фоновое изображение */
   isBackground?: boolean;
+  /** @title Изображение всегда справа */
+  isImageAlwaysOnRight?: boolean;
 }
 
 export type BaseProductTileContent = HeadlineProps &

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

@@ -12,6 +12,7 @@ interface BaseTileProps extends UniBlockProps {
   imageAlign?: Align;
   backImage?: VNode;
   buttons?: VNode;
+  isImageAlwaysOnRight?: boolean;
 }
 
 const imageAlignmentMap: Record<Align, string> = {
@@ -32,6 +33,7 @@ export const BaseTile = JSX<BaseTileProps>(
     rightImage,
     imageAlign,
     backImage,
+    isImageAlwaysOnRight = false,
     children,
   }) => (
     <div
@@ -42,7 +44,12 @@ export const BaseTile = JSX<BaseTileProps>(
       )}
     >
       {title ? <div className="relative">{title}</div> : null}
-      <div className="grow relative flex flex-col @lg:flex-row justify-around @lg:justify-between items-stretch gap-3xl">
+      <div
+        className={style(
+          'grow relative flex justify-around @lg:justify-between items-stretch gap-3xl',
+          isImageAlwaysOnRight ? 'flex-row' : 'flex-col @lg:flex-row',
+        )}
+      >
         {renderImageContainer(leftImage, { imageAlign })}
         <div
           className={style(
@@ -60,7 +67,7 @@ export const BaseTile = JSX<BaseTileProps>(
           {buttons}
         </div>
         {renderImageContainer(rightImage, {
-          className: '-order-1 @xl:order-1',
+          className: isImageAlwaysOnRight ? '' : '-order-1 @xl:order-1',
           imageAlign,
         })}
       </div>

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

@@ -6,7 +6,7 @@ export const buttonStyleMap: Record<ButtonVersion, string> = {
     'text-primary-main bg-main-divider hover:text-white hover:bg-primary-hover active:bg-primary-active',
   white:
     'text-primary-main bg-white hover:text-white hover:bg-primary-hover active:bg-white active:text-primary-main',
-  link: '',
+  link: 'text-primary-main',
   transparent: '',
   gray: 'text-primary-main bg-main-divider hover:text-white hover:bg-primary-hover active:bg-primary-active',
   '': '',
@@ -30,7 +30,7 @@ export const iconStyleMap: Record<ButtonVersion, string> = {
   primary: 'group-hover/btn:brightness-0 group-hover/btn:invert',
   secondary: 'group-hover/btn:brightness-0 group-hover/btn:invert',
   white: 'group-hover/btn:brightness-0 group-hover/btn:invert',
-  link: '',
+  link: 'text-primary-main',
   transparent: '',
   gray: 'group-hover/btn:brightness-0 group-hover/btn:invert',
   '': '',

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

@@ -30,15 +30,15 @@ const renderButton =
   (buttonClassName = '') =>
   (button?: ButtonContent, index?: number) => {
     const { text, icon, iconRight, version, ...rest } = button || {};
-    const iconVersionDefault = version === 'secondary' ? 'color' : 'white';
-    const iconVersion = icon?.iconVersion ? icon?.iconVersion : iconVersionDefault;
+    const iconVersion = getIconVersion(icon, version);
+    const iconRightVersion = getIconVersion(iconRight, version);
 
     return text || icon?.icon ? (
       <Button
         key={index ? String(index) : ''}
         className={style('basis-full sm:basis-auto', buttonClassName)}
         appendLeft={renderButtonIcon({ ...icon, iconVersion })}
-        appendRight={renderButtonIcon({ ...iconRight, iconVersion })}
+        appendRight={renderButtonIcon({ ...iconRight, iconVersion: iconRightVersion })}
         version={version}
         text={text}
         {...rest}
@@ -48,11 +48,20 @@ const renderButton =
 
 const DEFAULT_ICON_W = 24;
 
-const renderButtonIcon = (icon: Picture) =>
-  icon?.icon || icon?.src ? (
+const getIconVersion = (icon: Picture | undefined, version = 'secondary') => {
+  const iconVersionDefault = version === 'secondary' ? 'color' : 'white';
+
+  return icon?.iconVersion ? icon?.iconVersion : iconVersionDefault;
+};
+
+const renderButtonIcon = (icon: Picture) => {
+  console.log(icon);
+
+  return icon?.icon || icon?.src ? (
     <Img
       image={icon}
       width={String(icon?.size?.width || DEFAULT_ICON_W)}
       height={String(DEFAULT_ICON_W)}
     />
   ) : null;
+};

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

@@ -43,7 +43,7 @@ export const Logo = JSX<Partial<LogoProps>>(
         ? children ?? (
             <div className="ml-s">
               <Text font="font-medium" color={TEXT_COLOR[bgColor]} size={logoTitleSizeStyle}>
-                {logo?.title}
+                {logo?.title || 'Россельхозбанк'}
               </Text>
             </div>
           )

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

@@ -1,11 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style';
 import type { RichTextProps } from './RichTextProps';
+import { getHtmlText } from './getHtmlText';
 
 export const RichText = JSX<RichTextProps>((props) => {
   const { __html = '', richVersion = '' } = props;
 
-  return (
+  return getHtmlText(__html) ? (
     <div className={style(richVersion, 'md-container')} dangerouslySetInnerHTML={{ __html }} />
-  );
+  ) : null;
 });

package/mobile/src/ui-kit/RichText/getHtmlText.tsx

@@ -0,0 +1 @@
+export const getHtmlText = (html: string) => html.replace(/<\/?[^>]+\/?>/g, '').trim();

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

@@ -21,7 +21,6 @@ export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
   const [searchResult, searchInputProps] = useSearch({
     basePathList,
     initialQuery,
-    wasOpened: false,
   });
 
   const searchItems = useMemo(

package/mobile/src/utils/Nullable.ts

@@ -0,0 +1 @@
+export type Nullable<T> = T | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.13.22",
+  "version": "0.13.24",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

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

@@ -61,7 +61,7 @@ const renderFoldButton =
     return (
       <button
         onClick={onToggle}
-        className="w-full p-xl bg-green flex items-center border-b border-white"
+        className="w-full p-xl bg-primary-main flex items-center border-b border-white"
       >
         <div className="w-11 h-11 bg-white rounded-md flex justify-center items-center">
           <Icon name={tab.nav?.icon?.icon} iconVersion="color" width="24" height="24" />