@redneckz/wildless-cms-uni-blocks 0.6.22 → 0.6.24

package/src/components/LinkDocs/LinkDocsListItemBase.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { Img } from '../../ui-kit/Img/Img';
 import type { LinkDocsItem } from './LinkDocsContent';
 import type { Picture } from '../../model/Picture';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface LinkDocsListItemProps {
   className?: string;
@@ -22,7 +23,13 @@ export const LinkDocsListItemBase = JSX<LinkDocsListItemBaseProps>(
     return (
       <a className={className} role="link" {...linkProps}>
         {icon ? (
-          <Img className={iconClassName} image={icon} width="24px" height="24px" asSVG />
+          <Img
+            className={iconClassName}
+            image={getIconWithVersion(icon)}
+            width="24px"
+            height="24px"
+            asSVG
+          />
         ) : null}
         {text ? (
           <span className={textClassName}>

package/src/components/LinkList/LinkList.example.json

@@ -1,21 +1,23 @@
 {
-  "documents": [
-    {
-      "text": "Документ №1",
-      "href": "/documents/document1.doc"
-    },
-    {
-      "text": "Документ №2",
-      "href": "/documents/document2.rtf",
-      "target": "_blank"
-    },
-    {
-      "text": "Документ №3",
-      "href": "/abc3/map.jpeg"
-    },
-    {
-      "text": "Документ №4",
-      "href": "/abc/map.rar"
-    }
-  ]
+  "content": {
+    "documents": [
+      {
+        "text": "Документ №1",
+        "href": "/documents/document1.doc"
+      },
+      {
+        "text": "Документ №2",
+        "href": "/documents/document2.rtf",
+        "target": "_blank"
+      },
+      {
+        "text": "Документ №3",
+        "href": "/abc3/map.jpeg"
+      },
+      {
+        "text": "Документ №4",
+        "href": "/abc/map.rar"
+      }
+    ]
+  }
 }

package/src/components/MiniGallery/MiniGallery.example.json

@@ -1,54 +1,56 @@
 {
-  "title": "Мини-галерея",
-  "description": "Описание",
-  "cards": [
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 120,
-          "height": 70
-        }
+  "content": {
+    "title": "Мини-галерея",
+    "description": "Описание",
+    "cards": [
+      {
+        "image": {
+          "format": "webp",
+          "size": {
+            "width": 120,
+            "height": 70
+          }
+        },
+        "title": "Заголовок 1",
+        "description": "Описание 1",
+        "version": "primary"
       },
-      "title": "Заголовок 1",
-      "description": "Описание 1",
-      "version": "primary"
-    },
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 120,
-          "height": 70
-        }
+      {
+        "image": {
+          "format": "webp",
+          "size": {
+            "width": 120,
+            "height": 70
+          }
+        },
+        "title": "Заголовок 2",
+        "description": "Описание 2",
+        "version": "primary"
       },
-      "title": "Заголовок 2",
-      "description": "Описание 2",
-      "version": "primary"
-    },
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 120,
-          "height": 70
-        }
+      {
+        "image": {
+          "format": "webp",
+          "size": {
+            "width": 120,
+            "height": 70
+          }
+        },
+        "title": "Заголовок 3",
+        "description": "Описание 3",
+        "version": "primary"
       },
-      "title": "Заголовок 3",
-      "description": "Описание 3",
-      "version": "primary"
-    },
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 120,
-          "height": 70
-        }
-      },
-      "title": "Заголовок 4",
-      "description": "Описание 4",
-      "version": "primary"
-    }
-  ]
+      {
+        "image": {
+          "format": "webp",
+          "size": {
+            "width": 120,
+            "height": 70
+          }
+        },
+        "title": "Заголовок 4",
+        "description": "Описание 4",
+        "version": "primary"
+      }
+    ]
+  }
 }

package/src/components/MobileAppTile/MobileAppTile.example.json

@@ -1,34 +1,37 @@
 {
-  "items": ["Пункт 1", "Пункт 2", "Пункт 3"],
-  "image": {
-    "format": "webp",
-    "size": {
-      "width": 529,
-      "height": 345
-    }
-  },
-  "qr": {
-    "src": "data:image/png;base64,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"
-  },
-  "buttons": [
-    {
-      "aboveText": "Загрузите в",
-      "text": "App Store",
-      "icon": {
-        "icon": "AppleIcon"
-      },
-      "version": "secondary"
+  "content": {
+    "items": ["Пункт 1", "Пункт 2", "Пункт 3"],
+    "image": {
+      "format": "webp",
+      "size": {
+        "width": 529,
+        "height": 345
+      }
+    },
+    "qr": {
+      "src": "data:image/png;base64,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",
+      "alt": "QR код"
     },
-    {
-      "aboveText": "Доступно в",
-      "text": "Google Play",
-      "icon": {
-        "icon": "PlayMarketIcon"
+    "buttons": [
+      {
+        "aboveText": "Загрузите в",
+        "text": "App Store",
+        "icon": {
+          "icon": "AppleIcon"
+        },
+        "version": "secondary"
       },
-      "version": "secondary"
-    }
-  ],
-  "title": "Мобильное приложение",
-  "description": "Загрузить для IOS и Android",
-  "version": "primary"
+      {
+        "aboveText": "Доступно в",
+        "text": "Google Play",
+        "icon": {
+          "icon": "PlayMarketIcon"
+        },
+        "version": "secondary"
+      }
+    ],
+    "title": "Мобильное приложение",
+    "description": "Загрузить для IOS и Android",
+    "version": "primary"
+  }
 }

package/src/components/MobileAppTile/MobileAppTile.mobile.tsx

@@ -15,7 +15,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
         {href ? (
           <div className="flex">
             <div className="flex justify-center align-middle rounded-md bg-primary-main w-[50px] h-[50px]">
-              <Logo className="w-[33px]" bgColor="transparent" showTitle />
+              <Logo className="w-8" bgColor="transparent" showTitle />
             </div>
             <a href={href} target="_blank" className="flex flex-col justify-center pl-3">
               <div className="text-s font-medium mb-[3px]">{title}</div>

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -66,7 +66,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
           <div className="flex flex-1 items-center">
             {qr?.src ? (
               <div className={`flex justify-center mr-5 bg-white rounded-md ${containerStyle}`}>
-                <Img className="w-fit" image={qr} alt="QR-код" />
+                <Img className="w-fit" image={qr} />
               </div>
             ) : null}
             {renderList(version, items)}

package/src/components/OfficeMap/OfficeMap.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useOfficeMap } from './useOfficeMap';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { Icon } from '../../ui-kit/Icon/Icon';
+import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
 import { OFFICE_MAP } from './mockOfficeMap';
+import { nearbyOffices } from './nearbyOffices';
 import type { OfficeMapProps, WorkScheduleWeek } from './OfficeMapContent';
 import { renderCurrentDaySchedule, renderDay, renderNearbyOffice } from './renderFunctions';
-import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
-import { nearbyOffices } from './nearbyOffices';
+import { useOfficeMap } from './useOfficeMap';
 
 export const OfficeMap = JSX<UniBlockProps>(({ className = '' }) => {
   const resultOfficeMap = useOfficeMap('063') || OFFICE_MAP;

package/src/components/OfficeServicesBlock/OfficeServicesBlock.example.json

@@ -1,47 +1,49 @@
 {
-  "title": "Заголовок",
-  "servicesList": [
-    {
-      "label": "Пункт 1",
-      "icon": { 
-        "icon": "CardTickIcon"
+  "content": {
+    "title": "Заголовок",
+    "servicesList": [
+      {
+        "label": "Пункт 1",
+        "icon": {
+          "icon": "CardTickIcon"
+        }
+      },
+      {
+        "label": "Пункт 2",
+        "icon": {
+          "icon": "EmptyWalletChangeIcon"
+        }
+      },
+      {
+        "label": "Пункт 3",
+        "icon": {
+          "icon": "UserTickIcon"
+        }
+      },
+      {
+        "label": "Пункт 4",
+        "icon": {
+          "icon": "UserTickIcon"
+        }
+      },
+      {
+        "label": "Пункт 5",
+        "icon": {
+          "icon": "ShieldTickIcon"
+        }
+      },
+      {
+        "label": "Пункт 6",
+        "icon": {
+          "icon": "ShieldTickIcon"
+        }
+      },
+      {
+        "label": "Пункт 7",
+        "icon": {
+          "icon": "ShieldTickIcon"
+        }
       }
-    },
-    {
-      "label": "Пункт 2",
-      "icon": { 
-        "icon": "EmptyWalletChangeIcon" 
-      }
-    },
-    {
-      "label": "Пункт 3",
-      "icon": { 
-        "icon": "UserTickIcon" 
-      }
-    },
-    {
-      "label": "Пункт 4",
-      "icon": { 
-        "icon": "UserTickIcon" 
-      }
-    },
-    {
-      "label": "Пункт 5",
-      "icon": { 
-        "icon": "ShieldTickIcon" 
-      }
-    },
-    {
-      "label": "Пункт 6",
-      "icon": { 
-        "icon": "ShieldTickIcon" 
-      }
-    },
-    {
-      "label": "Пункт 7",
-      "icon": { 
-        "icon": "ShieldTickIcon" 
-      }
-    }
-  ]
-}
+    ]
+  }
+}

package/src/components/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -7,6 +7,7 @@ import type {
   OfficeServicesBlockContent,
   OfficeServicesBlockList,
 } from './OfficeServicesBlockContent';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface OfficeServicesBlockProps extends OfficeServicesBlockContent, UniBlockProps {}
 
@@ -20,7 +21,9 @@ export const OfficeServicesBlock = JSX<OfficeServicesBlockProps>(
         {...rest}
       >
         {title ? <Heading headingType="h5" className="mb-5" title={title} /> : null}
-        {servicesList?.length ? servicesList.map(renderListItems) : null}
+        {servicesList?.length ? (
+          <ul className="list-none m-0 p-0">{servicesList.map(renderListItems)}</ul>
+        ) : null}
       </BlockWrapper>
     );
   },
@@ -34,7 +37,7 @@ const renderListItems = (itemList: OfficeServicesBlockList, i: number) => (
         width="24"
         height="24"
         asSVG
-        image={itemList.icon}
+        image={getIconWithVersion(itemList.icon)}
       />
     ) : null}
     {itemList.label ? <span className="text-l-light">{itemList.label}</span> : null}

package/src/components/OtherProducts/OtherProducts.example.json

@@ -1,3 +1,30 @@
 {
-  "title": "Другие продукты"
+  "content": {
+    "title": "Другие продукты"
+  },
+  "blocks": [
+    {
+      "type": "OtherProductsItem",
+      "content": {
+        "label": "Другие продукты 1",
+        "isUnfolded": true
+      },
+      "blocks": [
+        {
+          "type": "Bonus",
+          "content": {
+            "title": "Начисление баллов",
+            "description": "Описание",
+            "bonusItems": [
+              {
+                "title": "Плитка 1",
+                "description": "Описание плитки 1"
+              }
+            ]
+          },
+          "style": ["col-span-12"]
+        }
+      ]
+    }
+  ]
 }

package/src/components/OtherProductsItem/OtherProductsItem.example.json

@@ -1,4 +1,22 @@
 {
-  "label": "Другие продукты N",
-  "isUnfolded": true
+  "content": {
+    "label": "Другие продукты N",
+    "isUnfolded": true
+  },
+  "blocks": [
+    {
+      "type": "Bonus",
+      "content": {
+        "title": "Начисление баллов",
+        "description": "Описание",
+        "bonusItems": [
+          {
+            "title": "Плитка 1",
+            "description": "Описание плитки 1"
+          }
+        ]
+      },
+      "style": ["col-span-12"]
+    }
+  ]
 }

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

@@ -1,31 +1,33 @@
 {
-  "title": "Блок с картинкой",
-  "description": "Описание",
-  "image": {
-    "format": "webp",
-    "size": {
-      "width": 400,
-      "height": 300
-    }
-  },
-  "version": "primary",
-  "directionRight": false,
-  "benefits": [
-    {
-      "label": "Преимущество №1",
-      "icon": {
-        "format": "webp",
-        "icon": "ShieldTickIcon"
+  "content": {
+    "title": "Блок с картинкой",
+    "description": "Описание",
+    "image": {
+      "format": "webp",
+      "size": {
+        "width": 400,
+        "height": 300
       }
     },
-    {
-      "label": "Преимущество №2",
-      "icon": {
-        "format": "webp",
-        "icon": "ShieldTickIcon"
+    "version": "primary",
+    "directionRight": false,
+    "benefits": [
+      {
+        "label": "Преимущество №1",
+        "icon": {
+          "format": "webp",
+          "icon": "ShieldTickIcon"
+        }
+      },
+      {
+        "label": "Преимущество №2",
+        "icon": {
+          "format": "webp",
+          "icon": "ShieldTickIcon"
+        }
       }
-    }
-  ],
-  "sum": 500000,
-  "monthLimit": 25000
+    ],
+    "sum": 500000,
+    "monthLimit": 25000
+  }
 }

package/src/components/ProductBlock/ProductBlock.example.json

@@ -1,40 +1,42 @@
 {
-  "title": "Продукт",
-  "description": "Описание",
-  "headlineVersion": "XL",
-  "backwardButton": {
-    "text": "Кнопка возврата",
-    "icon": { "icon": "ArrowLeftIcon" }
-  },
-  "image": {
-    "format": "webp",
-    "size": {
-      "width": 234,
-      "height": 234
-    }
-  },
-  "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
-  "isDotted": true,
-  "buttons": [
-    {
-      "text": "Кнопка",
-      "version": "secondary"
-    }
-  ],
-  "version": "primary",
-  "benefitsVersion": "normal",
-  "benefits": [
-    {
-      "label": "Преимущество №1",
-      "icon": {
-        "icon": "ClockIcon"
+  "content": {
+    "title": "Продукт",
+    "description": "Описание",
+    "headlineVersion": "XL",
+    "backwardButton": {
+      "text": "Кнопка возврата",
+      "icon": { "icon": "ArrowLeftIcon" }
+    },
+    "image": {
+      "format": "webp",
+      "size": {
+        "width": 234,
+        "height": 234
       }
     },
-    {
-      "label": "Преимущество №2",
-      "icon": {
-        "icon": "SignDocsIcon"
+    "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+    "isDotted": true,
+    "buttons": [
+      {
+        "text": "Кнопка",
+        "version": "secondary"
+      }
+    ],
+    "version": "primary",
+    "benefitsVersion": "normal",
+    "benefits": [
+      {
+        "label": "Преимущество №1",
+        "icon": {
+          "icon": "ClockIcon"
+        }
+      },
+      {
+        "label": "Преимущество №2",
+        "icon": {
+          "icon": "SignDocsIcon"
+        }
       }
-    }
-  ]
+    ]
+  }
 }

package/src/components/ProductBlock/ProductBlock.fixture.tsx

@@ -19,7 +19,7 @@ const benefits: BenefitItemProps[] = [
   {
     label: 'До 5 млн ₽',
     description: 'Кредитный лимит',
-    icon: { icon: 'CalendarTickIcon', iconVersion: 'white' },
+    icon: { icon: 'CalendarTickIcon' },
   },
   {
     label: 'От 16,9%',
@@ -141,6 +141,7 @@ export default {
         title="Потребительский кредит наличными"
         description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
         benefits={benefits}
+        benefitsVersion="white"
         buttons={buttonsSecond}
         image={image}
         version="secondary"
@@ -192,6 +193,7 @@ export default {
         title="Потребительский кредит наличными"
         description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
         benefits={benefits}
+        benefitsVersion="white"
         buttons={buttonsSecond}
         image={image}
         version="secondary"

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -20,7 +20,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     headlineVersion = 'L',
     description,
     benefits,
-    benefitsVersion = 'normal',
+    benefitsVersion,
     buttons,
     image,
     items,