@redneckz/wildless-cms-uni-blocks 0.4.4 → 0.4.6

package/src/components/BenefitsBlock/BenefitsBlock.example.json

@@ -1,5 +1,6 @@
 {
   "title": "Преимущества",
+  "benefitsBlockVersion": "primary",
   "benefitList": [
     {
       "label": "Преимущество №1",

package/src/components/BenefitsBlock/BenefitsBlock.fixture.tsx

@@ -61,6 +61,7 @@ export default {
             icon: image,
           },
         ]}
+        benefitsBlockVersion="primary"
       />
     </div>
   ),
@@ -104,10 +105,10 @@ export default {
             icon: { icon: 'GlobalIcon' },
           },
         ]}
+        benefitsBlockVersion="primary"
       />
     </div>
   ),
-
   list: (
     <div className="container grid grid-cols-12">
       <BenefitsBlock
@@ -155,4 +156,96 @@ export default {
       />
     </div>
   ),
+  'list-green': (
+    <div className="container grid grid-cols-12">
+      <BenefitsBlock
+        context={context}
+        className="col-span-12"
+        title="Преимущества кредита"
+        benefitList={[
+          {
+            label: 'Без комиссии',
+            icon: { icon: 'ClockIcon' },
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
+          },
+          {
+            label: 'Оформление по паспорту',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
+            icon: { icon: 'SignDocsIcon' },
+          },
+          {
+            label: 'Без залога и поручительства',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
+            icon: { icon: 'ComfortableCompIcon' },
+          },
+          {
+            label: 'Деньги за 3 дня',
+            description: {
+              bullets: true,
+              items: itemsList,
+              benefitType: 'list',
+            },
+            icon: { icon: 'ActualBalanceIcon' },
+          },
+        ]}
+        benefitsBlockVersion="secondary"
+      />
+    </div>
+  ),
+  'desc-icon-green': (
+    <div className="container grid grid-cols-12">
+      <BenefitsBlock
+        context={context}
+        className="col-span-12"
+        title="Преимущества кредита"
+        benefitList={[
+          {
+            label: 'Без комиссии',
+            description: {
+              name: 'Комиссия за выдачу ',
+              benefitType: 'text',
+            },
+            icon: { icon: 'MoneyIcon' },
+          },
+          {
+            label: 'Оформление',
+            description: {
+              name: 'Обеспечение ',
+              benefitType: 'text',
+            },
+            icon: { icon: 'PersonalCardIcon' },
+          },
+          {
+            label: 'Без залога ',
+            description: {
+              name: 'Единовременное перечисление ',
+              benefitType: 'text',
+            },
+            icon: { icon: 'CalendarTickIcon' },
+          },
+          {
+            label: 'Деньги за 3 дня',
+            description: {
+              name: 'Рассмотрение  ',
+              benefitType: 'text',
+            },
+            icon: { icon: 'GlobalIcon' },
+          },
+        ]}
+        benefitsBlockVersion="secondary"
+      />
+    </div>
+  ),
 };

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -3,64 +3,114 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 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 { DescriptionDef, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
+import type { BenefitsBlockContent, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
+import {
+  BenefitBlockItemProps,
+  BenefitsBlockVersion,
+  DescriptionDef,
+} from './BenefitsBlockContent';
+import { Picture } from '../../model/Picture';
 
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
 
+const benefitsBlockStyleMap = {
+  primary: 'bg-white',
+  secondary: 'bg-primary-main',
+};
+
+const benefitsTextStyleMap = {
+  primary: '',
+  secondary: 'text-white',
+};
+
+const benefitsDescriptionStyleMap = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white opacity-80',
+};
+
+const benefitsIconStyleMap = {
+  primary: 'bg-main-divider text-primary-main',
+  secondary: 'bg-white/30 text-black',
+};
+
 export const BenefitsBlock = JSX<BenefitsBlockProps>(
-  ({ className = '', title, benefitList, ...rest }) => {
+  ({ className = '', title, benefitList, benefitsBlockVersion = 'primary', ...rest }) => {
     return (
       <BlockWrapper
-        className={`font-sans text-primary-text bg-white p-12 flex flex-col items-center ${className}`}
+        className={`font-sans text-primary-text p-12 flex flex-col items-center ${className} ${benefitsBlockStyleMap[benefitsBlockVersion]}`}
         {...rest}
       >
         {title ? (
-          <Heading headingType="h3" as="h2" className="max-w-[47rem] text-center" title={title} />
+          <Heading
+            headingType="h3"
+            as="h2"
+            className={`max-w-[47rem] text-center ${benefitsTextStyleMap[benefitsBlockVersion]}`}
+            title={title}
+          />
         ) : null}
-        {benefitList?.length ? renderBenefits(benefitList) : null}
+        {benefitList?.length ? renderBenefits(benefitList, benefitsBlockVersion) : null}
       </BlockWrapper>
     );
   },
 );
 
-const renderBenefits = (benefits: BenefitItemProps[]) => {
+const renderBenefits = (
+  benefitList: BenefitBlockItemProps[],
+  benefitsBlockVersion: BenefitsBlockVersion,
+) => {
   return (
     <div className="flex flex-wrap w-full justify-center gap-x-20 mt-8">
-      {benefits.map(renderStep)}
+      {benefitList.map(renderStep(benefitsBlockVersion))}
     </div>
   );
 };
 
-const renderStep = (benefit: BenefitItemProps, i: number) => {
-  const description = benefit?.description || undefined;
+const setIconVersion = (benefitIcon: Picture, benefitsBlockVersion: BenefitsBlockVersion) => {
+  if (!benefitIcon.icon) {
+    return benefitIcon;
+  }
+  benefitIcon.iconVersion = benefitsBlockVersion === 'secondary' ? 'white' : 'normal';
 
-  return (
-    <div key={String(i)} className="flex items-center basis-1/2 max-w-[500px] mb-14">
-      {benefit?.icon?.icon ? (
-        <Img
-          className="w-[50px] h-[50px] min-w-[50px] p-3 rounded-full bg-main-divider"
-          image={benefit.icon}
-          asSVG
-        />
-      ) : null}
-      {benefit?.icon?.src ? <Img image={benefit.icon} /> : null}
-      <div className="ml-5">
-        {benefit?.label ? <h3 className="text-h6 m-0">{benefit.label}</h3> : null}
-        {renderDescription(description)}
-      </div>
-    </div>
-  );
+  return benefitIcon;
 };
 
-const renderDescription = (description?: DescriptionDef) => {
+const renderStep =
+  (benefitsBlockVersion: BenefitsBlockVersion) => (benefit: BenefitBlockItemProps, i: number) => {
+    const description = (benefit?.description || undefined) as DescriptionDef;
+
+    return (
+      <div key={String(i)} className="flex items-center basis-1/2 max-w-[500px] mb-14">
+        {benefit?.icon?.icon ? (
+          <Img
+            className={`w-[50px] h-[50px] min-w-[50px] p-3 rounded-full ${benefitsIconStyleMap[benefitsBlockVersion]}`}
+            image={setIconVersion(benefit.icon, benefitsBlockVersion)}
+            asSVG
+          />
+        ) : null}
+        {benefit?.icon?.src ? <Img image={benefit.icon} /> : null}
+        <div className="ml-5">
+          {benefit?.label ? (
+            <h3 className={`text-h6 m-0 ${benefitsTextStyleMap[benefitsBlockVersion]}`}>
+              {benefit.label}
+            </h3>
+          ) : null}
+          {renderDescription(description, benefitsBlockVersion)}
+        </div>
+      </div>
+    );
+  };
+
+const renderDescription = (
+  description: DescriptionDef,
+  benefitsBlockVersion: BenefitsBlockVersion,
+) => {
   const benefitType = description ? description?.benefitType : null;
   if (!benefitType) {
     return null;
   }
 
   return description ? (
-    <div className="text-l-light text-secondary-text mt-2">
+    <div className={`text-l-light mt-2 ${benefitsDescriptionStyleMap[benefitsBlockVersion]}`}>
       {benefitType === 'list'
         ? renderListBenefit(description as ListBenefitDef)
         : renderTextBenefit(description as TextBenefitDef)}

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -37,7 +37,7 @@ export type DescriptionDef = EmptyOption | TextBenefitDef | ListBenefitDef;
 /**
  * @title Преимущество
  */
-export interface BenefitItemProps {
+export interface BenefitBlockItemProps {
   /** @title Название */
   label?: string;
   /** @title Описание */
@@ -45,6 +45,12 @@ export interface BenefitItemProps {
   icon?: Picture;
 }
 
+/**
+ * @title Цвет блока
+ * @enumNames ["Основная", "Второстепенная"]
+ */
+export type BenefitsBlockVersion = 'primary' | 'secondary';
+
 /**
  * @title Блок преимущества
  */
@@ -53,5 +59,7 @@ export type BenefitsBlockContent = TitleProps & {
    * @title Список преимуществ
    * @maxItems 6
    */
-  benefitList?: BenefitItemProps[];
+  benefitList?: BenefitBlockItemProps[];
+  /** @default primary */
+  benefitsBlockVersion?: BenefitsBlockVersion;
 };

package/src/components/BlockContent.ts

@@ -1,6 +1,7 @@
 import type { BenefitsBlockContent } from './BenefitsBlock/BenefitsBlockContent';
 import type { BonusContent } from './Bonus/BonusContent';
 import type { BonusBenefitsBlockContent } from './BonusBenefitsBlock/BonusBenefitsBlockContent';
+import type { CardTransferContent } from './CardTransfer/CardTransferContent';
 import type { ComparisonTableContent } from './ComparisonTable/ComparisonTableContent';
 import type { ExchangeRateTileContent } from './ExchangeRateTile/ExchangeRateTileContent';
 import type { FooterContent } from './Footer/FooterContent';
@@ -20,7 +21,7 @@ import type { ProductTileContent } from './ProductTile/ProductTileContent';
 import type { PromoTileContent } from './PromoTile/PromoTileContent';
 import type { SafeDepositRentalContent } from './SafeDepositRental/SafeDepositRentalContent';
 import type { StepsBlockContent } from './StepsBlock/StepsBlockContent';
-import { TabsContent } from './Tabs/TabsContent';
+import type { TabsContent } from './Tabs/TabsContent';
 import type { TariffsTableContent } from './TariffsTable/TariffsTableContent';
 import type { TextBlockContent } from './TextBlock/TextBlockContent';
 import type { TileContent } from './Tile/TileContent';
@@ -31,6 +32,7 @@ import type { TileContent } from './Tile/TileContent';
 export type BlockContent =
   | BenefitsBlockContent
   | BonusContent
+  | CardTransferContent
   | ComparisonTableContent
   | ExchangeRateTileContent
   | FooterContent

package/src/components/Blocks.ts

@@ -4,6 +4,7 @@ import { Bonus } from './Bonus/Bonus';
 import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
 import { Calculator } from './Calculator/Calculator';
 import { Catalog } from './Catalog/Catalog';
+import { CardTransfer } from './CardTransfer/CardTransfer';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
@@ -35,6 +36,7 @@ export const Blocks = {
   Accordion,
   BenefitsBlock,
   Bonus,
+  CardTransfer,
   ComparisonTable,
   Calculator,
   Catalog,

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.fixture.tsx

@@ -13,11 +13,11 @@ export default {
         bonusBenefits={[
           {
             label: 'Более 5000 товаров',
-            icon: { icon: 'WateringCan' },
+            icon: { icon: 'WateringCanIcon' },
           },
           {
             label: '750 авиакомпаний, 1,2 млн отелей, билеты РЖД',
-            icon: { icon: 'AirPlane' },
+            icon: { icon: 'AirPlaneIcon' },
           },
           {
             label: 'Аренда автомобилей',

package/src/components/CardTransfer/CardTransfer.fixture.tsx

@@ -0,0 +1,6 @@
+import { context } from '../../react/setup-fixture';
+import { CardTransfer } from './CardTransfer';
+
+export default {
+  default: <CardTransfer context={context} />,
+};

package/src/components/CardTransfer/CardTransfer.tsx

@@ -0,0 +1,59 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import type { UniBlockProps } from '../../types';
+import type { GetButtonClassParams } from '../../ui-kit/Button/GetButtonClassParams';
+import type { CardTransferContent } from './CardTransferContent';
+import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
+import { getDisabledButtonClasses } from '../../ui-kit/Button/getDisabledButtonClasses';
+
+const AMOUNT_KEY = 'amount';
+const INPUT_LABEL = 'Сумма перевода';
+const BUTTON_TEXT = 'Далее';
+const PLACEHOLDER = '1500';
+const TITLE = 'Укажите сумму перевода';
+
+const FORM_URL = 'https://www.rshb.ru/p2p/';
+
+const BUTTON_CLASS_PARAMS: GetButtonClassParams = {
+  version: 'primary',
+  className: 'w-full h-[56px] px-9 mt-6',
+};
+
+export interface CardTransferProps extends CardTransferContent, UniBlockProps {}
+
+export const CardTransfer = JSX<CardTransferProps>(({ className = '', title = TITLE, ...rest }) => {
+  const [value, setValue] = useState<string>('');
+  const isDisabled = !Number(value);
+
+  return (
+    <BlockWrapper
+      className={`p-[50px] flex flex-col items-center font-sans bg-white ${className}`}
+      {...rest}
+    >
+      {title ? <Heading className="max-w-[684px] pb-9" headingType="h2" title={title} /> : null}
+      <form className="w-[468px]" method="POST" action={FORM_URL}>
+        <CurrencyInput
+          name={AMOUNT_KEY}
+          value={value}
+          onChange={setValue}
+          placeholder={PLACEHOLDER}
+          label={INPUT_LABEL}
+        />
+        <button
+          type="submit"
+          className={
+            isDisabled
+              ? getDisabledButtonClasses(BUTTON_CLASS_PARAMS)
+              : getRegularButtonClasses(BUTTON_CLASS_PARAMS)
+          }
+          disabled={isDisabled}
+        >
+          {BUTTON_TEXT}
+        </button>
+      </form>
+    </BlockWrapper>
+  );
+});

package/src/components/CardTransfer/CardTransferContent.ts

@@ -0,0 +1,10 @@
+/**
+ * @title Перевод с карты на карту
+ */
+export type CardTransferContent = {
+  /**
+   * @title Заголовок
+   * @hidden
+   */
+  title?: string;
+};

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

@@ -1914,8 +1914,7 @@
           "alt": "Варианты потребительского кредита",
           "format": "webp",
           "size": {
-            "width": 400,
-            "height": 300
+            "width": 300
           }
         }
       }
@@ -2198,6 +2197,10 @@
         ]
       }
     },
+    {
+      "type": "CardTransfer",
+      "style": ["col-span-12"]
+    },
     {
       "type": "SafeDepositRental",
       "style": ["col-span-12"]

package/src/components/SafeDepositRental/SafeDepositRentalTotal.tsx

@@ -17,7 +17,7 @@ export const SafeDepositRentalTotal = ({ days }: Days) => {
         {renderTotal('Цена', price + ' ₽')}
       </div>
       <div className="bg-primary-main px-10 pt-10 pb-4 text-center">
-        <Img image={{ icon: 'PackA4' }} width="290" height="257" asSVG />
+        <Img image={{ icon: 'PackA4Icon' }} width="290" height="257" asSVG />
 
         <span className="text-s-light text-white opacity-80 mt-2 inline-block">
           На рисунки изображена пачка<br></br> листов формата А4

package/src/components/TariffsTable/EmbeddableCellData.tsx

@@ -6,6 +6,7 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import { TableInnerButton, TableInnerButtonProps } from '../../ui-kit/InnerTable/InnerTableButton';
+import { TariffsTableInnerEvent } from '../../ui-kit/InnerTable/InnerTableProps';
 import { List } from '../../ui-kit/List/List';
 import type { ListProps } from '../../ui-kit/List/ListProps';
 import type { LabelDescriptionCell, TariffsTableCellIndexProps } from './TariffsTableContent';
@@ -60,8 +61,8 @@ const renderListCellData = ({ isDotted, ...rest }: ListProps) => (
 
 const renderTableCellData = JSX((props: TableInnerButtonProps) => {
   const [showBtn, setShowBtn] = useState(true);
-
-  const tariffInnerTableSubscriber = (event) => {
+  console.log(props);
+  const tariffInnerTableSubscriber = (event: TariffsTableInnerEvent) => {
     const _showBtn = (
       ['rowIdx', 'cellIdx', 'fieldIdx'] as Array<keyof TariffsTableCellIndexProps>
     ).every((key) => props[key] === event[key]);

package/src/components/TariffsTable/TariffsTableRowContainer.tsx

@@ -4,6 +4,7 @@ import { EventBus } from '../../EventBus/EventBus';
 import type { VNode } from '../../model/VNode';
 import type { UniBlockProps } from '../../types';
 import { InnerTable } from '../../ui-kit/InnerTable/InnerTable';
+import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 
 export interface TariffsTableRowContainerProps extends UniBlockProps {
   children?: VNode;
@@ -12,12 +13,16 @@ export interface TariffsTableRowContainerProps extends UniBlockProps {
 
 export const TariffsTableRowContainer = JSX<TariffsTableRowContainerProps>(
   ({ context, children, rowIdx }) => {
-    const [dataUrl, setDataUrl] = useState<string | undefined>(undefined);
+    const [tableInnerData, setTableInnerData] = useState<TariffsTableInnerContent | undefined>(
+      undefined,
+    );
 
     useEffect(
       () =>
         EventBus.inst.subscribe('tariffInnerTable', (event) => {
-          setDataUrl(rowIdx === event.rowIdx ? event.dataUrl : undefined);
+          setTableInnerData(
+            rowIdx === event.rowIdx ? { dataUrl: event.dataUrl, pdfUrl: event.pdfUrl } : undefined,
+          );
         }),
       [rowIdx],
     );
@@ -25,9 +30,9 @@ export const TariffsTableRowContainer = JSX<TariffsTableRowContainerProps>(
     return (
       <div className="self-start flex flex-col" role="row">
         <div className="flex">{children}</div>
-        {dataUrl ? (
+        {tableInnerData ? (
           <div className="origin-top animate-expansion">
-            <InnerTable context={context} dataUrl={dataUrl} />
+            <InnerTable context={context} {...tableInnerData} />
           </div>
         ) : null}
       </div>

package/src/components/TariffsTable/dataFixture.ts

@@ -1,12 +1,12 @@
+import type { Picture } from '../../model/Picture';
 import type {
+  InnerTableBlockDef,
+  LabelDescriptionCellDef,
+  ListBlockDef,
   TariffsTableColumn,
   TariffsTableContent,
   TariffsTableRowHeader,
-  LabelDescriptionCellDef,
-  ListBlockDef,
-  InnerTableBlockDef,
 } from './TariffsTableContent';
-import type { Picture } from '../../model/Picture';
 
 const title = 'Заголовок';
 const description = 'Описание предоставляемого продукта';
@@ -36,6 +36,7 @@ const LABEL_DESCRIPTION_BLOCK: LabelDescriptionCellDef = {
 const TABLE_BLOCK: InnerTableBlockDef = {
   tableCellType: 'Table',
   dataUrl: 'tariffs-inner-table-data',
+  pdfUrl: '#',
 };
 
 const DESCRIPTION_BLOCK: LabelDescriptionCellDef = {

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

@@ -8,7 +8,7 @@ exports[`Blocks Accordion should render block "Accordion" without content 1`] =
 
 exports[`Blocks BenefitsBlock should render block "BenefitsBlock" without content 1`] = `
 <section
-  class="font-sans text-primary-text bg-white p-12 flex flex-col items-center "
+  class="font-sans text-primary-text p-12 flex flex-col items-center  bg-white"
 />
 `;
 
@@ -56,6 +56,58 @@ exports[`Blocks Calculator should render block "Calculator" without content 1`]
 </section>
 `;
 
+exports[`Blocks CardTransfer should render block "CardTransfer" without content 1`] = `
+<section
+  class="p-[50px] flex flex-col items-center font-sans bg-white "
+>
+  <h3
+    class="font-sans m-0 text-h2 max-w-[684px] pb-9"
+  >
+    Укажите сумму перевода
+  </h3>
+  <form
+    action="https://www.rshb.ru/p2p/"
+    class="w-[468px]"
+    method="POST"
+  >
+    <div
+      class=""
+    >
+      <label
+        class="block text-m-light mb-2"
+      >
+        Сумма перевода
+      </label>
+      <div
+        class="h-[56px] relative flex items-center"
+      >
+        <input
+          class="text-l pl-4 pr-8 w-full h-full rounded-md border border-solid border-main-stroke"
+          max="300000"
+          min="0"
+          name="amount"
+          placeholder="1500"
+          type="number"
+          value=""
+        />
+        <span
+          class="text-xl-light absolute right-4"
+        >
+          ₽
+        </span>
+      </div>
+    </div>
+    <button
+      class="inline-block text-center font-sans select-none bg-secondary-dark text-secondary-text rounded-md w-full h-[56px] px-9 mt-6"
+      disabled=""
+      type="submit"
+    >
+      Далее
+    </button>
+  </form>
+</section>
+`;
+
 exports[`Blocks Catalog should render block "Catalog" without content 1`] = `
 <section
   class="bg-white relative font-sans p-12 overflow-hidden text-center "
@@ -215,8 +267,8 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
         </desc>
         <use
           class="text-primary-main "
-          href="icons/Logo.svg#icon"
-          xlink:href="icons/Logo.svg#icon"
+          href="icons/LogoIcon.svg#icon"
+          xlink:href="icons/LogoIcon.svg#icon"
         />
       </svg>
       <span
@@ -418,8 +470,8 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
           </desc>
           <use
             class="text-primary-main "
-            href="icons/Logo.svg#icon"
-            xlink:href="icons/Logo.svg#icon"
+            href="icons/LogoIcon.svg#icon"
+            xlink:href="icons/LogoIcon.svg#icon"
           />
         </svg>
         <span
@@ -1108,15 +1160,15 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
           width="290"
         >
           <title>
-            Иконка PackA4
+            Иконка PackA4Icon
           </title>
           <desc>
-            Иконка PackA4
+            Иконка PackA4Icon
           </desc>
           <use
             class="text-primary-main "
-            href="icons/PackA4.svg#icon"
-            xlink:href="icons/PackA4.svg#icon"
+            href="icons/PackA4Icon.svg#icon"
+            xlink:href="icons/PackA4Icon.svg#icon"
           />
         </svg>
         <span