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

package/mobile/lib/ui-kit/BenefitItem/BenefitItemProps.d.ts

@@ -0,0 +1,24 @@
+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 declare type BenefitItemProps = {
+    icon?: Picture;
+    /** @title Название */
+    label?: string;
+    /** @title Описание */
+    description?: string;
+};
+/**
+ * @title Преимущество
+ */
+export declare type BenefitsProps = BenefitItemCommonProps & {
+    /** @title Список преимуществ */
+    benefits?: BenefitItemProps[];
+};

package/mobile/lib/ui-kit/BenefitItem/BenefitItemProps.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=BenefitItemProps.js.map

package/mobile/lib/ui-kit/BenefitItem/BenefitItemProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BenefitItemProps.js","sourceRoot":"","sources":["../../../src/ui-kit/BenefitItem/BenefitItemProps.ts"],"names":[],"mappings":""}

package/mobile/lib/ui-kit/BlockWrapper.js

@@ -8,11 +8,20 @@ export const BlockWrapper = JSX(({ anchor, className, context, children, tag = '
     const { IntersectionObserverTag } = context;
     const [shouldRenderBlock, setShouldRenderBlock] = useState(true);
     useEffect(() => EventBus.inst.subscribe('tab', (event) => {
-        setShouldRenderBlock(!labels?.length || !event.label || labels.includes(event.label));
+        if (event.type === 'group') {
+            setShouldRenderBlock(!labels?.length || !event.label || labels.includes(event.label));
+        }
+        else {
+            setShouldRenderBlock(true);
+            scrollToBlock(event.label);
+        }
     }), [labels]);
     if (!shouldRenderBlock) {
         return null;
     }
     return anchor ? (_jsx(IntersectionObserverTag, { tag: tag, className: className, observerCallback: changeHashOnObserve, observerOptions: { threshold: 1 }, anchor: anchor, children: children })) : (_jsx(Tag, { className: className, children: children }));
 });
+function scrollToBlock(label) {
+    setTimeout(() => globalThis.document.getElementById(`#${label}`)?.scrollIntoView({ behavior: 'smooth' }));
+}
 //# sourceMappingURL=BlockWrapper.js.map

package/mobile/lib/ui-kit/BlockWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AASnE,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;IACpE,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjE,SAAS,CACP,GAAG,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,KAAC,uBAAuB,IACtB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,mBAAmB,EACrC,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EACjC,MAAM,EAAE,MAAM,YAEb,QAAQ,GACe,CAC3B,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IAAC,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAC5C,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AASnE,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;IACpE,MAAM,GAAG,GAAQ,GAAG,CAAC;IAErB,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjE,SAAS,CACP,GAAG,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;SACvF;aAAM;YACL,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3B,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,KAAC,uBAAuB,IACtB,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,mBAAmB,EACrC,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EACjC,MAAM,EAAE,MAAM,YAEb,QAAQ,GACe,CAC3B,CAAC,CAAC,CAAC,CACF,KAAC,GAAG,IAAC,SAAS,EAAE,SAAS,YAAG,QAAQ,GAAO,CAC5C,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,KAAc;IACnC,UAAU,CAAC,GAAG,EAAE,CACd,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,cAAc,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CACxF,CAAC;AACJ,CAAC"}

package/mobile/lib/ui-kit/Foldable/Foldable.js

@@ -9,7 +9,7 @@ export const Foldable = JSX(({ blocks = [], hiddenBlocksNum = 0, foldButtonClass
         initialState: isUnfolded,
     });
     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 ? (_jsxs("div", { children: [renderBlocks(blocks, render, { blocksToHide, isActive, containerClasses }), hiddenBlocksNum ? (_jsxs("button", { className: buttonClassName, "data-theme": foldButtonDataTheme, onClick: handleToggle, children: [_jsx("span", { className: "pr-3", children: getFoldButtonLabel }), icon ? _jsx(Icon, { name: icon, iconVersion: "white", width: "20", height: "20", asSVG: true }) : null] })) : null] })) : null;
 });

package/mobile/lib/ui-kit/Foldable/Foldable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Foldable.js","sourceRoot":"","sources":["../../../src/ui-kit/Foldable/Foldable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAIxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAuB/E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EACC,MAAM,GAAG,EAAE,EACX,eAAe,GAAG,CAAC,EACnB,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EAChB,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAClB,EAAE,EAAE;IACH,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAE9D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC;QACxD,YAAY,EAAE,UAAU;KACzB,CAAC,CAAC;IAEH,MAAM,eAAe,GACnB,iBAAiB;QACjB,2HAA2H,CAAC;IAC9H,MAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC;IAEjE,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,0BACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,EAC1E,eAAe,CAAC,CAAC,CAAC,CACjB,kBACE,SAAS,EAAE,eAAe,gBACd,mBAAmB,EAC/B,OAAO,EAAE,YAAY,aAErB,eAAM,SAAS,EAAC,MAAM,YAAE,kBAAkB,GAAQ,EACjD,IAAI,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAC,OAAO,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,KAAK,SAAG,CAAC,CAAC,CAAC,IAAI,IAC7E,CACV,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,MAAsB,EACtB,MAAc,EACd,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAsB,EAChE,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzE,OAAO,MAAM,CACX,0BACG,aAAa,EACd,cAAK,SAAS,EAAE,GAAG,uBAAuB,IAAI,gBAAgB,EAAE,YAAG,YAAY,GAAO,IAClF,EACN,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"Foldable.js","sourceRoot":"","sources":["../../../src/ui-kit/Foldable/Foldable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAIxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAuB/E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CACzB,CAAC,EACC,MAAM,GAAG,EAAE,EACX,eAAe,GAAG,CAAC,EACnB,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EAChB,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAClB,EAAE,EAAE;IACH,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAE9D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC;QACxD,YAAY,EAAE,UAAU;KACzB,CAAC,CAAC;IAEH,MAAM,eAAe,GACnB,iBAAiB;QACjB,mJAAmJ,CAAC;IACtJ,MAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC;IAEjE,OAAO,MAAM,CAAC,CAAC,CAAC,CACd,0BACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,EAC1E,eAAe,CAAC,CAAC,CAAC,CACjB,kBACE,SAAS,EAAE,eAAe,gBACd,mBAAmB,EAC/B,OAAO,EAAE,YAAY,aAErB,eAAM,SAAS,EAAC,MAAM,YAAE,kBAAkB,GAAQ,EACjD,IAAI,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAC,OAAO,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,KAAK,SAAG,CAAC,CAAC,CAAC,IAAI,IAC7E,CACV,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,MAAsB,EACtB,MAAc,EACd,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAsB,EAChE,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzE,OAAO,MAAM,CACX,0BACG,aAAa,EACd,cAAK,SAAS,EAAE,GAAG,uBAAuB,IAAI,gBAAgB,EAAE,YAAG,YAAY,GAAO,IAClF,EACN,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC"}

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/src/components/Gallery/Gallery.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/mobile/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/mobile/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
 }

package/mobile/src/components/PictureText/PictureText.tsx

@@ -1,11 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import type { PictureTextBenefit, PictureTextContent } from './PictureTextContent';
-
-import { BlockVersion } from '../../model/BlockVersion';
+import type { PictureTextContent } from './PictureTextContent';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
+import { Headline } from '../Headline/Headline';
+import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
 
 export interface PictureTextProps extends PictureTextContent, UniBlockProps {}
 
@@ -17,56 +19,75 @@ const pictureTextStyleMap: Record<BlockVersion, string> = {
 export const PictureText = JSX<PictureTextProps>(
   ({
     className = '',
+    context,
     title,
+    description,
     image,
     benefits,
     version = 'primary',
+    sum,
+    monthLimit,
     directionRight = false,
     ...rest
   }) => {
     return (
       <BlockWrapper
         className={`relative font-sans p-14 ${pictureTextStyleMap[version]} ${className}`}
+        context={context}
         {...rest}
       >
-        <Heading headingType="h2" className="text-center" title={title} />
-        <div className={'flex justify-center mt-9'}>
+        <Headline
+          context={context}
+          className="!p-0"
+          title={title}
+          description={description}
+          headlineVersion="M"
+          bgColorHeadline={version}
+          align="center"
+        />
+        <div className={'flex justify-center gap-[122px] mt-[30px]'}>
           {image?.src && <Img className={directionRight ? 'order-2 ml-6' : 'mr-6'} image={image} />}
-          {benefits?.length ? (
-            <div className="flex flex-col">
-              {benefits.map((_, i) => renderBenefit(_, i, version))}
-            </div>
-          ) : null}
+          <div className="w-[558px] m-auto">
+            {benefits?.length ? (
+              <div className="flex flex-col gap-4">{benefits.map(renderBenefit(version))}</div>
+            ) : null}
+            {renderInsuranceSumMonth(sum, monthLimit)}
+          </div>
         </div>
       </BlockWrapper>
     );
   },
 );
 
-function renderBenefit(benefit: PictureTextBenefit, i: number, version: string) {
+const renderBenefit = (version: BlockVersion) => (benefit: BenefitItemProps, i: number) =>
+  (
+    <BenefitItem
+      key={String(i)}
+      icon={benefit.icon}
+      label={benefit.label}
+      description={benefit.description}
+      version={version}
+    />
+  );
+
+function renderInsuranceSumMonth(sum?: number, monthLimit?: number) {
+  return sum || monthLimit ? (
+    <div className="bg-main-divider rounded-md flex mt-7 gap-6 px-5 py-4">
+      {Number.isFinite(sum) ? renderValueBlock('Страховая сумма:', sum, Boolean(monthLimit)) : null}
+      {Number.isFinite(monthLimit)
+        ? renderValueBlock('Ежемесячный лимит:', monthLimit, Boolean(sum))
+        : null}
+    </div>
+  ) : null;
+}
+
+function renderValueBlock(title: string, sum = 0, isAnotherBlock = false) {
+  const widthStyle = isAnotherBlock ? 'w-fit' : 'w-full';
+
   return (
-    <div key={String(i)} className="flex flex-row mb-8">
-      {benefit.icon ? (
-        <Img
-          className="w-[48px] h-[48px] bg-main rounded-full box-border p-[12px]"
-          image={benefit.icon}
-          width="48"
-          height="48"
-          asSVG
-        />
-      ) : null}
-      <div className="flex gap-1 flex-col h-full ml-5 max-w-[490px]">
-        {benefit?.label ? (
-          <div className={`text-xl m-0 ${version === 'primary' ? 'text-primary-text' : ''}`}>
-            {benefit.label}
-          </div>
-        ) : null}
-        {benefit?.description ? (
-          <div className={`text-s ${version === 'primary' ? 'text-secondary-text' : ''}`}>
-            {benefit.description}
-          </div>
-        ) : null}
-      </div>
+    <div className={`flex justify-between items-center gap-2 w-full ${widthStyle}`}>
+      <span className="text-secondary-text text-l-light">{title}</span>
+      <span className="text-primary-main text-h6">{addSpacesBetweenNumbers(sum)} ₽</span>
     </div>
   );
 }

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/Tabs/Tabs.example.json

@@ -2,15 +2,15 @@
   "showCounter": true,
   "tabs": [
     {
-      "id": "tab1",
+      "ref": "tab1",
       "title": "Вкладка 1"
     },
     {
-      "id": "tab2",
+      "ref": "tab2",
       "title": "Вкладка 2"
     },
     {
-      "id": "tab3",
+      "ref": "tab3",
       "title": "Вкладка 3"
     }
   ]