@redneckz/wildless-cms-uni-blocks 0.10.10 → 0.11.0

package/src/components/Blocks.ts

@@ -21,10 +21,10 @@ import { CarouselRichTextCard } from './CarouselRichTextCard/CarouselRichTextCar
 import { CarouselTariffsCard } from './CarouselTariffsCard/CarouselTariffsCard';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { ContactsBlock } from './ContactsBlock/ContactsBlock';
+import { DepositFiltration } from './DepositFiltration/DepositFiltration';
 import { ErrorBlock } from './ErrorBlock/ErrorBlock';
 import { ExchangeRateOffice } from './ExchangeRateOffice/ExchangeRateOffice';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
-import { Filtration } from './Filtration/Filtration';
 import { Footer } from './Footer/Footer';
 import { GracePeriod } from './GracePeriod/GracePeriod';
 import { Header } from './Header/Header';
@@ -35,6 +35,7 @@ import { InsuranceAmountBlock } from './InsuranceAmountBlock/InsuranceAmountBloc
 import { InvestmentInfo } from './InvestmentInfo/InvestmentInfo';
 import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
+import { MortgageFiltration } from './MortgageFiltration/MortgageFiltration';
 import { OfficeMap } from './OfficeMap/OfficeMap';
 import { OfficeServicesBlock } from './OfficeServicesBlock/OfficeServicesBlock';
 import { ParagraphBlock } from './ParagraphBlock/ParagraphBlock';
@@ -44,6 +45,7 @@ import { ProductBlock } from './ProductBlock/ProductBlock';
 import { ProductGallery } from './ProductGallery/ProductGallery';
 import { ProductTile } from './ProductTile/ProductTile';
 import { PromoTile } from './PromoTile/PromoTile';
+import { RepresentativeOfficeInfo } from './RepresentativeOfficeInfo/RepresentativeOfficeInfo';
 import { RichTextBlock } from './RichTextBlock/RichTextBlock';
 import { RollupItem } from './RollupItem/RollupItem';
 import { SafeDepositRental } from './SafeDepositRental/SafeDepositRental';
@@ -55,7 +57,6 @@ import { TextBlock } from './TextBlock/TextBlock';
 import { Tile } from './Tile/Tile';
 import { VerticalLayout } from './VerticalLayout/VerticalLayout';
 import { Video } from './Video/Video';
-import { RepresentativeOfficeInfo } from './RepresentativeOfficeInfo/RepresentativeOfficeInfo';
 
 export const Blocks: BlocksRegistry = {
   ApplicationForm,
@@ -80,9 +81,9 @@ export const Blocks: BlocksRegistry = {
   CarouselTariffsCard,
   ComparisonTable,
   ContactsBlock,
+  DepositFiltration,
   ErrorBlock,
   ExchangeRateTile,
-  Filtration,
   Footer,
   GracePeriod,
   Header,
@@ -93,6 +94,7 @@ export const Blocks: BlocksRegistry = {
   InvestmentInfo,
   LinkDocs,
   MobileAppTile,
+  MortgageFiltration,
   OfficeMap,
   OfficeServicesBlock,
   ParagraphBlock,
@@ -102,6 +104,7 @@ export const Blocks: BlocksRegistry = {
   ProductGallery,
   ProductTile,
   PromoTile,
+  RepresentativeOfficeInfo,
   RichTextBlock,
   RollupItem,
   SafeDepositRental,
@@ -114,5 +117,4 @@ export const Blocks: BlocksRegistry = {
   VerticalLayout,
   Video,
   ExchangeRateOffice,
-  RepresentativeOfficeInfo,
 };

package/src/components/CarouselInvestmentCard/CarouselInvestmentCard.tsx

@@ -4,6 +4,7 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
+import { style } from '../../utils/style';
 import { BaseTile } from '../BaseTile/BaseTile';
 import type {
   CardColumnsMode,
@@ -30,48 +31,46 @@ export const CarouselInvestmentCard = JSX<CarouselInvestmentCardProps>(
     image,
     title,
     ...rest
-  }) => {
-    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 (
-      <BlockWrapper
-        className={[
-          'relative box-border text-left p-9 w-[697px]',
-          'border border-solid border-gray group-data-secondary:border-white/50',
-          className,
-        ].join(' ')}
-        {...rest}
+  }) => (
+    <BlockWrapper
+      className={style(
+        'box-border text-left p-9 w-[697px]',
+        'border border-solid border-gray group-data-secondary:border-white/50',
+        className,
+      )}
+      {...rest}
+    >
+      <BaseTile
+        title={
+          title ? <Heading headingType="h4" as="h3" className="mb-3.5 z-10" title={title} /> : null
+        }
+        backImage={image?.src ? <Img className="m-0" image={image} /> : null}
       >
-        <BaseTile title={tileTitle} image={tileImage}>
-          <div className="flex justify-between mb-4">
-            {description ? (
-              <div className="w-1/3">
-                <Text size="text-h6">{description}</Text>
-              </div>
-            ) : null}
-            {additionalDescription ? (
-              <Text size="text-m" font="font-light" color="group-data-primary:text-secondary-text">
-                {additionalDescription}
-              </Text>
-            ) : null}
-          </div>
-          {cardsList.length ? (
-            <ul
-              className={`list-none m-0 p-0 flex gap-y-2 ${cardColumnsModeStyleMap[columnsMode]}`}
-            >
-              {renderCardList(cardsList, columnsMode)}
-            </ul>
+        <div className="flex justify-between mb-4">
+          {description ? (
+            <div className="w-1/3">
+              <Text size="text-h6">{description}</Text>
+            </div>
           ) : null}
-        </BaseTile>
-      </BlockWrapper>
-    );
-  },
+          {additionalDescription ? (
+            <Text size="text-m" font="font-light" color="group-data-primary:text-secondary-text">
+              {additionalDescription}
+            </Text>
+          ) : null}
+        </div>
+        {cardsList.length ? (
+          <ul
+            className={style(
+              'list-none m-0 p-0 flex gap-y-2',
+              cardColumnsModeStyleMap[columnsMode],
+            )}
+          >
+            {renderCardList(cardsList, columnsMode)}
+          </ul>
+        ) : null}
+      </BaseTile>
+    </BlockWrapper>
+  ),
 );
 
 const renderCardList = (cardsList: CardsListItem[], columnsMode: number) => {

package/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -99,8 +99,10 @@ const renderAdditionalDescription = (additionalDescription?: string) =>
 const renderItems = (items: ListProps[], isDotted: boolean, version: BlockVersion = 'primary') =>
   items?.length ? (
     <List
-      className={`max-w-[308px] mt-2 text-s ${version === 'primary' ? '!text-secondary-text' : ''}`}
-      itemClassName="text-left"
+      className={style(
+        'max-w-[308px] mt-2 text-s',
+        version === 'primary' ? '!text-secondary-text' : '',
+      )}
       items={items.filter((item) => item?.text).map((item) => item.text as string)}
       isDotted={isDotted}
     />

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.tsx

@@ -47,9 +47,7 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
             align={align}
           />
           <div className="w-1/2 h-full flex flex-col flex-1 justify-end">
-            {items.length ? (
-              <List className="flex flex-col gap-2" itemClassName="text-l-light" items={items} />
-            ) : null}
+            {items.length ? <List items={items} listItemSize="S" /> : null}
             {socialMedia.length ? <SocialMedia className="pt-10" media={socialMedia} /> : null}
           </div>
           {renderIconBlock(icon)}

package/src/components/DepositFiltration/DepositFiltration.example.json

@@ -0,0 +1,61 @@
+{
+  "content": {
+    "filtrationSchema": {
+      "currency": {
+        "title": "Валюта",
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["rub", "usd", "eur"],
+          "enumNames": ["Рубль", "Доллар", "Евро"]
+        }
+      },
+      "options": {
+        "title": "Опции",
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["add", "withdrawal", "pensioner", "online"],
+          "enumNames": ["Пополнение", "Снятие", "Я пенсионер", "Открытие онлайн"]
+        }
+      },
+      "percents": {
+        "title": "Выплата процентов",
+        "type": "array",
+        "items": {
+          "type": "string",
+          "enum": ["inTheEnd", "eachMonth"],
+          "enumNames": ["В конце срока", "Ежемесячно"]
+        }
+      },
+      "sum": {
+        "title": "Сумма",
+        "type": "number"
+      },
+      "period": {
+        "title": "Срок",
+        "type": "object",
+        "properties": {
+          "min": {
+            "title": "Минимум",
+            "type": "number"
+          },
+          "max": {
+            "title": "Максимум",
+            "type": "number"
+          }
+        }
+      }
+    },
+    "sumInput": { "title": "Сумма" },
+    "periodInput": { "title": "Срок, месяцев", "min": 3, "max": 36 },
+    "resetButton": {
+      "text": "Очистить фильтры",
+      "version": "secondary"
+    },
+    "notFound": {
+      "title": "Нет подходящей ипотечной программы",
+      "description": "Попробуйте очистить фильтры"
+    }
+  }
+}

package/src/components/DepositFiltration/DepositFiltration.fixture.tsx

@@ -0,0 +1,190 @@
+import '../../setup-fixture';
+
+import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
+import { Blocks } from '../Blocks';
+import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
+import { DepositFiltration } from './DepositFiltration';
+import type { DepositFiltrationContent } from './DepositFiltrationContent';
+
+const CURRENCY_RUB = {
+  currency: ['rub'],
+};
+
+const CURRENCY_USD = {
+  currency: ['usd'],
+};
+
+const CURRENCY_EUR = {
+  currency: ['eur'],
+};
+
+const OPTIONS_ADD = {
+  options: ['add'],
+};
+
+const OPTIONS_WITHDRAWAL = {
+  options: ['withdrawal'],
+};
+
+const OPTIONS_PENSIONER = {
+  options: ['pensioner'],
+};
+
+const OPTIONS_ONLINE = {
+  options: ['online'],
+};
+
+const PERCENTS_IN_THE_END = {
+  percents: ['inTheEnd'],
+};
+
+const PERCENTS_EACH_MONTH = {
+  percents: ['eachMonth'],
+};
+
+const generateBlock = (...presets: any[]) => ({
+  type: 'ProductTile',
+  style: ['col-span-6'],
+  content: { ...presets.reduce((acc, p) => ({ ...acc, ...p })) },
+});
+
+const SCHEMA: DepositFiltrationContent['filtrationSchema'] = {
+  currency: {
+    title: 'Валюта',
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['rub', 'usd', 'eur'],
+      enumNames: ['Рубль', 'Доллар', 'Евро'],
+    },
+  },
+  options: {
+    title: 'Опции',
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['add', 'withdrawal', 'pensioner', 'online'],
+      enumNames: ['Пополнение', 'Снятие', 'Я пенсионер', 'Открытие онлайн'],
+    },
+  },
+  percents: {
+    title: 'Выплата процентов',
+    type: 'array',
+    items: {
+      type: 'string',
+      enum: ['inTheEnd', 'eachMonth'],
+      enumNames: ['В конце срока', 'Ежемесячно'],
+    },
+  },
+  sum: {
+    title: 'Сумма',
+    type: 'number',
+  },
+  period: {
+    title: 'Срок',
+    type: 'object',
+    properties: {
+      min: {
+        title: 'Минимум',
+        type: 'number',
+      },
+      max: {
+        title: 'Максимум',
+        type: 'number',
+      },
+    },
+  },
+};
+
+const options = {
+  blocksRegistry: Blocks,
+} as BlockRendererOptions;
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <DepositFiltration
+        className="col-span-12"
+        label="Другие ипотечные программы"
+        filtrationSchema={SCHEMA}
+        topItemsCount={2}
+        sumInput={{ title: 'Сумма' }}
+        periodInput={{ title: 'Срок, месяцев', min: 3, max: 36 }}
+        resetButton={{ text: 'Очистить фильтры', version: 'secondary' }}
+        notFound={{
+          title: 'Нет подходящей ипотечной программы',
+          description: 'Попробуйте очистить фильтры',
+        }}
+        block={{
+          type: 'DepositFiltration',
+          blocks: [
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_RUB,
+              OPTIONS_WITHDRAWAL,
+              OPTIONS_PENSIONER,
+              PERCENTS_IN_THE_END,
+              {
+                sum: 5000,
+                period: { min: 9, max: 38 },
+              },
+            ),
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_RUB,
+              OPTIONS_ADD,
+              OPTIONS_ONLINE,
+              PERCENTS_EACH_MONTH,
+              { sum: 1000, period: { min: 9, max: 38 } },
+            ),
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_USD,
+              OPTIONS_WITHDRAWAL,
+              OPTIONS_PENSIONER,
+              PERCENTS_EACH_MONTH,
+              {
+                sum: 500,
+                period: { min: 9, max: 38 },
+              },
+            ),
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_USD,
+              OPTIONS_ADD,
+              OPTIONS_PENSIONER,
+              PERCENTS_EACH_MONTH,
+              {
+                sum: 1000,
+                period: { min: 9, max: 38 },
+              },
+            ),
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_RUB,
+              OPTIONS_ADD,
+              OPTIONS_ONLINE,
+              PERCENTS_IN_THE_END,
+              {
+                sum: 1000,
+                period: { min: 9, max: 38 },
+              },
+            ),
+            generateBlock(
+              PRODUCT_TILE,
+              CURRENCY_EUR,
+              OPTIONS_ADD,
+              OPTIONS_PENSIONER,
+              PERCENTS_EACH_MONTH,
+              {
+                sum: 1000,
+                period: { min: 9, max: 38 },
+              },
+            ),
+          ],
+        }}
+        options={options}
+      />
+    </div>
+  ),
+};

package/src/components/DepositFiltration/DepositFiltration.tsx

@@ -0,0 +1,66 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useForm } from '../../hooks/useForm';
+import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
+import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
+import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
+import { InputRange } from '../../ui-kit/InputRange/InputRange';
+import { style } from '../../utils/style';
+import type { DepositFiltrationContent } from './DepositFiltrationContent';
+
+interface DepositFiltrationProps extends DepositFiltrationContent, UniBlockProps {}
+
+const initialFiltrationState = {
+  sum: 500,
+  period: {
+    min: 3,
+    max: 36,
+  },
+};
+
+const DEFAULT_MIN_MONTHS = 3;
+const DEFAULT_MAX_MONTHS = 36;
+
+const DEFAULT_MIN_SUM = 500;
+const DEFAULT_MAX_SUM = 1000000000;
+
+export const DepositFiltration: JSXBlock<DepositFiltrationProps> = JSX<DepositFiltrationProps>(
+  ({ className, filtrationSchema = {}, resetButton, sumInput, periodInput, ...rest }) => {
+    const [filtrationState, { field, reset }] = useForm(initialFiltrationState);
+
+    const maxValue = periodInput?.max || DEFAULT_MAX_MONTHS;
+
+    const Inputs = (
+      <div>
+        <CurrencyInput
+          label={sumInput?.title}
+          min={DEFAULT_MIN_SUM}
+          max={DEFAULT_MAX_SUM}
+          {...field('sum', { parse: Number, format: String })}
+        />
+        <InputRange
+          title={periodInput?.title}
+          items={['От 3 мес', 'До 3 лет']}
+          min={periodInput?.min || DEFAULT_MIN_MONTHS}
+          max={maxValue}
+          {...field('period', {
+            parse: (min) => ({ min, max: maxValue }),
+            format: ({ min }) => min,
+          })}
+        />
+      </div>
+    );
+
+    return (
+      <BlockWrapper className={style(className)} version="transparent" {...rest}>
+        {renderFiltrationForm({ field, reset, filtrationSchema, resetButton, children: Inputs })}
+        <BaseFiltrationInner filtrationState={filtrationState} {...rest} />
+      </BlockWrapper>
+    );
+  },
+);
+
+DepositFiltration.childrenTypes = ['ProductTile'];
+DepositFiltration.childSchema = (content?: DepositFiltrationContent) =>
+  content?.filtrationSchema || {};

package/src/components/DepositFiltration/DepositFiltrationContent.ts

@@ -0,0 +1,39 @@
+import type {
+  BaseFiltrationInnerContent,
+  NumberRange,
+  NumberValue,
+  StringArray,
+} from '../../ui-kit/BaseFiltration/BaseFiltrationContent';
+
+export type DepositFiltrationSchema = {
+  /** @title Валюта */
+  currency?: StringArray;
+  /** @title Опции */
+  options?: StringArray;
+  /** @title Выплата процентов */
+  percents?: StringArray;
+  /** @hidden */
+  sum?: NumberValue;
+  /** @hidden */
+  period?: NumberRange;
+};
+
+/**
+ * @title Подборщик вкладов
+ */
+export interface DepositFiltrationContent extends BaseFiltrationInnerContent {
+  /** @title Параметры фильтрации */
+  filtrationSchema?: DepositFiltrationSchema;
+  /** @title Поле ввода суммы */
+  sumInput?: {
+    /** @title Лейбл */
+    title?: string;
+  };
+  /** @title Поле ввода срока */
+  periodInput?: {
+    /** @title Лейбл */
+    title?: string;
+    min?: number;
+    max?: number;
+  };
+}

package/src/components/Footer/Footer.mobile.tsx

@@ -5,13 +5,11 @@ import { projectSettings } from '../../ProjectSettings';
 import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
-import { Img } from '../../ui-kit/Img/Img';
-import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
-import { LinkList } from '../LinkList/LinkList';
-import { MobileAppTile } from '../MobileAppTile/MobileAppTile';
+import { LinkList } from '../../ui-kit/LinkList/LinkList';
+import { style } from '../../utils/style';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
-import type { FooterContent, SubMenuItem } from './FooterContent';
+import type { FooterContent } from './FooterContent';
 import type { FooterDataProps } from './FooterDataProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
@@ -27,36 +25,29 @@ export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
     useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
 
   return (
-    <BlockWrapper tag="footer" className={`px-4 py-[26px] ${className}`} {...rest}>
-      <Contacts className="overflow-hidden" items={contacts} hasButton />
-      <div className="m-0 p-0">
+    <BlockWrapper tag="footer" className={style('px-4 py-6', className)} {...rest}>
+      <div className="mb-4 pb-5 border-b border-main-divider">
         {sitemap.topItems?.map((item, i) => (
-          <RollupItem key={String(i)} label={item?.text}>
-            <LinkList documents={item.items} />
+          <RollupItem key={String(i)} label={item?.text} labelIcon={item?.icon}>
+            <LinkList items={item.items} className="my-3" />
           </RollupItem>
         ))}
       </div>
-      <div className="mt-4">{sitemap?.dispositions?.map(renderSubMenuItem)}</div>
-      <MobileAppTile
-        title="Мобильное приложение"
-        description="Загрузить для IOS и Android"
-        {...rest}
+      <Contacts className="overflow-hidden" items={contacts} />
+      <SocialMedia className="mb-4" media={socialMedia} />
+      <Button
+        className="w-full mb-4"
+        text="Google Play"
+        version="secondary"
+        href="/"
+        target="_blank"
       />
-      <SearchBar className="grow" />
-      <SocialMedia className="pt-6 pb-6" media={socialMedia} />
-      <HorizontalNavigation title={horizontalNavigationTitle} links={relatedEnterprises} />
-      <TextInformation links={documents} />
+      <HorizontalNavigation
+        className="pt-4 pb-7 border-y border-main-divider"
+        title={horizontalNavigationTitle}
+        links={relatedEnterprises}
+      />
+      <TextInformation />
     </BlockWrapper>
   );
 });
-
-const renderSubMenuItem = (menu: SubMenuItem, i: number) => {
-  const { icon, href, text } = menu;
-
-  return (
-    <Button version="link" key={`footer-${i}`} href={href} className="flex text-s mb-4 w-6">
-      {icon ? <Img className="pr-1" image={icon} width="24" height="24" /> : null}
-      <span className="pl-2.5 font-medium text-primary-text">{text}</span>
-    </Button>
-  );
-};

package/src/components/Footer/HorizontalNavigation.mobile.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { TitleProps } from '../../model/HeadlineType';
+import { Text } from '../../ui-kit/Text/Text';
 import type { FooterLink } from './FooterLink';
 import { HorizontalNavigationLink } from './HorizontalNavigationLink';
 
@@ -8,11 +9,11 @@ export interface HorizontalNavigationProps extends FooterLink, TitleProps {}
 export const HorizontalNavigation = JSX<HorizontalNavigationProps>(
   ({ title, links, className = '' }) => (
     <div className={className}>
-      <span className="text-primary-text text-s font-medium">{title}</span>
+      <Text size="text-h6">{title}</Text>
       {links?.length ? (
-        <div className="flex flex-col gap-2 pt-3">
+        <div className="flex flex-col gap-6 mt-7">
           {links.map((_, i) => (
-            <HorizontalNavigationLink key={String(i)} index={i} className="text-s" {..._} />
+            <HorizontalNavigationLink key={String(i)} index={i} {..._} />
           ))}
         </div>
       ) : null}

package/src/components/Footer/HorizontalNavigationLink.tsx

@@ -1,6 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
+import { style } from '../../utils/style';
+import { horizontalNavigationLinkStyles } from './horizontalNavigationLinkStyles';
 
 interface HorizontalNavigationLinkProps extends LinkProps {
   className: string;
@@ -15,7 +17,7 @@ export const HorizontalNavigationLink = JSX<Partial<HorizontalNavigationLinkProp
 
     return (
       <a
-        className={`text-secondary-text hover:text-primary-main inline-block no-underline ${className}`}
+        className={style(horizontalNavigationLinkStyles, className)}
         href={href}
         target={target}
         onClick={onClick}