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

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}

package/src/components/Footer/MediaButton.tsx

@@ -4,6 +4,7 @@ import { Button } from '../../ui-kit/Button/Button';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
 import { style } from '../../utils/style';
+import { buttonStylesWithText } from './buttonStylesWithText';
 
 const ICONS_MAP: Array<{
   origins: string[];
@@ -48,16 +49,6 @@ interface MediaButtonProps extends ButtonProps, IconProps {
   buttonSize?: ButtonSize;
 }
 
-const buttonSizeStyles = {
-  default: 'w-14 h-14',
-  small: 'w-12 h-12',
-};
-
-const buttonStylesWithText = (text: string, buttonSize: string) =>
-  text
-    ? ''
-    : `group/media flex items-center justify-center box-border ${buttonSizeStyles[buttonSize]}`;
-
 export const MediaButton = JSX<MediaButtonProps>(
   ({ buttonSize = 'default', rounded = false, icon, ...rest }) => {
     const { href, version, text = '' } = rest;

package/src/components/Footer/TextInformation.tsx

@@ -1,16 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { Text } from '../../ui-kit/Text/Text';
 import type { FooterLink } from './FooterLink';
 import { TextInformationLink } from './TextInformationLink';
+import { textInformationTextSize } from './textInformationTextSize';
 
 export const TextInformation = JSX<FooterLink>(({ className = '', links }) => (
   <div className={className}>
-    <div className="pt-5">
-      <span className="text-xs-light text-secondary-text">
+    <div className="pt-4 xl:pt-5">
+      <Text size={textInformationTextSize} color="text-secondary-text">
         {`\u00a9\u00A02000-${new Date().getFullYear()}\u00A0АО \u00ABРоссельхозбанк\u00BB Генеральная лицензия Банка России \u2116\u00A03349 от\u00A012.08.2015\u00A0г.`}
-      </span>
+      </Text>
     </div>
     {links?.length ? (
-      <div className="flex justify-start items-start gap-5 pt-2.5">
+      <div className="flex justify-start items-start gap-5 pt-4">
         {links.map((_, i) => (
           <TextInformationLink key={String(i)} index={i} {..._} />
         ))}

package/src/components/Footer/buttonStylesWithText.mobile.ts

@@ -0,0 +1,15 @@
+import { style } from '../../utils/style';
+import { ButtonSize } from './MediaButton';
+
+const buttonSizeStyles = {
+  default: 'w-24 h-14',
+  small: 'w-12 h-12',
+};
+
+export const buttonStylesWithText = (text: string, buttonSize: ButtonSize) =>
+  text
+    ? ''
+    : style(
+        'group/media flex items-center justify-center box-border',
+        buttonSizeStyles[buttonSize],
+      );

package/src/components/Footer/buttonStylesWithText.ts

@@ -0,0 +1,15 @@
+import { style } from '../../utils/style';
+import { ButtonSize } from './MediaButton';
+
+const buttonSizeStyles = {
+  default: 'w-14 h-14',
+  small: 'w-12 h-12',
+};
+
+export const buttonStylesWithText = (text: string, buttonSize: ButtonSize) =>
+  text
+    ? ''
+    : style(
+        'group/media flex items-center justify-center box-border',
+        buttonSizeStyles[buttonSize],
+      );

package/src/components/Footer/horizontalNavigationLinkStyles.mobile.ts

@@ -0,0 +1 @@
+export const horizontalNavigationLinkStyles = '';

package/src/components/Footer/horizontalNavigationLinkStyles.ts

@@ -0,0 +1 @@
+export const horizontalNavigationLinkStyles = 'text-secondary-text';

package/src/components/Footer/textInformationTextSize.mobile.ts

@@ -0,0 +1 @@
+export const textInformationTextSize = 'text-s';

package/src/components/Footer/textInformationTextSize.ts

@@ -0,0 +1 @@
+export const textInformationTextSize = 'text-xs-light';

package/src/components/Header/Header.mobile.tsx

@@ -12,7 +12,7 @@ import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
 import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
-import { LinkList } from '../LinkList/LinkList';
+import { LinkList } from '../../ui-kit/LinkList/LinkList';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { HeaderBurger } from './HeaderBurger';
 import type { HeaderContent } from './HeaderContent';
@@ -67,7 +67,7 @@ export const Header = JSX<HeaderProps>(
             <div className="list-none m-0 p-0">
               {topItems?.map((item, i) => (
                 <RollupItem key={String(i)} label={item.text}>
-                  <LinkList documents={item.items} />
+                  <LinkList className="mt-2.5" items={item.items} />
                 </RollupItem>
               ))}
             </div>

package/src/components/InvestmentInfo/InvestmentInfo.tsx

@@ -60,12 +60,7 @@ export const InvestmentInfo = JSX<InvestmentInfoProps>((props) => {
         ) : null}
 
         {items?.length ? (
-          <List
-            className="mt-9 text-l-light max-w-[657px]"
-            items={items}
-            itemClassName="mb-[7px]"
-            isDotted={isDotted}
-          />
+          <List className="mt-9 max-w-[657px]" items={items} isDotted={isDotted} listItemSize="M" />
         ) : null}
       </div>
     </BlockWrapper>

package/src/components/LinkDocs/LinkDocs.ui.json

@@ -1 +1,9 @@
-{}
+{
+  "content": {
+    "documents": {
+      "items": {
+        "ui:field": "document"
+      }
+    }
+  }
+}

package/src/components/MobileAppTile/MobileAppTile.mobile.tsx

@@ -3,6 +3,7 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import type { MobileAppTileContent } from './MobileAppTileContent';
 
 import { Logo } from '../../ui-kit/Logo/Logo';
+import { style } from '../../utils/style';
 
 export interface MobileAppTileProps extends MobileAppTileContent, UniBlockProps {}
 
@@ -10,7 +11,10 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
   ({ className = '', title = 'Мобильное приложение', description, href = '#' }) => {
     return (
       <div
-        className={`col-span-12 rounded-md cursor-pointer p-4 mt-6 mb-6 bg-secondary-light font-sans ${className}`}
+        className={style(
+          'col-span-12 rounded-md cursor-pointer p-4 bg-secondary-light font-sans',
+          className,
+        )}
       >
         {href ? (
           <div className="flex">

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -75,7 +75,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
 
 const renderList = (items?: string[]) => {
   return items?.length ? (
-    <List items={items} itemClassName="text-l-light mb-2 last:mb-0" />
+    <List items={items} listItemSize="S" />
   ) : (
     <span className="text-m-light text-secondary-text">
       Наведите камеру телефона на QR-код и скачайте приложение