@redneckz/wildless-cms-uni-blocks 0.4.1 → 0.4.2

package/mobile/src/components/PictureText/PictureTextContent.ts

@@ -1,29 +1,20 @@
-import { BlockVersion } from '../../model/BlockVersion';
-import type { TitleProp } from '../../model/HeadlineType';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { Picture } from '../../model/Picture';
+import type { BenefitsProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
 
-export type TitleWithImageContent = TitleProp & ImageContent;
-
-export interface PictureTextBenefit {
-  /** @title Иконка */
-  icon?: Picture;
-  /** @title Название */
-  label?: string;
-  /** @title Описание */
-  description?: string;
-}
+export type TitleWithImageContent = HeadlineCommonProps & ImageContent;
 
 /**
  * @title Картинка с текстом
  */
-export interface PictureTextContent extends TitleWithImageContent {
-  version?: BlockVersion;
-  /** @title Список преимуществ */
-  benefits?: PictureTextBenefit[];
+export interface PictureTextContent extends BenefitsProps, TitleWithImageContent {
   /**
    * @title Картинка справа/текст слева
    * @default false
    */
   directionRight?: boolean;
+  /** @title Ежемесячный лимит */
+  monthLimit?: number;
+  /** @title Страховая сумма */
+  sum?: number;
 }

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

@@ -4,33 +4,19 @@ import type { LinkProps } from '../../model/LinkProps';
 import type { ButtonContent, BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
-import type { Picture } from '../../model/Picture';
 import type { HeadlineProps } from '../../model/HeadlineType';
-
-export interface ProductBlockBenefit {
-  icon?: Picture;
-  /** @title Название */
-  label?: string;
-  /** @title Описание */
-  description?: string;
-}
-
-export type BenefitItemProps = {
-  benefit: ProductBlockBenefit;
-  version?: BlockVersion;
-  benefitsVersion?: IconVersion;
-};
+import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 
 export type ProductBlockInnerContent = HeadlineProps &
   ListContent &
   ButtonContent &
   ImageContent & {
     /**
-     * @title Преимущества
+     * @title Список преимуществ
      * @minItems 2
      * @maxItems 3
      */
-    benefits?: ProductBlockBenefit[];
+    benefits?: BenefitItemProps[];
     benefitsVersion?: IconVersion;
     version?: BlockVersion;
     /**

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

@@ -52,11 +52,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             }
           >
             {benefits?.filter((_) => _.label)?.length ? (
-              <div className="mt-3">
-                {benefits.map((benefit, i) =>
-                  renderBenefit({ benefit, version, benefitsVersion }, i),
-                )}
-              </div>
+              <div className="mt-3">{benefits.map(renderBenefit(version, benefitsVersion))}</div>
             ) : null}
             {items?.length ? (
               <List className="mt-3 text-m" items={items} version={version} isDotted={isDotted} />

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

@@ -1,44 +1,19 @@
 import type { BlockVersion } from '../../model/BlockVersion';
-import { Img } from '../../ui-kit/Img/Img';
-import type { BenefitItemProps } from './ProductBlockContent';
+import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
+import type { IconVersion } from '../../model/IconVersion';
+import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
 
-const benefitTitleStyleMap: Record<BlockVersion, string> = {
-  primary: 'text-primary-text',
-  secondary: 'text-white',
-};
-const benefitDescStyleMap: Record<BlockVersion, string> = {
-  primary: 'text-secondary-text',
-  secondary: 'text-white',
-};
-
-export function renderBenefit({ benefit, version = 'primary' }: BenefitItemProps, i: number) {
-  const isIconWhite = version === 'secondary';
-
-  return (
-    <div key={String(i)} className="flex gap-3 items-center mb-2.5 last:mb-0">
-      {benefit.icon ? (
-        <Img
-          className={renderBenefitIconBgStyle(version)}
-          image={{ ...benefit?.icon, iconVersion: isIconWhite ? 'white' : 'normal' }}
-          width="24"
-          height="24"
-          asSVG
-        />
-      ) : null}
-      <div className={`text-l m-0 ${benefitTitleStyleMap[version]}`}>{benefit.label}</div>
-      {benefit.description && (
-        <div className={`text-s ${benefitDescStyleMap[version]}`}>{benefit.description}</div>
-      )}
-    </div>
-  );
-}
-
-function renderBenefitIconBgStyle(version) {
-  let bgColorStyle = 'text-primary-main';
-
-  if (version === 'secondary') {
-    bgColorStyle = 'text-black';
-  }
-
-  return `w-6 h-6 rounded-full box-border ${bgColorStyle}`;
-}
+export const renderBenefit =
+  (version: BlockVersion = 'primary', benefitsVersion: IconVersion = 'normal') =>
+  ({ icon, label, description }: BenefitItemProps, i: number) => {
+    return (
+      <BenefitItem
+        key={String(i)}
+        icon={icon}
+        label={label}
+        description={description}
+        version={version}
+        benefitsVersion={benefitsVersion}
+      />
+    );
+  };

package/mobile/src/components/ProductTile/ProductTile.tsx

@@ -69,7 +69,7 @@ export const ProductTile = JSX<ProductTileProps>(
 
 function renderBenefits(benefits: TextBenefit[], version: BlockVersion) {
   return (
-    <div className="flex mt-4">
+    <div className="flex mt-3.5">
       {benefits.length ? (
         <div className="mr-6 gap-2.5 text-h6">{benefits.map(renderBenefitLabel)}</div>
       ) : null}

package/mobile/src/components/PromoTile/PromoTile.tsx

@@ -55,7 +55,7 @@ export const PromoTile = JSX<PromoTileProps>(
           }
           buttons={
             buttons?.length ? (
-              <ButtonSection context={context} buttons={buttons} className="flex mt-9 gap-3" />
+              <ButtonSection context={context} buttons={buttons} className="flex gap-3" />
             ) : null
           }
         >

package/mobile/src/components/Recommendation/RecommendationCard.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../types';
 import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';

package/mobile/src/components/StepsBlock/StepsBlockStyleMaps.ts

@@ -1,4 +1,4 @@
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 export type StyleType = {
   background: string;

package/mobile/src/components/__snapshots__/Blocks.spec.tsx.snap

@@ -109,7 +109,7 @@ exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without
       class="flex grow w-full justify-between"
     >
       <div
-        class="flex flex-col justify-between w-full"
+        class="flex flex-col w-full"
       >
         <div>
           <div
@@ -522,25 +522,6 @@ exports[`Blocks Headline should render block "Headline" without content 1`] = `
 />
 `;
 
-exports[`Blocks Insurance should render block "Insurance" without content 1`] = `
-<section
-  class="px-[100px] py-[50px] bg-white text-primary-text font-sans "
->
-  <section
-    class="font-sans flex flex-col p-[50px] gap-3 bg-transparent !p-0"
-  />
-  <div>
-    <div
-      class="mx-auto flex justify-center gap-[122px] mt-[30px]"
-    >
-      <div
-        class="w-[558px] m-auto"
-      />
-    </div>
-  </div>
-</section>
-`;
-
 exports[`Blocks InsuranceAmountBlock should render block "InsuranceAmountBlock" without content 1`] = `
 <section
   class="box-border py-[50px] overflow-hidden relative font-sans w-100 bg-white "
@@ -610,7 +591,7 @@ exports[`Blocks MobileAppTile should render block "MobileAppTile" without conten
       class="flex grow w-full justify-between"
     >
       <div
-        class="flex flex-col justify-between w-full"
+        class="flex flex-col w-full"
       >
         <div>
           <div
@@ -655,12 +636,16 @@ exports[`Blocks PictureText should render block "PictureText" without content 1`
 <section
   class="relative font-sans p-14 bg-white text-primary-text "
 >
-  <h3
-    class="font-sans m-0 text-h2 text-center"
+  <section
+    class="font-sans flex flex-col p-[50px] gap-3 bg-white !p-0"
   />
   <div
-    class="flex justify-center mt-9"
-  />
+    class="flex justify-center gap-[122px] mt-[30px]"
+  >
+    <div
+      class="w-[558px] m-auto"
+    />
+  </div>
 </section>
 `;
 
@@ -721,7 +706,7 @@ exports[`Blocks ProductBlock should render block "ProductBlock" without content
           class="flex grow w-full justify-between"
         >
           <div
-            class="flex flex-col justify-between w-full"
+            class="flex flex-col w-full"
           >
             <div />
           </div>
@@ -743,7 +728,7 @@ exports[`Blocks ProductGallery should render block "ProductGallery" without cont
     style="transform: translateX(-000%);"
   />
   <div
-    class="flex items-center absolute bottom-6 left-0 right-0 px-[26px] box-border"
+    class="flex items-center absolute bottom-6 left-0 right-0 px-[26px] box-border h-28"
   />
 </section>
 `;
@@ -759,7 +744,7 @@ exports[`Blocks ProductTile should render block "ProductTile" without content 1`
       class="font-sans flex flex-col p-[50px] gap-2 bg-white !p-0"
     />
     <div
-      class="flex mt-4"
+      class="flex mt-3.5"
     />
   </div>
 </section>
@@ -787,7 +772,7 @@ exports[`Blocks PromoTile should render block "PromoTile" without content 1`] =
       class="flex grow w-full justify-between"
     >
       <div
-        class="flex flex-col justify-between w-full"
+        class="flex flex-col w-full"
       >
         <div>
           <div
@@ -1203,7 +1188,7 @@ exports[`Blocks Tile should render block "Tile" without content 1`] = `
       class="flex grow w-full justify-between"
     >
       <div
-        class="flex flex-col justify-between w-full"
+        class="flex flex-col w-full"
       >
         <div />
       </div>

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

@@ -0,0 +1,58 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { BenefitItemProps, BenefitItemCommonProps } from './BenefitItemProps';
+import { Img } from '../Img/Img';
+import type { BlockVersion } from '../../model/BlockVersion';
+
+export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
+
+const titleStyleMap: Record<BlockVersion, string> = {
+  primary: 'text-primary-text',
+  secondary: 'text-white',
+};
+const descStyleMap: Record<BlockVersion, string> = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white',
+};
+
+export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
+  const {
+    className = '',
+    icon,
+    label,
+    description,
+    version = 'primary',
+    benefitsVersion = 'normal',
+  } = props;
+
+  const isIconWhite = benefitsVersion === 'white' || version === 'secondary';
+
+  return (
+    <div className={`flex items-center gap-5 ${className}`}>
+      {icon ? (
+        <Img
+          className={renderBenefitIconBgStyle(version, benefitsVersion)}
+          image={{ ...icon, iconVersion: isIconWhite ? 'white' : 'normal' }}
+          asSVG
+        />
+      ) : null}
+      <div className="gap-0.5">
+        {label ? <div className={`text-h6 ${titleStyleMap[version]}`}>{label}</div> : null}
+        {description ? (
+          <div className={`text-m-light ${descStyleMap[version]}`}>{description}</div>
+        ) : null}
+      </div>
+    </div>
+  );
+});
+
+function renderBenefitIconBgStyle(version, benefitsVersion) {
+  let bgColorStyle = 'bg-primary-main text-black';
+
+  if (version === 'secondary') {
+    bgColorStyle = 'bg-white/30 text-black';
+  } else if (benefitsVersion === 'normal') {
+    bgColorStyle = 'bg-secondary-light text-primary-main';
+  }
+
+  return `w-[50px] h-[50px] rounded-full p-[10px] box-border ${bgColorStyle}`;
+}

package/mobile/src/ui-kit/BenefitItem/BenefitItemProps.ts

@@ -0,0 +1,27 @@
+import type { Picture } from '../../model/Picture';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { IconVersion } from '../../model/IconVersion';
+
+export interface BenefitItemCommonProps {
+  benefitsVersion?: IconVersion;
+  /** @hidden */
+  version?: BlockVersion;
+  /** @hidden */
+  className?: string;
+}
+
+export type BenefitItemProps = {
+  icon?: Picture;
+  /** @title Название */
+  label?: string;
+  /** @title Описание */
+  description?: string;
+};
+
+/**
+ * @title Преимущество
+ */
+export type BenefitsProps = BenefitItemCommonProps & {
+  /** @title Список преимуществ */
+  benefits?: BenefitItemProps[];
+};

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

@@ -46,7 +46,7 @@ export const Foldable = JSX<FoldableProps>(
 
     const buttonClassName =
       foldButtonClasses ||
-      'border-none bg-primary-main px-0 py-[26px] mb-[1px] w-full font-sans text-white text-l flex justify-center cursor-pointer';
+      'border-none bg-primary-main hover:bg-primary-hover px-0 py-[26px] mb-[1px] w-full font-sans text-white text-h4 flex justify-center cursor-pointer';
     const getFoldButtonLabel = isActive ? 'Скрыть' : foldButtonLabel;
 
     return blocks ? (

package/package.json

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

package/src/components/BaseTile/BaseTile.tsx

@@ -10,9 +10,9 @@ export const BaseTile = JSX<BaseTileProps>(
       <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
         {title}
         <div className="flex grow w-full justify-between">
-          <div className="flex flex-col justify-between w-full">
+          <div className="flex flex-col w-full">
             <div>{children}</div>
-            {buttons ? <div>{buttons}</div> : null}
+            {buttons ? <div className="mt-9">{buttons}</div> : null}
           </div>
           {image}
         </div>

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -4,7 +4,7 @@ import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import type { BenefitItemProps, BenefitsBlockContent } from './BenefitsBlockContent';
-import { DescriptionType, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
+import { DescriptionDef, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
 
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
 
@@ -53,7 +53,7 @@ const renderStep = (benefit: BenefitItemProps, i: number) => {
   );
 };
 
-const renderDescription = (description?: DescriptionType) => {
+const renderDescription = (description?: DescriptionDef) => {
   const benefitType = description ? description?.benefitType : null;
   if (!benefitType) {
     return null;

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -32,7 +32,7 @@ export type ListBenefitDef = {
 /**
  * @title Вид контента
  */
-export type DescriptionType = EmptyOption | TextBenefitDef | ListBenefitDef;
+export type DescriptionDef = EmptyOption | TextBenefitDef | ListBenefitDef;
 
 /**
  * @title Преимущество
@@ -41,7 +41,7 @@ export interface BenefitItemProps {
   /** @title Название */
   label?: string;
   /** @title Описание */
-  description?: DescriptionType;
+  description?: DescriptionDef;
   icon?: Picture;
 }
 

package/src/components/BlockContent.ts

@@ -8,7 +8,6 @@ import type { GalleryContent } from './Gallery/GalleryContent';
 import type { GracePeriodContent } from './GracePeriod/GracePeriodContent';
 import type { GroupBlockContent } from './GroupBlock/GroupBlockContent';
 import type { HeaderContent } from './Header/HeaderContent';
-import type { InsuranceContent } from './Insurance/InsuranceContent';
 import type { InsuranceAmountBlockContent } from './InsuranceAmountBlock/InsuranceAmountBlockContent';
 import type { LinkDocsContent } from './LinkDocs/LinkDocsContent';
 import type { LinkListContent } from './LinkList/LinkListContent';
@@ -57,5 +56,4 @@ export type BlockContent =
   | LinkListContent
   | GroupBlockContent
   | BonusBenefitsBlockContent
-  | InsuranceContent
   | SafeDepositRentalContent;

package/src/components/Blocks.ts

@@ -12,7 +12,6 @@ import { GracePeriod } from './GracePeriod/GracePeriod';
 import { GroupBlock } from './GroupBlock/GroupBlock';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
-import { Insurance } from './Insurance/Insurance';
 import { InsuranceAmountBlock } from './InsuranceAmountBlock/InsuranceAmountBlock';
 import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MiniGallery } from './MiniGallery/MiniGallery';
@@ -47,7 +46,6 @@ export const Blocks = {
   GracePeriod,
   Header,
   Headline,
-  Insurance,
   InsuranceAmountBlock,
   LinkDocs,
   MiniGallery,

package/src/components/ContentPage/ContentPage.page.json

@@ -1947,12 +1947,51 @@
           "alt": "Варианты потребительского кредита",
           "format": "webp",
           "size": {
-            "width": 200,
-            "height": 200
+            "width": 400,
+            "height": 300
           }
         }
       }
     },
+    {
+      "type": "PictureText",
+      "style": ["col-span-12"],
+      "content": {
+        "title": "Страховые риски и продукты",
+        "description": "Описание",
+        "sum": 500000,
+        "image": {
+          "src": "insurance.png",
+          "title": "страхование",
+          "format": "webp",
+          "alt": "Страховые риски и продукты",
+          "size": {
+            "width": 400,
+            "height": 300
+          },
+          "sources": [
+            {
+              "src": "insurance.png 1x, insurance-2x.png 2x",
+              "format": "png"
+            }
+          ]
+        },
+        "benefits": [
+          {
+            "label": "Ликвидация организации",
+            "icon": {
+              "icon": "ShieldTickIcon"
+            }
+          },
+          {
+            "label": "Сокращение численности работников организации",
+            "icon": {
+              "icon": "ShieldTickIcon"
+            }
+          }
+        ]
+      }
+    },
     {
       "type": "Recommendation",
       "style": ["col-span-12"],
@@ -2144,45 +2183,6 @@
         ]
       }
     },
-    {
-      "type": "Insurance",
-      "style": ["col-span-12"],
-      "content": {
-        "title": "Страховые риски и продукты",
-        "description": "Описание",
-        "sum": 500000,
-        "image": {
-          "src": "insurance.png",
-          "title": "страхование",
-          "format": "webp",
-          "alt": "Страховые риски и продукты",
-          "size": {
-            "width": 400,
-            "height": 300
-          },
-          "sources": [
-            {
-              "src": "insurance.png 1x, insurance-2x.png 2x",
-              "format": "png"
-            }
-          ]
-        },
-        "benefits": [
-          {
-            "label": "Ликвидация организации",
-            "icon": {
-              "icon": "ShieldTickIcon"
-            }
-          },
-          {
-            "label": "Сокращение численности работников организации",
-            "icon": {
-              "icon": "ShieldTickIcon"
-            }
-          }
-        ]
-      }
-    },
     {
       "type": "InsuranceAmountBlock",
       "style": ["col-span-12"],

package/src/components/Footer/MediaButton.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { Picture } from '../../model/Picture';
 import { Img } from '../../ui-kit/Img/Img';
 

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { UniBlockProps } from '../../types';
 import { MediaButton } from './MediaButton';

package/src/components/Footer/SocialMedia.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { UniBlockProps } from '../../types';
 import { MediaButton } from './MediaButton';

package/src/components/Gallery/Gallery.mobile.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { BlockVersion } from '../../model/BlockVersion';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { ListOrientation } from '../../model/ListOrientation';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';

package/src/components/Gallery/GalleryContainer.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { GalleryVersion } from '../../model/GalleryVersion';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import { cardStyleMap, cardVersionMap, cardWidthMap, galleryLengthForScrollMap } from './constants';
 import { GalleryCardInner } from './GalleryCardInner';

package/src/components/PictureText/PictureText.example.json

@@ -4,7 +4,8 @@
   "image": {
     "format": "webp",
     "size": {
-      "width": 300
+      "width": 400,
+      "height": 300
     }
   },
   "version": "primary",
@@ -13,14 +14,16 @@
     {
       "label": "Преимущество №1",
       "icon": {
-        "icon": "DocumentTextIcon"
+        "icon": "ShieldTickIcon"
       }
     },
     {
       "label": "Преимущество №2",
       "icon": {
-        "icon": "DocumentTextIcon"
+        "icon": "ShieldTickIcon"
       }
     }
-  ]
+  ],
+  "sum": 500000,
+  "monthLimit": 25000
 }