@redneckz/wildless-cms-uni-blocks 0.14.4 → 0.14.5

package/mobile/lib/components/Footer/iconsMap.js

@@ -2,37 +2,30 @@ export const ICONS_MAP = [
     {
         origins: ['t.me', 'telegram.org'],
         iconMapped: { icon: 'TelegramIcon' },
-        label: 'Телеграм',
     },
     {
         origins: ['vk.com'],
         iconMapped: { icon: 'VKIcon' },
-        label: 'ВКонтакте',
     },
     {
         origins: ['ok.ru'],
         iconMapped: { icon: 'OkIcon' },
-        label: 'Одноклассники',
     },
     {
         origins: ['apps.apple.com'],
         iconMapped: { icon: 'AppleIcon' },
-        label: 'App Store',
     },
     {
         origins: ['play.google.com'],
         iconMapped: { icon: 'PlayMarketIcon' },
-        label: 'Google Play',
     },
     {
         origins: ['youtube.com'],
         iconMapped: { icon: 'YoutubeIcon' },
-        label: 'Youtube',
     },
     {
         origins: ['rutube.ru'],
         iconMapped: { icon: 'RutubeIcon' },
-        label: 'Rutube',
     },
 ];
 //# sourceMappingURL=iconsMap.js.map

package/mobile/lib/components/Footer/iconsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"iconsMap.js","sourceRoot":"","sources":["../../../src/components/Footer/iconsMap.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C;QACE,OAAO,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC;QACjC,UAAU,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;QACpC,KAAK,EAAE,UAAU;KAClB;IACD;QACE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,KAAK,EAAE,WAAW;KACnB;IACD;QACE,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,KAAK,EAAE,eAAe;KACvB;IACD;QACE,OAAO,EAAE,CAAC,gBAAgB,CAAC;QAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QACjC,KAAK,EAAE,WAAW;KACnB;IACD;QACE,OAAO,EAAE,CAAC,iBAAiB,CAAC;QAC5B,UAAU,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACtC,KAAK,EAAE,aAAa;KACrB;IACD;QACE,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,UAAU,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;QACnC,KAAK,EAAE,SAAS;KACjB;IACD;QACE,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;QAClC,KAAK,EAAE,QAAQ;KAChB;CACF,CAAC"}
+{"version":3,"file":"iconsMap.js","sourceRoot":"","sources":["../../../src/components/Footer/iconsMap.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C;QACE,OAAO,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC;QACjC,UAAU,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;KACrC;IACD;QACE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;IACD;QACE,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC/B;IACD;QACE,OAAO,EAAE,CAAC,gBAAgB,CAAC;QAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;KAClC;IACD;QACE,OAAO,EAAE,CAAC,iBAAiB,CAAC;QAC5B,UAAU,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;KACvC;IACD;QACE,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,UAAU,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;KACpC;IACD;QACE,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;KACnC;CACF,CAAC"}

package/mobile/lib/ui-kit/Button/ButtonInner.js

@@ -12,7 +12,7 @@ const getButtonStyle = (props) => {
         return '';
     }
     const withTextStyle = `${aboveText ? 'py-2.5 px-9' : 'py-4 px-9'}`;
-    return style('group/btn items-center justify-center', isWithText(props) ? withTextStyle : 'h-12 w-12', rounded ? 'rounded-full' : '');
+    return style('group/btn items-center justify-center', isWithText(props) ? withTextStyle : 'h-12 w-12 m-auto', rounded ? 'rounded-full' : '');
 };
 const isWithText = ({ text, aboveText, appendLeft }) => Boolean(text || aboveText || !appendLeft);
 //# sourceMappingURL=ButtonInner.js.map

package/mobile/lib/ui-kit/Button/ButtonInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonInner.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAc,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IAEhF,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,aACxD,UAAU,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,YAAG,UAAU,GAAO,CAAC,CAAC,CAAC,IAAI,EAC7E,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,0BACG,SAAS,CAAC,CAAC,CAAC,cAAK,SAAS,EAAC,8BAA8B,YAAE,SAAS,GAAO,CAAC,CAAC,CAAC,IAAI,EACnF,cAAK,SAAS,EAAE,aAAa,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAG,IAAI,GAAO,IAChF,CACP,CAAC,CAAC,CAAC,IAAI,EACP,WAAW,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,YAAG,WAAW,GAAO,CAAC,CAAC,CAAC,IAAI,IAC5E,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,KAAoB,EAAE,EAAE;IAC9C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE9C,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEnE,OAAO,KAAK,CACV,uCAAuC,EACvC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,EAC/C,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAe,EAAE,EAAE,CAClE,OAAO,CAAC,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"ButtonInner.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/ButtonInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAc,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IAEhF,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,aACxD,UAAU,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,YAAG,UAAU,GAAO,CAAC,CAAC,CAAC,IAAI,EAC7E,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,0BACG,SAAS,CAAC,CAAC,CAAC,cAAK,SAAS,EAAC,8BAA8B,YAAE,SAAS,GAAO,CAAC,CAAC,CAAC,IAAI,EACnF,cAAK,SAAS,EAAE,aAAa,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAG,IAAI,GAAO,IAChF,CACP,CAAC,CAAC,CAAC,IAAI,EACP,WAAW,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,YAAG,WAAW,GAAO,CAAC,CAAC,CAAC,IAAI,IAC5E,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,KAAoB,EAAE,EAAE;IAC9C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAE9C,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEnE,OAAO,KAAK,CACV,uCAAuC,EACvC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,kBAAkB,EACtD,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAe,EAAE,EAAE,CAClE,OAAO,CAAC,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,CAAC"}

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
 import type { BusinessDepositCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
@@ -28,7 +29,6 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
       daysValue: BUSINESS_DEFAULT_DAYS,
       isReplenished: false,
       isPartialWithdrawal: false,
-      isSmallBusiness: false,
       isMonthlyInterestPayment: false,
     });
 
@@ -55,13 +55,15 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
             ...field('daysValue'),
             value: calculatorParams.daysValue,
           })}
-          {renderBusinessDepositParamsForm(calculatorParams, field)}
-          {renderInterestPayment({
-            title: 'Выплата процентов',
-            orientation: 'vertical',
-            ...field('isMonthlyInterestPayment'),
-            radioGroupClassName: 'sm:flex-col',
-          })}
+          <div className="flex flex-col sm:flex-row gap-y-4 gap-x-14">
+            {renderBusinessDepositParamsForm(calculatorParams, field)}
+            {renderInterestPayment({
+              title: 'Выплата процентов',
+              orientation: 'vertical',
+              ...field('isMonthlyInterestPayment'),
+              radioGroupClassName: 'sm:flex-col',
+            })}
+          </div>
         </div>
         <div className="border-b border-main-divider md:hidden"></div>
         {renderRate({
@@ -85,24 +87,24 @@ const renderBusinessDepositParamsForm = (
   calculatorParams: BusinessDepositCalculatorParams,
   field: FormFieldRegisterer<BusinessDepositCalculatorUserInputParams>,
 ) => (
-  <div className="flex flex-col gap-y-xl sm:gap-y-s">
-    <Checkbox
-      text="Пополнение"
-      disabled={calculatorParams.isDisabledOperatingDeposit}
-      {...field('isReplenished')}
-      value={calculatorParams.isReplenished}
-    />
-    <Checkbox
-      disabled={calculatorParams.isDisabledOperatingDeposit}
-      text="Частичное снятие"
-      {...field('isPartialWithdrawal')}
-      value={calculatorParams.isPartialWithdrawal}
-    />
-    <Checkbox
-      text="ИП / малое предприятие"
-      {...field('isSmallBusiness')}
-      value={calculatorParams.isSmallBusiness}
-    />
+  <div className="space-y-s">
+    <Text color="text-secondary-text" font="font-light">
+      Параметры
+    </Text>
+    <div className="flex flex-col gap-y-xl sm:gap-y-s">
+      <Checkbox
+        text="Пополнение"
+        disabled={calculatorParams.isDisabledOperatingDeposit}
+        {...field('isReplenished')}
+        value={calculatorParams.isReplenished}
+      />
+      <Checkbox
+        disabled={calculatorParams.isDisabledOperatingDeposit}
+        text="Частичное снятие"
+        {...field('isPartialWithdrawal')}
+        value={calculatorParams.isPartialWithdrawal}
+      />
+    </div>
   </div>
 );
 

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

@@ -94,7 +94,6 @@ export const DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS: BusinessDepositCalculat
     isMonthlyInterestPayment: true,
     isReplenished: false,
     isPartialWithdrawal: false,
-    isSmallBusiness: false,
     depositeName: "Депозит 'Стабильный'",
   };
 

package/mobile/src/components/Calculator/useBusinessDepositCalculatorParams.ts

@@ -12,7 +12,6 @@ export interface BusinessCommonDepositParams {
   isMonthlyInterestPayment: boolean;
   isReplenished: boolean;
   isPartialWithdrawal: boolean;
-  isSmallBusiness: boolean;
 }
 export interface BusinessDepositCalculatorSourceBookParams extends BusinessCommonDepositParams {
   minSum: number;
@@ -45,14 +44,8 @@ export const useBusinessDepositCalculatorParams = (
   userInputParams: BusinessDepositCalculatorUserInputParams,
   sourceBookDir?: string,
 ): BusinessDepositCalculatorParams => {
-  const {
-    daysValue,
-    moneyValue,
-    isPartialWithdrawal,
-    isReplenished,
-    isSmallBusiness,
-    isMonthlyInterestPayment,
-  } = userInputParams;
+  const { daysValue, moneyValue, isPartialWithdrawal, isReplenished, isMonthlyInterestPayment } =
+    userInputParams;
   const data = useCalculatorParams<BusinessDepositCalculatorData>(
     sourceBookDir || BUSINESS_DEPOSIT_CALC_DEFAULT_DIR,
   );
@@ -73,7 +66,6 @@ export const useBusinessDepositCalculatorParams = (
     data?.rateRows?.find((_) => {
       return (
         isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
-        isSmallBusiness === _.isSmallBusiness &&
         checkIsOperatingDeposit(isOperatingDeposit, _) &&
         checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], _) &&
         checkRangeByKeys(daysValue, ['minDays', 'maxDays'], _)

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

@@ -90,7 +90,6 @@ Carousel.childrenTypes = [
   'CarouselTariffsCard',
   'CarouselRichTextCard',
   'CarouselInvestmentCard',
-  'CarouselEventCard',
   'ProductBlock',
 ];
 

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

@@ -8,7 +8,7 @@
   "title": "Заголовок",
   "description": "Описание",
   "additionalDescription": "Описание 1-2",
-  "columnsMode": "1",
+  "columnsMode": 1,
   "cardsList": [
     {
       "parameter": "Параметр",

package/mobile/src/components/CarouselInvestmentCard/CarouselInvestmentCard.tsx

@@ -68,7 +68,11 @@ export const CarouselInvestmentCard = JSX<CarouselInvestmentCardProps>(
 const renderCardList = (cardsList: CardsListItem[]) =>
   cardsList.map((item, i) => (
     <li key={String(i)}>
-      {item?.parameter ? <Text size="text-h6">{item.parameter}</Text> : null}
+      {item?.parameter ? (
+        <div className="inline pr-xs">
+          <Text size="text-h6">{item.parameter}</Text>
+        </div>
+      ) : null}
       {item?.parameterDescription ? (
         <Text size="text-m" font="font-light" color="text-secondary-text">
           {item.parameterDescription}

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

@@ -15,8 +15,6 @@
       { "text": "Элемент списка 1", "title": "Элемент заголовка 1" },
       { "text": "Элемент списка 2", "title": "Элемент заголовка 2" },
       { "text": "Элемент списка 3", "title": "Элемент заголовка 3" }
-    ],
-    "align": "text-center",
-    "isFullWidth": true
+    ]
   }
 }

package/mobile/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -14,6 +14,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
 import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
 import { AlignStyles } from '../../model/AlignStyles';
+import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
 export interface CarouselProductCardProps extends CarouselProductCardContent, UniBlockProps {}
 
@@ -39,16 +40,16 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
   }) => {
     return (
       <BlockWrapper
-        className={style('flex flex-col justify-between', align, className)}
+        className={style('flex flex-col justify-between', className)}
         defaultPadding="p-0"
         version={version}
         {...rest}
       >
         <LinkWrapper className="p-m flex flex-col gap-xs" href={href} target={target}>
-          {renderCardTitle(headlineSmallVersion, title)}
-          {renderDescription(description)}
+          {renderCardTitle(headlineSmallVersion, title, align)}
+          {renderDescription(description, align)}
           {renderItems(items, isDotted, version)}
-          {renderAdditionalDescription(additionalDescription)}
+          {renderAdditionalDescription(additionalDescription, align)}
           {renderImage(icon, isImageFullWidth, isTopPosition)}
         </LinkWrapper>
         {renderButtonsSection([button], {
@@ -63,33 +64,42 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
 const renderImage = (image?: Picture, isImageFullWidth?: boolean, isTopPosition?: boolean) => (
   <div
     className={style(
-      'flex gap-lg',
+      'flex gap-y-lg justify-center',
+      isImageFullWidth ? 'min-w-full h-full' : '',
       isTopPosition ? 'order-first' : 'order-last',
-      !isImageFullWidth ? 'justify-center' : '',
     )}
   >
-    {image?.src ? <Img className="shrink-0" image={image} /> : null}
+    {image?.src ? <Img image={image} /> : null}
     {image?.icon ? (
       <Img
-        className={style('shrink-0', !isImageFullWidth ? 'w-8 h-8 min-w-8' : '')}
+        className={style(!isImageFullWidth ? 'w-8 h-8 min-w-8' : 'w-full h-full')}
         image={image}
       />
     ) : null}
   </div>
 );
 
-const renderCardTitle = (headlineSmallVersion: string, title?: string) =>
-  title ? <Text size={HEADLINE_SMALL_VERSION[headlineSmallVersion]}>{title}</Text> : null;
+const renderCardTitle = (headlineSmallVersion: string, title?: string, align?: TextAlign) =>
+  title ? (
+    <Text align={align} size={HEADLINE_SMALL_VERSION[headlineSmallVersion]}>
+      {title}
+    </Text>
+  ) : null;
 
-const renderDescription = (description?: string) =>
-  description ? <Paragraph size="text-l">{description}</Paragraph> : null;
+const renderDescription = (description?: string, align?: TextAlign) =>
+  description ? (
+    <Paragraph align={align} size="text-l">
+      {description}
+    </Paragraph>
+  ) : null;
 
-const renderAdditionalDescription = (additionalDescription?: string) =>
+const renderAdditionalDescription = (additionalDescription?: string, align?: TextAlign) =>
   additionalDescription ? (
     <Text
       size="text-m"
       font="font-light"
       color="text-secondary-text group-data-secondary:text-white/80"
+      align={align}
     >
       {additionalDescription}
     </Text>

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

@@ -15,8 +15,7 @@
         "href": "https://t.me",
         "target": "_blank",
         "version": "gray",
-        "rounded": false,
-        "text": "Текст"
+        "rounded": false
       }
     ],
     "version": "primary",

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

@@ -43,7 +43,7 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
             <List className="flex flex-col gap-xs" items={items} listItemSize="XS" />
           ) : null}
           {renderIcon(icon)}
-          {socialMedia.length ? <SocialMedia media={socialMedia} /> : null}
+          {socialMedia.length ? <SocialMedia media={socialMedia} showButtonText={true} /> : null}
         </LinkWrapper>
       </BlockWrapper>
     );

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

@@ -2,8 +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';
-import type { SocialMediaLink } from '../Footer/FooterContent';
 
 /**
  * @title Карточка рекомендаций
@@ -15,5 +15,5 @@ export type CarouselRecommendationCardContent = UniBlockContent &
   LinkCommonProps &
   AlignProps & {
     /** @title Соц сети */
-    socialMedia?: SocialMediaLink[];
+    socialMedia?: ButtonContent[];
   };

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

@@ -39,7 +39,7 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
       </div>
       <Contacts className="overflow-hidden" items={contacts} />
       <div className="mt-xl">
-        <SocialMedia className="mb-xl" media={socialMedia} buttonSize="stretched">
+        <SocialMedia className="mb-xl" media={socialMedia} stretched={true}>
           Соцсети
         </SocialMedia>
         <Text size="text-s" font="font-light" color="text-secondary-text">

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

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

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

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

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

@@ -1,29 +1,61 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
-import type { ButtonSize } from './MediaButton';
-import { MediaButton } from './MediaButton';
+import { findIconByHref } from './findIconByHref';
 
 export interface SocialMediaProps {
   className?: string;
   media?: ButtonContent[];
-  buttonSize?: ButtonSize;
+  showButtonText?: boolean;
+  stretched?: boolean;
 }
 
 export const SocialMedia = JSX<SocialMediaProps>(
-  ({ className = '', media, children, buttonSize }) => (
-    <div className="flex flex-col sm:flex-col-reverse gap-xs">
-      {children ? (
-        <Text size="text-s" font="font-light" color="text-secondary-text">
-          {children}
-        </Text>
-      ) : null}
-      <div className={style('flex gap-xs', className)}>
-        {media?.map((_, index) => (
-          <MediaButton key={String(index)} buttonSize={buttonSize} {..._} />
-        ))}
+  ({ className = '', media, showButtonText, stretched, children }) => {
+    const [hasText, setHasText] = useState<boolean | undefined>();
+    const buttons: ButtonContent[] | undefined = media?.map((_) => {
+      const { href, icon, text } = _;
+      const { iconMapped } = findIconByHref(href);
+      const iconCustom = getFilteredIcon(icon) ?? iconMapped;
+      const buttonText = showButtonText ? { text } : {};
+
+      if (!hasText && text) {
+        setHasText(true);
+      }
+
+      return {
+        ...buttonText,
+        icon: { ...iconCustom, iconVersion: 'color' },
+        version: 'white',
+      };
+    });
+
+    const buttonClassName = style(
+      'border border-solid hover:border-transparent group-data-primary:border-main-divider border-main-divider group-data-gray:border-green group/media',
+      showButtonText && hasText ? '' : ' basis-auto',
+      stretched ? 'flex-1 justify-center' : '',
+    );
+
+    return (
+      <div className="flex flex-col sm:flex-col-reverse gap-xs">
+        {children ? (
+          <Text size="text-s" font="font-light" color="text-secondary-text">
+            {children}
+          </Text>
+        ) : null}
+        <div className={style('flex gap-xs', className)}>
+          {renderButtonsSection(buttons, {
+            className: stretched ? 'w-full' : '',
+            buttonClassName,
+          })}
+        </div>
       </div>
-    </div>
-  ),
+    );
+  },
 );
+
+const getFilteredIcon = (icon: Picture | undefined) => (icon?.src || icon?.icon ? icon : undefined);

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

@@ -10,36 +10,29 @@ export const ICONS_MAP: Array<IconsMapItem> = [
   {
     origins: ['t.me', 'telegram.org'],
     iconMapped: { icon: 'TelegramIcon' },
-    label: 'Телеграм',
   },
   {
     origins: ['vk.com'],
     iconMapped: { icon: 'VKIcon' },
-    label: 'ВКонтакте',
   },
   {
     origins: ['ok.ru'],
     iconMapped: { icon: 'OkIcon' },
-    label: 'Одноклассники',
   },
   {
     origins: ['apps.apple.com'],
     iconMapped: { icon: 'AppleIcon' },
-    label: 'App Store',
   },
   {
     origins: ['play.google.com'],
     iconMapped: { icon: 'PlayMarketIcon' },
-    label: 'Google Play',
   },
   {
     origins: ['youtube.com'],
     iconMapped: { icon: 'YoutubeIcon' },
-    label: 'Youtube',
   },
   {
     origins: ['rutube.ru'],
     iconMapped: { icon: 'RutubeIcon' },
-    label: 'Rutube',
   },
 ];

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

@@ -8,6 +8,7 @@
         },
         "productBlock": {
           "title": "Продуктовая галерея",
+          "headlineVersion": "XXL",
           "image": {
             "format": "webp",
             "size": {
@@ -17,20 +18,22 @@
           },
           "description": "Описание",
           "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+          "isDotted": true,
+          "benefitsVersion": "normal",
           "benefits": [
             {
               "icon": {
                 "icon": "ActualBalanceIcon"
               },
-              "label": "Денежное преимущество",
-              "description": "эмпирическая выгода"
+              "label": "Преимущество №1",
+              "description": "Описание"
             },
             {
               "icon": {
                 "icon": "BankIcon"
               },
-              "label": "Возврат %",
-              "description": "при пополнении счёта"
+              "label": "Преимущество №2",
+              "description": "Описание"
             }
           ]
         }
@@ -42,6 +45,7 @@
         },
         "productBlock": {
           "title": "Продуктовая галерея",
+          "headlineVersion": "XXL",
           "image": {
             "format": "webp",
             "size": {
@@ -51,6 +55,8 @@
           },
           "description": "Описание",
           "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+          "isDotted": true,
+          "benefitsVersion": "normal",
           "benefits": [
             {
               "icon": {

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

@@ -32,7 +32,7 @@ const getButtonStyle = (props: ButtonContent) => {
 
   return style(
     'group/btn items-center justify-center',
-    isWithText(props) ? withTextStyle : 'h-12 w-12',
+    isWithText(props) ? withTextStyle : 'h-12 w-12 m-auto',
     rounded ? 'rounded-full' : '',
   );
 };

package/package.json

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

package/src/components/Blocks.ts

@@ -11,7 +11,6 @@ import { Carousel } from './Carousel/Carousel';
 import { CarouselBankHistoryCard } from './CarouselBankHistoryCard/CarouselBankHistoryCard';
 import { CarouselCard } from './CarouselCard/CarouselCard';
 import { CarouselCatalogCard } from './CarouselCatalogCard/CarouselCatalogCard';
-import { CarouselEventCard } from './CarouselEventCard/CarouselEventCard';
 import { CarouselInvestmentCard } from './CarouselInvestmentCard/CarouselInvestmentCard';
 import { CarouselLinks } from './CarouselLinks/CarouselLinks';
 import { CarouselProductCard } from './CarouselProductCard/CarouselProductCard';
@@ -70,7 +69,6 @@ export const Blocks: BlocksRegistry = {
   CarouselBankHistoryCard,
   CarouselCard,
   CarouselCatalogCard,
-  CarouselEventCard,
   CarouselInvestmentCard,
   CarouselLinks,
   CarouselProductCard,