@redneckz/wildless-cms-uni-blocks 0.13.24 → 0.14.0

package/src/components/ApplicationForm/renderRegionDepartment.tsx

@@ -13,17 +13,17 @@ interface RegionDepartmentProps {
 }
 
 export const renderRegionDepartment = ({ regions, branches, field }: RegionDepartmentProps) => (
-  <div className="sm:flex sm:justify-between sm:gap-m sm:mb-2xl sm:border-none sm:pb-0">
-    <div className="sm:w-1/2">
+  <div className="@xl:flex @xl:justify-between @xl:gap-lg @xl:mb-2xl @xl:border-none @xl:pb-0">
+    <div className="@xl:w-1/2">
       <SelectControl
         label="Регион"
         placeholder="Выберите регион"
-        isSearch
+        isSearch={true}
         options={regions.map(({ code = '', name = '' }) => ({ key: code, text: name }))}
         {...withValidator(field('region'), defaultValidator)}
       />
     </div>
-    <div className="sm:w-1/2">
+    <div className="@xl:w-1/2">
       <SelectControl
         label="Адрес"
         placeholder="Выберите адрес"

package/src/components/ApplicationForm/renderSubmitButton.tsx

@@ -9,7 +9,7 @@ export const renderSubmitButton = (button?: SubmitButtonProps, className?: strin
   });
 
   return (
-    <button type="submit" className={style('p-m w-full sm:w-auto', buttonStyle, className)}>
+    <button type="submit" className={style('p-m w-full @xl:w-auto', buttonStyle, className)}>
       {button?.text ? button.text : 'Отправить заявку'}
     </button>
   );

package/src/components/ApplicationForm/renderWedDataOrganization.tsx

@@ -2,42 +2,60 @@ import { FormFieldRegisterer } from '../../hooks/useForm';
 import { withValidator } from '../../validation/withValidator';
 import { InputControl } from './InputControl';
 import { PhoneInputControl } from './PhoneInputControl';
-import { defaultValidator, nameValidator, phoneValidator } from './validators';
+import { defaultValidator, innValidator, nameValidator, phoneValidator } from './validators';
 import type { WedFormState } from './WedFormState';
+import { SelectControl } from './SelectControl';
+import type { Select } from './models';
 
-export const renderWedDataOrganization = (field: FormFieldRegisterer<WedFormState>) => (
-  <div>
-    <div className="sm:flex sm:justify-between sm:gap-lg">
-      <div className="sm:w-1/2">
+export const renderWedDataOrganization = (
+  field: FormFieldRegisterer<WedFormState>,
+  regions: Select[],
+) => {
+  const isCurrencyControl = field('vedTypes').value === 'currencyControl';
+
+  return (
+    <div>
+      {regions.length && isCurrencyControl ? (
+        <SelectControl
+          className="mb-s"
+          label="Регион"
+          placeholder="Выберите регион"
+          isSearch={true}
+          options={regions.map(({ code = '', name = '' }) => ({ key: code, text: name }))}
+          {...withValidator(field('region'), defaultValidator)}
+        />
+      ) : null}
+      <div className="@xl:grid @xl:grid-cols-2 @xl:gap-x-lg">
+        {isCurrencyControl ? (
+          <InputControl
+            className="w-full mb-s"
+            label="ИНН"
+            {...withValidator(field('inn'), innValidator)}
+          />
+        ) : null}
         <InputControl
-          className="shrink-0 w-full mb-s"
+          className="w-full mb-s"
           label="Наименование организации"
           {...withValidator(field('fullName'), defaultValidator)}
         />
-      </div>
-      <div className="sm:w-1/2">
         <InputControl
-          className="shrink-0 w-full mb-s"
+          className="w-full mb-s"
           label="ФИО"
           {...withValidator(field('name'), nameValidator)}
         />
-      </div>
-    </div>
-    <div className="sm:flex sm:justify-between sm:gap-lg sm:mb-2xl">
-      <div className="sm:w-1/2">
         <PhoneInputControl
-          className="shrink-0 w-full mb-s"
+          className="w-full mb-s"
           label="Телефон"
           {...withValidator(field('phone'), phoneValidator)}
         />
-      </div>
-      <div className="sm:w-1/2">
-        <InputControl
-          className="shrink-0 w-full mb-s"
-          label="Электронная почта"
-          {...withValidator(field('mail'), defaultValidator)}
-        />
+        {!isCurrencyControl ? (
+          <InputControl
+            className="w-full mb-s"
+            label="Электронная почта"
+            {...withValidator(field('mail'), defaultValidator)}
+          />
+        ) : null}
       </div>
     </div>
-  </div>
-);
+  );
+};

package/src/components/ApplicationForm/renderWedTextarea.tsx

@@ -0,0 +1,32 @@
+import { FormFieldRegisterer } from '../../hooks/useForm';
+import { Text } from '../../ui-kit/Text/Text';
+import { WedFormState } from './WedFormState';
+import { style } from '../../utils/style';
+
+const activeTextareaStyles =
+  'hover:border-primary-hover active:focus:border-primary-text focus:border-primary-text';
+export const renderWedTextarea = (field: FormFieldRegisterer<WedFormState>) => {
+  const textField = field('text');
+
+  return (
+    <label>
+      <div className="mb-xs">
+        <Text size="text-m" font="font-light">
+          Обращение
+        </Text>
+      </div>
+      <textarea
+        placeholder="Укажите интересующий вас вопрос, место ведения бизнеса и удобное время для телефонного звонка"
+        className={style(
+          'block w-full resize-y min-h-24 p-m outline-none border rounded-md border-gray',
+          activeTextareaStyles,
+        )}
+        value={textField.value}
+        onInput={
+          ((e: { target?: { value?: string } }) =>
+            textField.onChange && textField.onChange(e.target?.value || '')) as any
+        }
+      />
+    </label>
+  );
+};

package/src/components/Bonus/Bonus.tsx

@@ -6,11 +6,12 @@ import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
 import { Headline } from '../Headline/Headline';
 import type { BonusContent, BonusCountDef, BonusImageDef } from './BonusContent';
+import { AlignStyles } from '../../model/AlignStyles';
 
 export interface BonusProps extends BonusContent, UniBlockProps {}
 
 export const Bonus = JSX<BonusProps>(
-  ({ className = '', title, description, bonusItems = [], ...rest }) => (
+  ({ className = '', title, description, bonusItems = [], align = AlignStyles, ...rest }) => (
     <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
       <div className="container">
         <Headline
@@ -19,13 +20,14 @@ export const Bonus = JSX<BonusProps>(
           title={title}
           description={description}
           headlineVersion="M"
+          align={align}
         />
         <div className="flex flex-wrap w-full">
           {bonusItems.length > 0
             ? bonusItems.map((_, i) => (
                 <div
                   key={String(i)}
-                  className="space-y-xs flex flex-col grow w-full sm:w-[49%] border border-gray p-m"
+                  className="mb-3xl last:mb-0 sm:space-y-xs flex flex-col grow w-full p-4xl sm:p-m @xl:w-[49%] border border-gray"
                 >
                   <div className="grow">
                     <Headline
@@ -61,7 +63,9 @@ const renderBonusCount = (_: BonusCountDef) => (
     {_.bonusCount ? (
       // -mb-10 добавлен для выравнивания bonusCount относительно bonusName, тк шрифт font-mohave неправильно высчитывает line-height
       <div className="shrink-0 -mb-10">
-        <span className="font-mohave text-title-extra gradient-color-text">{_.bonusCount}</span>
+        <span className="font-mohave text-title-large sm:text-title-extra gradient-color-text">
+          {_.bonusCount}
+        </span>
       </div>
     ) : null}
     {_.bonusName ? (

package/src/components/Bonus/BonusContent.ts

@@ -3,6 +3,7 @@ import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
+import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
  * @title Изображение
@@ -44,4 +45,5 @@ export type BonusContent = UniBlockContent &
   HeadlineCommonProps & {
     /** @title Список плиток */
     bonusItems?: BonusItem[];
+    align?: TextAlign;
   };

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -18,12 +18,7 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
     ...rest
   }) => (
     <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
-      <Headline
-        className="mb-4xl sm:mb-3xl"
-        title={title}
-        description={subtitle}
-        headlineVersion="M"
-      />
+      <Headline title={title} description={subtitle} headlineVersion="M" />
       {bonusBenefits?.length
         ? renderBonusBenefits(bonusBenefits, columnsCount, cardTextAlign)
         : null}

package/src/components/BonusBenefitsBlock/renderBonusBenefit.tsx

@@ -1,7 +1,7 @@
 import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
-import { bonusBenefitAlign } from './bonusBenefitAlign';
+import { AlignStyles } from '../../model/AlignStyles';
 import { BonusBenefit } from './BonusBenefitsBlockContent';
 import { bonusBenefitStyles } from './bonusBenefitStyles';
 
@@ -15,13 +15,13 @@ export const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i
     )}
   >
     {title ? (
-      <Text size="text-h6" font="font-normal" align={bonusBenefitAlign}>
+      <Text size="text-h6" font="font-normal" align={AlignStyles}>
         {title}
       </Text>
     ) : null}
     {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
     {description ? (
-      <Text size="text-h6" font="font-normal" align={bonusBenefitAlign}>
+      <Text size="text-h6" font="font-normal" align={AlignStyles}>
         {description}
       </Text>
     ) : null}

package/src/components/Calculator/BonusCalculatorForm.tsx

@@ -25,8 +25,8 @@ export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
       useBonusCalculatorParams(userInputParams, sourceBookDir);
 
     return (
-      <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
-        <div className="flex flex-col gap-y-m sm:w-2/5 gap-2xl">
+      <section className={style('flex flex-col justify-between @5xl:flex-row gap-m', className)}>
+        <div className="flex flex-col gap-y-m sm:max-w-md gap-2xl">
           {renderWantedSumInput({
             title: 'Сумма покупок в категории путешествия, ₽',
             min: minSumTravel,

package/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -36,8 +36,8 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
     const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (
-      <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
-        <div className="flex flex-col gap-y-m sm:w-2/5 gap-2xl">
+      <section className={style('flex flex-col justify-between @5xl:flex-row gap-m', className)}>
+        <div className="flex flex-col gap-y-m sm:max-w-md gap-2xl">
           {renderWantedSumInput({
             title: 'Сумма, ₽',
             min: calculatorParams.minSum,

package/src/components/Calculator/CreditCalculatorForm.tsx

@@ -47,8 +47,8 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
     });
 
     return (
-      <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
-        <div className="flex flex-col gap-y-m sm:w-2/5 gap-2xl">
+      <section className={style('flex flex-col justify-between @5xl:flex-row gap-m', className)}>
+        <div className="flex flex-col gap-y-m sm:max-w-md gap-2xl">
           {renderWantedSumInput({
             title: 'Сумма кредита, ₽',
             step: 500,

package/src/components/Calculator/DepositCalculatorForm.tsx

@@ -44,8 +44,8 @@ export const DepositCalculatorForm = JSX<DepositCalculatorProp>(
     }, [defaultMonth]);
 
     return (
-      <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
-        <div className="flex flex-col gap-y-m sm:w-2/5 gap-2xl">
+      <section className={style('flex flex-col justify-between @5xl:flex-row gap-m', className)}>
+        <div className="flex flex-col gap-y-m sm:max-w-md gap-2xl">
           {renderWantedSumInput({
             title: 'Сумма, ₽',
             min: calculatorParams.minSum,

package/src/components/Calculator/RefinancingCalculatorForm.tsx

@@ -48,8 +48,8 @@ export const RefinancingCalculatorForm = JSX<RefinancingCalculatorProp>(
     );
 
     return (
-      <section className={style('flex flex-col justify-between sm:flex-row gap-m', className)}>
-        <div className="flex flex-col gap-y-m sm:w-2/5 gap-2xl">
+      <section className={style('flex flex-col justify-between @5xl:flex-row gap-m', className)}>
+        <div className="flex flex-col gap-y-m sm:max-w-md gap-2xl">
           {renderWantedSumInput({
             title: 'Остаток долга в других банках, ₽ ',
             step: 500,

package/src/components/CardTransfer/CardTransfer.tsx

@@ -55,7 +55,7 @@ export const CardTransfer = JSX<CardTransferProps>(
         {title ? (
           <Heading
             className="pb-lg xl:pb-4xl self-start xl:self-center"
-            headingType="h2"
+            headingType="h3"
             title={title}
           />
         ) : null}

package/src/components/Carousel/Carousel.example.json

@@ -3,6 +3,7 @@
   "arrowsPadded": true,
   "isCycle": false,
   "isPadding": true,
+  "isGap": true,
   "isAlignCenter": false,
   "cardSize": "normal"
 }

package/src/components/Carousel/Carousel.fixture.mobile.tsx

@@ -4,8 +4,8 @@ import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOpti
 import { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
 import { BANK_HISTORY_CARD } from '../CarouselBankHistoryCard/CarouselBankHistoryCard.fixture';
-import { CARD } from '../CarouselCard/CarouselCard.fixture.mobile';
-import { CATALOG_CARD } from '../CarouselCatalogCard/CatalogCard';
+import { CARD } from '../CarouselCard/CarouselCard.fixture';
+import { CATALOG_CARD, CATALOG_CARD_NEW } from '../CarouselCatalogCard/CarouselCatalogCard.fixture';
 import {
   PRODUCT_CARD,
   PRODUCT_CARD_SMALL,
@@ -51,10 +51,20 @@ export default {
         className="col-span-12"
         block={{
           type: 'Carousel',
-          blocks: new Array(3).fill({
-            type: 'CarouselCatalogCard',
-            content: { ...CATALOG_CARD, image: catalogImage },
-          }),
+          blocks: [
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD, image: catalogImage },
+            },
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD_NEW, image: catalogImage },
+            },
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD, image: catalogImage },
+            },
+          ],
         }}
         options={options}
       />

package/src/components/Carousel/Carousel.fixture.tsx

@@ -5,7 +5,7 @@ import { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
 import { BANK_HISTORY_CARD } from '../CarouselBankHistoryCard/CarouselBankHistoryCard.fixture';
 import { CARD, CARD_MINI, CARD_NEW } from '../CarouselCard/CarouselCard.fixture';
-import { CATALOG_CARD } from '../CarouselCatalogCard/CatalogCard';
+import { CATALOG_CARD, CATALOG_CARD_NEW } from '../CarouselCatalogCard/CarouselCatalogCard.fixture';
 import { CAROUSEL_EVENT_CARD } from '../CarouselEventCard/CarouselEventCard.fixture';
 import { INVESTMENT_CARD_WITH_SINGLE_COLUMN } from '../CarouselInvestmentCard/CarouselInvestmentCard.fixture';
 import {
@@ -77,10 +77,20 @@ export default {
         visibleItemCount={3}
         block={{
           type: 'Carousel',
-          blocks: new Array(6).fill({
-            type: 'CarouselCatalogCard',
-            content: { ...CATALOG_CARD, image: catalogImage },
-          }),
+          blocks: [
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD, image: catalogImage },
+            },
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD_NEW, image: catalogImage },
+            },
+            {
+              type: 'CarouselCatalogCard',
+              content: { ...CATALOG_CARD, image: catalogImage },
+            },
+          ],
         }}
         options={options}
       />

package/src/components/Carousel/Carousel.tsx

@@ -90,6 +90,7 @@ Carousel.childrenTypes = [
   'CarouselRichTextCard',
   'CarouselInvestmentCard',
   'CarouselEventCard',
+  'ProductBlock',
 ];
 
 Carousel.childSchema = () => ({

package/src/components/CarouselCard/CarouselCard.tsx

@@ -24,7 +24,10 @@ export const CarouselCard = JSX<CarouselCardProps>(
         <div className={style(layerStyle, 'top-6 right-8 bg-green')} />
         <div className={style(layerStyle, 'top-3 right-4 bg-green-light')} />
         <div
-          className={style(layerBaseStyle, 'relative p-xl sm:p-5xl bg-white border-green-light')}
+          className={style(
+            layerBaseStyle,
+            'relative p-xl sm:p-5xl bg-white border-transparent sm:border-green-light',
+          )}
         >
           <Headline
             title={title}

package/src/components/CarouselCatalogCard/CarouselCatalogCard.fixture.mobile.tsx

@@ -2,7 +2,36 @@ import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import { CarouselCatalogCard } from './CarouselCatalogCard';
-import { CATALOG_CARD } from './CatalogCard';
+import type { ProductColorVersion } from '../../model/ProductColorVersion';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+
+const colors: ProductColorVersion[] = ['black', 'white'];
+
+const buttonPrimary: ButtonContent = {
+  href: '/credit-cards',
+  text: 'Подробнее',
+  target: '_blank',
+  version: 'primary',
+  icon: {
+    icon: 'AppleIcon',
+  },
+};
+
+export const CATALOG_CARD = {
+  title: 'SATURN S-VI',
+  description: 'Керамическое кольцо с глянцевой поверхностью и огранкой по внешним контурам',
+  price: 5600,
+  colors: colors,
+  button: buttonPrimary,
+};
+
+export const CATALOG_CARD_NEW = {
+  title: 'SATURN S-VI',
+  description: 'Керамическое кольцо',
+  price: 5600,
+  colors: colors,
+  button: buttonPrimary,
+};
 
 const image: Picture = {
   src: 'pay-ring.png',

package/src/components/CarouselCatalogCard/CarouselCatalogCard.fixture.tsx

@@ -2,7 +2,36 @@ import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import { CarouselCatalogCard } from './CarouselCatalogCard';
-import { CATALOG_CARD } from './CatalogCard';
+import type { ProductColorVersion } from '../../model/ProductColorVersion';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+
+const COLORS: ProductColorVersion[] = ['black', 'white'];
+
+const BUTTON_PRIMARY: ButtonContent = {
+  href: '/credit-cards',
+  text: 'Подробнее',
+  target: '_blank',
+  version: 'primary',
+  icon: {
+    icon: 'AppleIcon',
+  },
+};
+
+export const CATALOG_CARD = {
+  title: 'SATURN S-VI',
+  description: 'Керамическое кольцо с глянцевой поверхностью и огранкой по внешним контурам',
+  price: 5600,
+  colors: COLORS,
+  button: BUTTON_PRIMARY,
+};
+
+export const CATALOG_CARD_NEW = {
+  title: 'SATURN S-VI',
+  description: 'Керамическое кольцо',
+  price: 5600,
+  colors: COLORS,
+  button: BUTTON_PRIMARY,
+};
 
 const image: Picture = {
   src: 'pay-ring.png',

package/src/components/CarouselCatalogCard/CarouselCatalogCard.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
@@ -17,37 +18,60 @@ const cardStyleMap: Record<ProductColorVersion, string> = {
 };
 
 export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
-  ({ className = '', title, description, image, price, button, colors, ...rest }) => (
+  ({
+    className = '',
+    title,
+    description,
+    image,
+    price,
+    button,
+    colors = [],
+    align = 'text-left',
+    padding,
+    ...rest
+  }) => (
     <BlockWrapper
       className={style('flex flex-col justify-left', className)}
       defaultPadding="p-2xl"
       {...rest}
     >
-      {image?.src ? <Img className="flex justify-center mb-xl" image={image} /> : null}
-      <Headline
-        title={title}
-        description={description}
-        headlineVersion="XS"
-        isEmbedded={true}
-        align="text-left"
-        className="mb-m"
-      />
-      {colors?.length ? (
-        <div className="flex text-secondary-text mb-m">
-          <div className="mr-xs">
-            <Text size="text-s" align="text-left" font="font-light">
-              Цвета:
-            </Text>
+      <BaseTile
+        className="h-full"
+        padding={padding}
+        title={
+          title ? (
+            <Headline
+              title={title}
+              description={description}
+              headlineVersion="XS"
+              isEmbedded={true}
+              align={align}
+            />
+          ) : null
+        }
+        rightImage={
+          image?.src ? (
+            <Img className="flex justify-center align-center mb-xl" image={image} />
+          ) : null
+        }
+        buttons={renderButtonsSection([button], { buttonClassName: 'w-full mt-lg' })}
+      >
+        {colors?.length ? (
+          <div className="flex text-secondary-text mb-m">
+            <div className="mr-xs">
+              <Text size="text-s" align="text-left" font="font-light">
+                Цвета:
+              </Text>
+            </div>
+            {colors.map(renderColorOption)}
           </div>
-          {colors.map(renderColorOption)}
-        </div>
-      ) : null}
-      {price ? (
-        <Text size="text-h3" align="text-left">
-          {price}&nbsp;₽
-        </Text>
-      ) : null}
-      {renderButtonsSection([button], { buttonClassName: 'w-full mt-lg' })}
+        ) : null}
+        {price ? (
+          <Text size="text-h3" align="text-left">
+            {price}&nbsp;₽
+          </Text>
+        ) : null}
+      </BaseTile>
     </BlockWrapper>
   ),
 );