@redneckz/wildless-cms-uni-blocks 0.6.23 → 0.6.25

package/src/components/Header/HeaderSubMenuItem.tsx

@@ -0,0 +1,61 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useIntersectionObserver } from '../../hooks/useIntersectionObserver';
+import { useLink } from '../../hooks/useLink';
+import type { BgColorVersion } from '../../model/BgColorVersion';
+import type { LinkProps } from '../../model/LinkProps';
+import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+
+export interface HeaderSubMenuItemProps extends LinkProps {
+  context: ContentPageContext;
+  className?: string;
+  active?: boolean;
+  bgColor?: BgColorVersion;
+  observerOptions?: IntersectionObserverInit;
+  onVisibilityChange?: (isIntersecting: boolean) => void;
+}
+
+export const HeaderSubMenuItem = JSX<HeaderSubMenuItemProps>(
+  ({
+    context,
+    className,
+    active,
+    bgColor,
+    observerOptions,
+    onVisibilityChange,
+    children,
+    ...linkProps
+  }) => {
+    const { handlerDecorator } = context;
+    const router = context.useRouter();
+
+    const observerCallback = useCallback(
+      (entries: IntersectionObserverEntry[]) => {
+        if (!entries.length || !onVisibilityChange) {
+          return;
+        }
+
+        // Assumption about entries order (by time)
+        const entry = entries[entries.length - 1];
+
+        onVisibilityChange(entry.isIntersecting);
+      },
+      [onVisibilityChange],
+    );
+    const ref = useIntersectionObserver<HTMLSpanElement>(observerCallback, observerOptions);
+
+    return (
+      <span ref={ref}>
+        <HeaderItem
+          className={className}
+          active={active}
+          bgColor={bgColor}
+          {...useLink({ router, handlerDecorator }, linkProps)}
+        >
+          {children}
+        </HeaderItem>
+      </span>
+    );
+  },
+);

package/src/components/InvestmentGallery/InvestmentGallery.example.json

@@ -0,0 +1,64 @@
+{
+  "title": "Заголовок блока",
+  "cards": [
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок карточки",
+      "description": "Описание",
+      "additionalDescription": "Дополнительное описание",
+      "cardList":[
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        },
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        },
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        }
+      ]
+    },
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок 2",
+      "description": "Описание 2",
+      "socialMedia": [
+        { "href": "https://t.me" },
+        { "href": "https://vk.com" },
+        { "href": "https://ok.ru" }
+      ]
+    },
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок 3",
+      "description": "Описание 3",
+      "socialMedia": [
+        { "href": "https://t.me" },
+        { "href": "https://vk.com" },
+        { "href": "https://ok.ru" }
+      ]
+    }
+  ],
+  "version": "primary"
+}

package/src/components/InvestmentGallery/InvestmentGallery.fixture.tsx

@@ -0,0 +1,79 @@
+import type { Picture } from '../../model/Picture';
+import { context } from '../../react/setup-fixture';
+import { InvestmentGallery, InvestmentGalleryProps } from './InvestmentGallery';
+
+const five: Picture = {
+  src: '5.svg',
+  format: 'webp',
+  size: {
+    width: 268,
+    height: 218,
+  },
+  title: 'five',
+};
+
+const cardListExample = [
+  {
+    parameter: 'IR',
+    parameterDesccription: 'cтрана эмитента',
+  },
+  {
+    parameter: 'RU',
+    parameterDesccription: 'страна риска',
+  },
+  {
+    parameter: '09.03.2022',
+    parameterDesccription: 'дата погашения',
+  },
+  {
+    parameter: 'Ba3',
+    parameterDesccription: 'рейтинг MOODY’S',
+  },
+  {
+    parameter: 'BB-',
+    parameterDesccription: 'рейтинг FITCH',
+  },
+  {
+    parameter: 'Borets Finance Designated Activity Company',
+    parameterDesccription: 'эмитент',
+  },
+];
+
+const cardCoomonProps = {
+  title: 'Borets Finance DAC 17/09/26',
+  description: 'BRTS-26 XS2230649225',
+  additionalDescription: 'Краткосрочная',
+};
+
+export const shortProps: InvestmentGalleryProps = {
+  context,
+  title: 'Примеры еврооблигаций (Московская Биржа)',
+  cards: [
+    {
+      ...cardCoomonProps,
+      columnsMode: 'double',
+      cardList: cardListExample,
+      image: five,
+    },
+    {
+      ...cardCoomonProps,
+      columnsMode: 'single',
+      cardList: cardListExample,
+      image: five,
+    },
+    {
+      ...cardCoomonProps,
+      columnsMode: 'double',
+      cardList: cardListExample,
+      image: five,
+    },
+  ],
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12 mb-1">
+      <InvestmentGallery className="col-span-12" {...shortProps} />
+    </div>
+  ),
+};

package/src/components/InvestmentGallery/InvestmentGallery.tsx

@@ -0,0 +1,103 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { BlockVersion } from '../../model/BlockVersion';
+import { VersionStyleMap } from '../../model/BlockVersion';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { renderArrows } from '../../ui-kit/Button/renderArrows';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { InvestmentGalleryCard } from './InvestmentGalleryCard';
+import type {
+  InvestmentGalleryCardTypes,
+  InvestmentGalleryContent,
+} from './InvestmentGalleryContent';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+
+const BLUR_BLOCK_CLASSES = 'absolute top-0 bottom-0 w-[84px]';
+const CARD_FULL_VIEW_COUNT = 1;
+
+export interface InvestmentGalleryProps extends InvestmentGalleryContent, UniBlockProps {}
+
+interface NavButtonsProps {
+  cardsCount: number;
+  activeCardIndex: number;
+  setActiveCardIndex: (number: number) => void;
+}
+
+export const InvestmentGallery = JSX<InvestmentGalleryProps>(
+  ({ context, cards = [], className = '', title, version = 'primary', ...rest }) => {
+    const [activeCardIndex, setActiveCardIndex] = useState(0);
+    const cardWidth = 525;
+
+    return (
+      <BlockWrapper
+        context={context}
+        className={`relative font-sans p-9 overflow-hidden text-center 
+        ${VersionStyleMap[version]} 
+        ${className}`}
+        {...rest}
+      >
+        {title ? <Heading headingType="h3" className="mb-9" title={title} /> : null}
+        <div>
+          <div
+            className="flex duration-1000 gap-3.5"
+            style={{ transform: `translateX(-${activeCardIndex * cardWidth}px)` }}
+            role="list"
+          >
+            {cards?.length
+              ? cards.map(renderInvestmentGalleryCard(context, className, version))
+              : null}
+          </div>
+          {renderNavButtons({
+            cardsCount: cards.length,
+            activeCardIndex,
+            setActiveCardIndex,
+          })}
+        </div>
+        <div
+          className={`${BLUR_BLOCK_CLASSES} left-0 ${
+            version === 'secondary' ? 'bg-opacity-from-main' : 'bg-opacity-from-white'
+          }`}
+        />
+        <div
+          className={`${BLUR_BLOCK_CLASSES} right-0 ${
+            version === 'secondary' ? 'bg-opacity-to-main' : 'bg-opacity-to-white'
+          }`}
+        />
+      </BlockWrapper>
+    );
+  },
+);
+
+const renderInvestmentGalleryCard =
+  (context: ContentPageContext, className: string, version?: BlockVersion) =>
+  (card: InvestmentGalleryCardTypes, i: number) =>
+    (
+      <InvestmentGalleryCard
+        key={String(i)}
+        className={className}
+        context={context}
+        version={version}
+        {...card}
+      />
+    );
+
+const renderNavButtons = ({ cardsCount, activeCardIndex, setActiveCardIndex }: NavButtonsProps) => {
+  const isUseSlider = cardsCount > CARD_FULL_VIEW_COUNT;
+  const showNextButton = isUseSlider && cardsCount - activeCardIndex > CARD_FULL_VIEW_COUNT;
+  const showPrevButton = isUseSlider && activeCardIndex > 0;
+
+  const handleNextClick = () => setActiveCardIndex(activeCardIndex + 1);
+  const handlePrevClick = () => setActiveCardIndex(activeCardIndex - 1);
+
+  return (
+    <div>
+      {renderArrows({
+        handler: [handlePrevClick, handleNextClick],
+        isShown: [showPrevButton, showNextButton],
+        btnClass: ['left-8', 'right-8'],
+        className: 'top-1/2 mt-3',
+      })}
+    </div>
+  );
+};

package/src/components/InvestmentGallery/InvestmentGallery.ui.json

@@ -0,0 +1,11 @@
+{
+  "content": {
+    "recommendations": {
+      "items": {
+        "image": {
+          "ui:field": "picture"
+        }
+      }
+    }
+  }
+}

package/src/components/InvestmentGallery/InvestmentGalleryCard.tsx

@@ -0,0 +1,91 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { BlockVersion } from '../../model/BlockVersion';
+import { BorderVersionStyleMap } from '../../model/BorderVersion';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { Description } from '../../ui-kit/Description/Description';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
+import { BaseTile } from '../BaseTile/BaseTile';
+import type {
+  CardColumnsMode,
+  CardListItem,
+  InvestmentGalleryCardTypes,
+} from './InvestmentGalleryContent';
+
+export interface RecommendationCardProps extends InvestmentGalleryCardTypes, UniBlockProps {
+  version?: BlockVersion;
+}
+const getItemListFontSize = (colValue?: string) => (colValue === 'single' ? 'text-h6' : 'text-l');
+
+const cardColumnsModeStyleMap: Record<CardColumnsMode, string> = {
+  double: 'flex gap-y-2 gap-x-10 flex-wrap',
+  single: 'flex gap-y-2 flex-col',
+};
+
+export const InvestmentGalleryCard = JSX<RecommendationCardProps>(
+  ({
+    className = '',
+    columnsMode = 'double',
+    context,
+    description,
+    additionalDescription,
+    image,
+    cardList,
+    title,
+    version = 'primary',
+  }) => {
+    const tileTitle = title ? (
+      <Heading headingType="h4" as="h3" className="mb-3.5 z-10" title={title} />
+    ) : null;
+    const tileImage = image?.src ? (
+      <Img className="absolute bottom-0 right-0 m-0" image={image} />
+    ) : null;
+
+    return (
+      <section
+        className={`relative overflow-hidden text-left border border-solid box-border
+          p-9 min-w-[697px] min-h-[319px]
+          ${BorderVersionStyleMap[version]}
+          ${className}`}
+        role="listitem"
+      >
+        <BaseTile
+          context={context}
+          className="flex justify-between"
+          title={tileTitle}
+          image={tileImage}
+        >
+          <div className="flex flex-col justify-between">
+            <div className="flex itens-center justify-between mb-4">
+              {description ? <Description className="text-h6" description={description} /> : null}
+              {additionalDescription ? (
+                <div className="text-m-light text-secondary-text"> {additionalDescription} </div>
+              ) : null}
+            </div>
+            {cardList?.length ? (
+              <div className={`${cardColumnsModeStyleMap[columnsMode]}`} role="list">
+                {renderCardList(cardList, columnsMode)}
+              </div>
+            ) : null}
+          </div>
+        </BaseTile>
+      </section>
+    );
+  },
+);
+
+const renderCardList = (cardList: CardListItem[], columnsMode: string) =>
+  cardList.map((item, i) => (
+    <div
+      key={String(i)}
+      className={columnsMode === 'double' ? 'basis-[calc(50%-20px)]' : ''}
+      role="listitem"
+    >
+      {item?.parameter ? (
+        <span className={`pr-2.5 ${getItemListFontSize(columnsMode)}`}>{item.parameter}</span>
+      ) : null}
+      {item?.parameterDesccription ? (
+        <span className="text-m-light text-secondary-text">{item.parameterDesccription}</span>
+      ) : null}
+    </div>
+  ));

package/src/components/InvestmentGallery/InvestmentGalleryContent.ts

@@ -0,0 +1,54 @@
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { Picture } from '../../model/Picture';
+import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
+
+/**
+ * @title Количество колонок в списке
+ * @enumNames [
+ *   "1 колонка",
+ *   "2 колонки",
+ *  ]
+ */
+export type CardColumnsMode = 'single' | 'double';
+
+/**
+ * @title Карточка
+ */
+export interface InvestmentGalleryCardTypes extends HeadlineCommonProps {
+  /** @title Доп. описание карточки  */
+  additionalDescription?: string;
+  /**
+   * @default {
+   *   "format": "webp",
+   *   "size": {
+   *       "width": 290
+   *   },
+   *   "sources": [{
+   *       "media": 1279,
+   *       "width": 174,
+   *       "format": "webp",
+   *       "alignment": "southeast"
+   *   }]
+   * }
+   */
+  image?: Picture;
+  columnsMode?: CardColumnsMode;
+  /** @title Описание пункта */
+  cardList?: CardListItem[];
+}
+
+export interface CardListItem {
+  /** @title Параметр */
+  parameter?: string;
+  /** @title Описание */
+  parameterDesccription?: string;
+}
+
+/**
+ * @title Карточка
+ */
+export interface InvestmentGalleryContent extends TitleProps {
+  /** @title Карточки */
+  cards?: InvestmentGalleryCardTypes[];
+  version?: BlockVersion;
+}

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/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/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -7,6 +7,7 @@ import type {
   OfficeServicesBlockContent,
   OfficeServicesBlockList,
 } from './OfficeServicesBlockContent';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface OfficeServicesBlockProps extends OfficeServicesBlockContent, UniBlockProps {}
 
@@ -36,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/PictureText/PictureText.tsx

@@ -69,8 +69,8 @@ const renderBenefit = (version: BlockVersion) => (benefit: BenefitItemProps, i:
 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)
+      {Number(sum) > 0 ? renderValueBlock('Страховая сумма:', sum, Boolean(monthLimit)) : null}
+      {Number(monthLimit) > 0
         ? renderValueBlock('Ежемесячный лимит:', monthLimit, Boolean(sum))
         : null}
     </div>
@@ -81,7 +81,7 @@ function renderValueBlock(title: string, sum = 0, isAnotherBlock = false) {
   const widthStyle = isAnotherBlock ? 'w-fit' : 'w-full';
 
   return (
-    <div className={`flex justify-between items-center gap-2 w-full ${widthStyle}`}>
+    <div className={`flex justify-between items-center gap-2 w-full whitespace-pre ${widthStyle}`}>
       <span className="text-secondary-text text-l-light">{title}</span>
       <span className="text-primary-main text-h6">{addSpacesBetweenNumbers(sum)} ₽</span>
     </div>

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,

package/src/components/ProductBlock/renderBenefit.tsx

@@ -5,8 +5,8 @@ import { BenefitItem } from '../../ui-kit/BenefitItem/BenefitItem';
 
 export const renderBenefit =
   (version: BlockVersion = 'primary', benefitsVersion: IconVersion = 'normal') =>
-  ({ icon, label, description }: BenefitItemProps, i: number) => {
-    return (
+  ({ icon, label, description }: BenefitItemProps, i: number) =>
+    (
       <BenefitItem
         key={String(i)}
         icon={icon}
@@ -16,4 +16,3 @@ export const renderBenefit =
         benefitsVersion={benefitsVersion}
       />
     );
-  };

package/src/components/ProductGallery/ProductGallery.tsx

@@ -2,9 +2,10 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { BlockVersion } from '../../model/BlockVersion';
 import { VersionStyleMap } from '../../model/BlockVersion';
+import { BorderVersionStyleMap } from '../../model/BorderVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { ContentPageContext } from '../ContentPage/ContentPageContext';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
 import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
 import type { ProductGalleryContent, ProductGalleryNav } from './ProductGalleryContent';
@@ -107,8 +108,6 @@ function renderNavButton({ slide, i, activeSlideIndex, onClick, version }: Rende
     ? 'text-secondary-text text-l-light'
     : `text-m-light ${productBlockStyleMap[version].text}`;
 
-  const additionalBorder = version === 'secondary' ? 'border-white/50' : 'border-black/50';
-
   return (
     <button
       type="button"
@@ -116,7 +115,7 @@ function renderNavButton({ slide, i, activeSlideIndex, onClick, version }: Rende
       onClick={onClick}
       aria-label={slide?.title}
       className={`box-border relative overflow-hidden border border-white/50 cursor-pointer text-left mx-1 grow basis-0
-        ${btnClassName} ${additionalBorder}
+        ${btnClassName} ${BorderVersionStyleMap[version]}
       `}
     >
       <div className="border-0 px-6">

package/src/components/Recommendation/Recommendation.tsx

@@ -1,7 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { BlockVersion } from '../../model/BlockVersion';
+import { BorderVersionStyleMap } from '../../model/BorderVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
+import { VersionStyleMap } from '../../model/BlockVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -16,17 +18,15 @@ const CARD_SHIFT = 525;
 export interface RecommendationProps extends RecommendationContent, UniBlockProps {}
 
 export const Recommendation = JSX<RecommendationProps>(
-  ({ context, recommendations = [], className = '', title, version, ...rest }) => {
+  ({ context, recommendations = [], className = '', title, version = 'primary', ...rest }) => {
     const [activeCardIndex, setActiveCardIndex] = useState(0);
 
-    const blockClassName =
-      version === 'secondary' ? 'bg-primary-main text-white' : 'bg-white text-primary-text';
-    const cardClassName = version === 'secondary' ? 'border-white/50' : 'border-main-stroke';
-
     return (
       <BlockWrapper
         context={context}
-        className={`relative font-sans p-9 overflow-hidden text-center ${blockClassName} ${className}`}
+        className={`relative font-sans p-9 overflow-hidden text-center 
+          ${VersionStyleMap[version]} 
+          ${className}`}
         {...rest}
       >
         {title ? <Heading headingType="h3" className="mb-6" title={title} /> : null}
@@ -37,7 +37,9 @@ export const Recommendation = JSX<RecommendationProps>(
             role="list"
           >
             {recommendations?.length
-              ? recommendations.map(renderRecommendationCard(context, cardClassName, version))
+              ? recommendations.map(
+                  renderRecommendationCard(context, BorderVersionStyleMap[version], version),
+                )
               : null}
           </div>
           {renderNavButtons({