@redneckz/wildless-cms-uni-blocks 0.5.5 → 0.5.7

package/src/components/InsuranceAmountBlock/InsuranceAmountBlockContent.ts

@@ -1,12 +1,11 @@
-import type { Picture } from '../../model/Picture';
+import type { IconProps } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Кнопка выбора программы
  */
-export type CardItem = {
-  /** @title Иконка */
-  icon?: Picture;
+export type CardItem = IconProps & {
   /** @title Страховой взнос */
   fee?: number;
   /** @title Страховая сумма */
@@ -18,21 +17,17 @@ export type CardItem = {
 /**
  * @title Вкладка
  */
-export interface InsuranceAmountBlockTabs {
-  /** @title Заголовок вкладки */
-  title?: string;
+export type InsuranceAmountBlockTab = TitleProps & {
   /** @title Содержимое вкладки */
   cards?: CardItem[];
-}
+};
 
 /**
  * @title Страховые суммы
  */
-export interface InsuranceAmountBlockContent {
-  /** @title Заголовок */
-  title?: string;
+export type InsuranceAmountBlockContent = TitleProps & {
   /** @title Список вкладок */
-  insuranceTabs?: InsuranceAmountBlockTabs[];
+  insuranceTabs?: InsuranceAmountBlockTab[];
   /** @title Кнопка */
   button?: ButtonProps;
-}
+};

package/src/components/InsuranceAmountBlock/InsuranceAmountBlockInner.tsx

@@ -6,9 +6,9 @@ import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
 import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
-import type { CardItem, InsuranceAmountBlockTabs } from './InsuranceAmountBlockContent';
+import type { CardItem, InsuranceAmountBlockTab } from './InsuranceAmountBlockContent';
 
-export interface InsuranceAmountBlockInnerProps extends InsuranceAmountBlockTabs, UniBlockProps {
+export interface InsuranceAmountBlockInnerProps extends InsuranceAmountBlockTab, UniBlockProps {
   button?: ButtonProps;
 }
 

package/src/components/MiniGallery/MiniGalleryContent.ts

@@ -1,7 +1,12 @@
-import type { GalleryContent } from '../Gallery/GalleryContent';
+import type { GalleryCardProps, GalleryContent } from '../Gallery/GalleryContent';
 
 /**
  * @title Мини-галерея
- * @minItems 4
  */
-export type MiniGalleryContent = GalleryContent;
+export interface MiniGalleryContent extends GalleryContent {
+  /**
+   * @title Карточки
+   * @minItems 4
+   */
+  cards?: GalleryCardProps[];
+}

package/src/components/MobileAppTile/MobileAppTileContent.ts

@@ -1,10 +1,9 @@
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
-import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
+import type { ListContent } from '../../ui-kit/List/ListContent';
 
 /**
  * @title Мобильное приложение
@@ -12,12 +11,26 @@ import type { Picture } from '../../model/Picture';
 export type MobileAppTileContent = HeadlineCommonProps &
   HeadingCommonProps &
   ButtonContent &
-  ListContent &
-  ImageContent & {
+  ListContent & {
     // TODO: description для мобильной версии
     /** @title QR-код */
     qr?: Picture;
     /** @title Ссылка */
     href?: string; // TODO: для мобильной версии
     version?: BlockVersion;
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 600
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *	     "width": 360,
+     *       "format": "webp",
+     *       "alignment": "center"
+     *   }]
+     * }
+     */
+    image?: Picture;
   };

package/src/components/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -30,9 +30,9 @@ const renderListItems = (itemList: OfficeServicesBlockList, i) => (
   <li key={`list_item_${String(i)}`} className="flex mb-5 last:mb-0 list-none">
     {itemList.icon ? (
       <Img
-        className="mr-3 max-w-6 max-h-6"
-        width="24px"
-        height="24px"
+        className="mr-3 min-w-6 min-h-6 w-6 h-6"
+        width="24"
+        height="24"
         asSVG
         image={itemList.icon}
       />

package/src/components/OfficeServicesBlock/OfficeServicesBlockContent.ts

@@ -1,27 +1,12 @@
-import type { Picture } from '../../model/Picture';
+import type { IconProps } from '../../model/Picture';
+import type { LabelProps, TitleProps } from '../../model/HeadlineType';
 
-export interface OfficeServicesBlockList {
-  /**
-   *  @title Иконка
-   *  @default {
-   *   "size": {
-   *     "width": 24,
-   *     "height": 24
-   *   },
-   *   "format": "webp"
-   * }
-   */
-  icon?: Picture;
-  /** @title Текст */
-  label?: string;
-}
+export type OfficeServicesBlockList = LabelProps & IconProps;
 
 /**
  * @title Офисные услуги
  */
-export interface OfficeServicesBlockContent {
-  /** @title Заголовок */
-  title?: string;
+export type OfficeServicesBlockContent = TitleProps & {
   /** @title Список услуг */
   servicesList?: OfficeServicesBlockList[];
-}
+};

package/src/components/OtherProducts/OtherProductsContent.ts

@@ -1,5 +1,6 @@
 import type { ColorPalette } from '../../types';
 import type { BlockDef } from '../../ui-kit/BlocksList/BlocksListProps';
+import type { TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Элемент списка
@@ -19,10 +20,8 @@ export interface BlockItemCommonProps {
 /**
  * @title Другие продукты
  */
-export interface OtherProductsContent {
-  /** @title Заголовок */
-  title?: string;
+export type OtherProductsContent = TitleProps & {
   /** @title Список */
   blockItems?: BlockItemCommonProps[];
   colorPalette?: ColorPalette;
-}
+};

package/src/components/PictureText/PictureText.tsx

@@ -28,7 +28,7 @@ export const PictureText = JSX<PictureTextProps>(
   }) => {
     return (
       <BlockWrapper
-        className={`relative font-sans py-12 px-28 ${VersionStyleMap[version]} ${className}`}
+        className={`relative font-sans py-12 px-24 ${VersionStyleMap[version]} ${className}`}
         context={context}
         {...rest}
       >

package/src/components/PictureText/PictureTextContent.ts

@@ -1,13 +1,27 @@
-import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { BenefitsProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-
-export type TitleWithImageContent = HeadlineCommonProps & ImageContent;
+import type { Picture } from '../../model/Picture';
+import type { BenefitsProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 /**
  * @title Картинка с текстом
  */
-export interface PictureTextContent extends BenefitsProps, TitleWithImageContent {
+export interface PictureTextContent extends BenefitsProps, HeadlineCommonProps {
+  /**
+   * @default {
+   *   "format": "webp",
+   *   "size": {
+   *       "width": 400
+   *   },
+   *   "sources": [{
+   *       "media": 1279,
+   *       "width": 240,
+   *       "format": "webp",
+   *       "alignment": "center"
+   *   }]
+   * }
+   */
+  image?: Picture;
   /**
    * @title Картинка справа/текст слева
    * @default false
@@ -17,4 +31,5 @@ export interface PictureTextContent extends BenefitsProps, TitleWithImageContent
   monthLimit?: number;
   /** @title Страховая сумма */
   sum?: number;
+  version?: BlockVersion;
 }

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

@@ -82,6 +82,7 @@ export default {
       <ProductBlock
         className="col-span-12"
         context={context}
+        backwardButton={backwardButton}
         headlineVersion="L"
         title="Потребительский кредит наличными"
         description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
@@ -90,27 +91,6 @@ export default {
         buttons={buttons}
         image={image}
       />
-      <ProductBlock
-        className="col-span-12"
-        context={context}
-        title="Потребительский кредит наличными"
-        headlineVersion="L"
-        description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
-        benefits={benefits}
-        benefitsVersion="white"
-        image={image}
-      />
-      <ProductBlock
-        className="col-span-12"
-        context={context}
-        title="Потребительский кредит наличными"
-        headlineVersion="L"
-        description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
-        benefits={benefits}
-        benefitsVersion="white"
-        image={image}
-        version="secondary"
-      />
     </div>
   ),
   'primary with color benefits': (

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -1,24 +1,27 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { HeadlineProps } from '../../model/HeadlineType';
 import type { IconVersion } from '../../model/IconVersion';
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonContent, BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
-import type { ListContent } from '../../ui-kit/List/ListContent';
-import type { HeadlineProps } from '../../model/HeadlineType';
-import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
 import type { Picture } from '../../model/Picture';
+import type { BenefitItemProps } from '../../ui-kit/BenefitItem/BenefitItemProps';
+import type { BackwardButtonProps, ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ListContent } from '../../ui-kit/List/ListContent';
 
 export type ProductBlockInnerContent = HeadlineProps &
   ListContent &
   ButtonContent & {
     /**
-     *  @title Иконка
-     *  @default
-     * {
+     * @default {
+     *   "format": "webp",
      *   "size": {
-     *     "width": 608,
-     *     "height": 299
+     *       "width": 600
      *   },
-     *   "format": "webp"
+     *   "sources": [{
+     *       "media": 1279,
+     *	     "width": 360,
+     *       "format": "webp",
+     *       "alignment": "northeast"
+     *   }]
      * }
      */
     image?: Picture;

package/src/components/ProductTile/ProductTile.fixture.tsx

@@ -141,6 +141,18 @@ export default {
       />
     </div>
   ),
+  'long-title-benefits-without-image': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        context={context}
+        className="col-span-6"
+        title="Кредит пенсионный"
+        description={'Для людей в возрасте до 75 лет'}
+        benefits={multilineBenefits}
+        buttons={buttons2}
+      />
+    </div>
+  ),
   'credit-card': (
     <div className="container grid grid-cols-12">
       <ProductTile

package/src/components/ProductTile/ProductTile.tsx

@@ -5,7 +5,7 @@ import type { ProductTileContent, TextBenefit } from './ProductTileContent';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Img } from '../../ui-kit/Img/Img';
-import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
+import type { Picture } from '../../model/Picture';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import { Headline } from '../Headline/Headline';
 import { VersionStyleMap } from '../../model/BlockVersion';
@@ -29,9 +29,8 @@ export const ProductTile = JSX<ProductTileProps>(
     return (
       <BlockWrapper
         context={context}
-        className={`overflow-hidden font-sans p-9 box-border relative justify-between grid ${className} ${
-          VersionStyleMap[version]
-        } ${getTileRightPadding(className)} ${getTileMinHeight(className)}`}
+        className={`overflow-hidden font-sans p-9 box-border relative justify-between grid min-h-[364px]
+          ${className} ${VersionStyleMap[version]} ${getTileRightPadding(className)}`}
         {...rest}
       >
         <Headline
@@ -44,8 +43,10 @@ export const ProductTile = JSX<ProductTileProps>(
           bgColorHeadline={version}
           align="left"
         />
-        {renderBenefits(benefits, version)}
-        {additionalDescription ? renderAdditionalDescription(additionalDescription, version) : null}
+        {renderBenefits(benefits, version, image)}
+        {additionalDescription
+          ? renderAdditionalDescription(additionalDescription, image, version)
+          : null}
         {buttons?.length ? (
           <ButtonSection
             context={context}
@@ -59,13 +60,14 @@ export const ProductTile = JSX<ProductTileProps>(
   },
 );
 
-// picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
-const BENEFITS_WIDTH = 'max-w-[calc(100%-186px)]';
+function renderBenefits(benefits: TextBenefit[], version: BlockVersion, image?: Picture) {
+  // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
+  const BENEFITS_WIDTH = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
 
-function renderBenefits(benefits: TextBenefit[], version: BlockVersion) {
   return (
     <div
-      className={`z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline ${BENEFITS_WIDTH}`}
+      className={`z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline 
+        ${BENEFITS_WIDTH}`}
     >
       {benefits.length ? benefits.map(renderBenefit(version)) : null}
     </div>
@@ -92,14 +94,21 @@ function renderBenefit(version: BlockVersion = 'primary') {
   };
 }
 
-function renderAdditionalDescription(additionalDescription: string, version = 'primary') {
+function renderAdditionalDescription(
+  additionalDescription: string,
+  image?: Picture,
+  version: BlockVersion = 'primary',
+) {
   const descStyleMap: Record<BlockVersion, string> = {
     primary: 'text-secondary-text',
     secondary: 'text-white',
   };
 
+  // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
+  const DESCRIPTION_WIDTH = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
+
   return (
-    <div className={`text-m-light mt-2.5 z-10 ${descStyleMap[version]}`}>
+    <div className={`text-m-light mt-2.5 z-10 ${DESCRIPTION_WIDTH} ${descStyleMap[version]}`}>
       {additionalDescription}
     </div>
   );

package/src/components/ProductTile/ProductTileContent.ts

@@ -1,21 +1,30 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { DescriptionProps, HeadlineProps, LabelProps } from '../../model/HeadlineType';
+import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
-import type { HeadlineProps } from '../../model/HeadlineType';
-import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
-export interface TextBenefit {
-  /** @title Название */
-  label?: string;
-  /** @title Описание */
-  description?: string;
-}
+export type TextBenefit = DescriptionProps & LabelProps;
 
 /**
  * @title Продуктовая плитка
  */
 export type ProductTileContent = HeadlineProps &
-  ButtonContent &
-  ImageContent & {
+  ButtonContent & {
+    /**
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 320
+     *   },
+     *   "sources": [{
+     *       "media": 1279,
+     *	     "width": 192,
+     *       "format": "webp",
+     *       "alignment": "southeast"
+     *   }]
+     * }
+     */
+    image?: Picture;
     version?: BlockVersion;
     /**
      * @title Преимущества

package/src/components/Recommendation/RecommendationContent.ts

@@ -1,15 +1,33 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { Picture } from '../../model/Picture';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
-export interface RecommendationCardTypes extends HeadlineCommonProps, ListContent, ImageContent {
+/**
+ * @title Карточка
+ */
+export interface RecommendationCardTypes extends HeadlineCommonProps, ListContent {
   /**
    * @title Соц сети
    * @minItems 3
    */
   socialMedia?: LinkCommonProps[];
+  /**
+   * @default {
+   *   "format": "webp",
+   *   "size": {
+   *       "width": 290
+   *   },
+   *   "sources": [{
+   *       "media": 1279,
+   *       "width": 174,
+   *       "format": "webp",
+   *       "alignment": "southeast"
+   *   }]
+   * }
+   */
+  image?: Picture;
 }
 
 /**

package/src/components/SafeDepositRental/SafeDepositRental.tsx

@@ -1,7 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useScript } from '../../hooks/useScript';
-import { projectSettings } from '../../ProjectSettings';
 import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -19,13 +17,6 @@ export const SafeDepositRental = JSX<SafeDepositRentalProps>(
 
     const regions = useGetRegions();
 
-    const statusScript = useScript(
-      `https://api-maps.yandex.ru/2.1/?apikey=${projectSettings.YANDEX_MAP_API_KEY}&lang=ru_RU`,
-      {
-        removeOnUnmount: true,
-      },
-    );
-
     const toggleShowMap = () => {
       setShowMap(!showMap);
     };
@@ -43,9 +34,7 @@ export const SafeDepositRental = JSX<SafeDepositRentalProps>(
           />
           {footnote ? <p className="text-s-light text-secondary-text">{footnote}</p> : null}
         </div>
-        {statusScript === 'ready' && points.length && showMap ? (
-          <YandexMap points={points} />
-        ) : null}
+        {points.length && showMap ? <YandexMap points={points} /> : null}
       </BlockWrapper>
     );
   },

package/src/components/SafeDepositRental/SafeDepositRentalContent.ts

@@ -1,9 +1,11 @@
+import type { Footnote } from '../../model/Footnote';
+import type { TitleProps } from '../../model/HeadlineType';
+
 /**
  * @title Аренда сейфовых ячеек
  */
-export interface SafeDepositRentalContent {
-  /** @title Заголовок */
-  title?: string;
-  /** @title Сноска */
-  footnote?: string;
-}
+export type SafeDepositRentalContent = Footnote &
+  TitleProps & {
+    /** @title Сноска */
+    footnote?: string;
+  };

package/src/components/SafeDepositRental/YandexMap.tsx

@@ -1,29 +1,37 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import ymaps from 'yandex-maps';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { renderClusterer } from './renderClusterer';
-
-declare let ymaps: any;
+import { useYandexMaps } from './useYandexMaps';
 
 interface YandexMapProps {
   points: number[][];
 }
 
-let Map = null;
-
 export const YandexMap = JSX<YandexMapProps>(({ points }) => {
+  const map = useRef<ymaps.Map | null>(null);
+
+  const yandexMaps = useYandexMaps();
+
   useEffect(() => {
-    ymaps.ready(() => {
-      Map = new ymaps.Map('map', {
+    yandexMaps?.ready(() => {
+      map.current = new yandexMaps.Map('map', {
         center: points[0],
         zoom: 10,
       });
-      renderClusterer(Map, points);
+      renderClusterer(yandexMaps, map.current, points);
     });
-  }, []);
+  }, [yandexMaps]);
+
+  useEffect(() => {
+    if (map.current && points && yandexMaps) {
+      renderClusterer(yandexMaps, map.current, points);
+    }
+  }, [map, points, yandexMaps]);
 
-  if (Map && points) {
-    renderClusterer(Map, points);
+  if (!yandexMaps) {
+    return null;
   }
 
   return (

package/src/components/SafeDepositRental/renderClusterer.ts

@@ -1,15 +1,16 @@
-declare let ymaps: any;
+// TODO: Fix
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import ymaps from 'yandex-maps';
 
-export function renderClusterer(Map, points) {
-  Map.geoObjects.removeAll();
+export function renderClusterer(yandexMaps: typeof ymaps, map: ymaps.Map, points: number[][]) {
+  map.geoObjects.removeAll();
 
-  const pointsList = points;
-
-  const clusterIconContentLayout = ymaps.templateLayoutFactory.createClass(
+  const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass(
     '<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>',
   );
 
-  const clusterer = new ymaps.Clusterer({
+  const clusterer = new yandexMaps.Clusterer({
     clusterIcons: [
       {
         href: 'icons/MapMarkerClusterIcon.svg',
@@ -20,26 +21,31 @@ export function renderClusterer(Map, points) {
     clusterIconContentLayout,
     clusterHideIconOnBalloonOpen: false,
     geoObjectHideIconOnBalloonOpen: false,
-  });
-
-  const geoObjects: any = [];
-
-  for (let i = 0, len = pointsList.length; i < len; i++) {
-    geoObjects[i] = new ymaps.Placemark(pointsList[i], null, {
-      iconLayout: 'default#image',
-      iconImageHref: 'icons/MapMarkerSingleIcon.svg',
-      iconImageSize: [78, 84],
-      iconImageOffset: [-35, -50],
-    });
-  }
+  } as ymaps.IClustererOptions);
+
+  const geoObjects = points.map(
+    (point) =>
+      new yandexMaps.Placemark(
+        point,
+        {},
+        {
+          iconLayout: 'default#image',
+          iconImageHref: 'icons/MapMarkerSingleIcon.svg',
+          iconImageSize: [78, 84],
+          iconImageOffset: [-35, -50],
+        },
+      ),
+  );
 
   clusterer.add(geoObjects);
 
-  Map.geoObjects.add(clusterer);
+  map.geoObjects.add(clusterer as any);
 
-  Map.setBounds(ymaps.util.bounds.fromPoints(pointsList)).then(() => {
-    if (Map.getZoom() > 10) {
-      Map.setZoom(10);
+  // TODO: Fix
+  // @ts-ignore
+  map.setBounds(yandexMaps.util.bounds.fromPoints(points)).then(() => {
+    if (map.getZoom() > 10) {
+      map.setZoom(10);
     }
   });
 }