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

package/src/components/Bonus/Bonus.fixture.tsx

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { Bonus } from './Bonus';
 import type { BonusContent } from './BonusContent';

package/src/components/BusinessBlock/BusinessBlock.fixture.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { BusinessBlock } from './BusinessBlock';
 import type {

package/src/components/ButtonBlock/ButtonBlock.fixture.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ButtonBlock } from './ButtonBlock';
 

package/src/components/Calculator/Calculator.fixture.tsx

@@ -1,7 +1,7 @@
 import '../../setup-fixture';
-import { Calculator } from './Calculator';
 
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import { Calculator } from './Calculator';
 import type {
   BonusCalculatorParamsDef,
   BusinessDepositCalculatorParamsDef,

package/src/components/Calculator/CalculatorValueBlock.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Text } from '../../ui-kit/Text/Text';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
 import { style } from '../../utils/style';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 
 export interface CalculatorValueBlockProps {
   title?: string;
@@ -22,7 +22,7 @@ export const CalculatorValueBlock = JSX<CalculatorValueBlockProps>(
       {value ? (
         <div>
           <Text size="text-h3">
-            {prefix} {addSpacesBetweenNumbers(Math.round(value))} {postfix}
+            {prefix} {toLocalNumberFormat(2)(Math.round(value))} {postfix}
           </Text>
         </div>
       ) : (

package/src/components/Calculator/renderInitialFeeInput.tsx

@@ -1,6 +1,6 @@
 // TEMP
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import { DEFAULT_MAX_SUM, DEFAULT_MIN_SUM } from './constants';
 
 const STEP_MONEY = 1000;
@@ -24,8 +24,8 @@ export function renderInitialFeeInput(
       className="mt-7"
       title={title}
       items={[
-        `От ${addSpacesBetweenNumbers(minSum)} рублей`,
-        `До ${addSpacesBetweenNumbers(maxSum)} рублей`,
+        `От ${toLocalNumberFormat(0)(minSum)} рублей`,
+        `До ${toLocalNumberFormat(0)(maxSum)} рублей`,
       ]}
       min={minSum}
       max={maxSum}

package/src/components/Calculator/renderProposal.tsx

@@ -1,11 +1,11 @@
 import { Button } from '../../ui-kit/Button/Button';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 
 export function renderProposal(monthlyPayment: number) {
   return (
     <div className="box-border ">
       <div className="text-l-light">Ежемесячный платёж</div>
-      <div className="text-h3 mb-3">{addSpacesBetweenNumbers(Math.round(monthlyPayment))} ₽</div>
+      <div className="text-h3 mb-3">{toLocalNumberFormat(2)(Math.round(monthlyPayment))} ₽</div>
       <Button className="mt-12 w-full" text="Отправить заявку" version="primary" href="#" />
     </div>
   );

package/src/components/Calculator/renderRealEstateValue.tsx

@@ -1,6 +1,6 @@
 // TEMP
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import { DEFAULT_MAX_SUM, DEFAULT_MIN_SUM } from './constants';
 
 const STEP_MONEY = 1000;
@@ -22,7 +22,7 @@ export function renderRealEstateValue(
   return (
     <InputRange
       title={title}
-      items={[`От ${addSpacesBetweenNumbers(minSum)} ₽`, `До ${addSpacesBetweenNumbers(maxSum)} ₽`]}
+      items={[`От ${toLocalNumberFormat(2)(minSum)} ₽`, `До ${toLocalNumberFormat(2)(maxSum)} ₽`]}
       min={minSum}
       max={maxSum}
       step={STEP_MONEY}

package/src/components/Calculator/renderWantedSumInput.tsx

@@ -1,6 +1,6 @@
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
 import type { InputRangeProps } from '../../ui-kit/InputRange/InputRangeProps';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 
 const DEFAULT_MONEY_STEP = 1000;
 
@@ -14,8 +14,8 @@ export function renderWantedSumInput({
   ...rest
 }: RenderWantedSumParams) {
   const items = [
-    `От ${addSpacesBetweenNumbers(rest.min || 0)} ₽`,
-    `До ${addSpacesBetweenNumbers(rest.max || 0)} ₽`,
+    `От ${toLocalNumberFormat(2)(rest.min || 0)} ₽`,
+    `До ${toLocalNumberFormat(2)(rest.max || 0)} ₽`,
   ];
 
   return <InputRange items={isShowItems ? items : []} step={step} {...rest} />;

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

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { CardTransfer } from './CardTransfer';
 

package/src/components/CardTransfer/CardTransfer.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
 import { useLink } from '../../hooks/useLink';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -7,15 +7,19 @@ import { getDisabledButtonClasses } from '../../ui-kit/Button/getDisabledButtonC
 import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { getSanitizedValue } from '../../utils/getSanitizedValue';
+import { style } from '../../utils/style';
 import type { CardTransferContent } from './CardTransferContent';
 
-const AMOUNT_KEY = 'amount';
-const FORM_URL = 'https://www.rshb.ru/p2p/';
 const DEFAULT_TITLE = 'Укажите сумму перевода';
 const DEFAULT_LABEL = 'Сумма перевода';
 const DEFAULT_PLACEHOLDER = '1500';
 
+const FORM_URL = 'https://www.rshb.ru/p2p/';
+const AMOUNT_KEY = 'amount';
+const INITIAL_FORM_STATE = {
+  [AMOUNT_KEY]: 1500,
+};
+
 export interface CardTransferProps extends CardTransferContent, UniBlockProps {}
 
 export const CardTransfer = JSX<CardTransferProps>(
@@ -27,9 +31,10 @@ export const CardTransfer = JSX<CardTransferProps>(
     button,
     ...rest
   }) => {
-    const [value, setValue] = useState<string>('');
-    const handleChange = useCallback((_: string) => setValue(_), []);
-    const isDisabled = !Number(getSanitizedValue(value));
+    const [{ amount }, { field }] = useForm(INITIAL_FORM_STATE);
+
+    const isDisabled = amount <= 0;
+
     const buttonStyle = isDisabled
       ? getDisabledButtonClasses({ version: button?.version })
       : getRegularButtonClasses({ className: 'text-white', version: button?.version });
@@ -37,21 +42,20 @@ export const CardTransfer = JSX<CardTransferProps>(
     const link = useLink();
 
     return (
-      <BlockWrapper className={`p-default flex flex-col items-center ${className}`} {...rest}>
+      <BlockWrapper className={style('p-default flex flex-col items-center', 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={handleChange}
-            valid={value === '' || !isDisabled}
+            valid={!isDisabled}
             placeholder={placeholder}
             label={label}
+            {...field(AMOUNT_KEY, { parse: Number, format: String })}
           />
           {button?.text ? (
             <button
               type="submit"
-              className={`w-full p-4 mt-6 ${buttonStyle} `}
+              className={style('w-full p-4 mt-6', buttonStyle)}
               disabled={isDisabled}
               {...link(button)}
             >

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

@@ -1,5 +1,6 @@
-import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import '../../setup-fixture';
+
+import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { Blocks } from '../Blocks';
 import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselTariffsCard.fixture';
 import { Carousel } from './Carousel';

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

@@ -1,5 +1,6 @@
-import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import '../../setup-fixture';
+
+import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { Blocks } from '../Blocks';
 import { BANK_HISTORY_CARD } from '../CarouselBankHistoryCard/CarouselBankHistoryCard.fixture';
 import { CARD, CARD_MINI, CARD_NEW } from '../CarouselCard/CarouselCard.fixture';

package/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import { CarouselBankHistoryCard } from './CarouselBankHistoryCard';
 import type { CarouselBankHistoryCardContent } from './CarouselBankHistoryCardContent';
 

package/src/components/CarouselCard/CarouselCard.fixture.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselCard } from './CarouselCard';
 import type { CarouselCardContent } from './CarouselCardContent';

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

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';

package/src/components/CarouselEventCard/CarouselEventCard.fixture.tsx

@@ -1,5 +1,7 @@
-import { CarouselEventCard } from './CarouselEventCard';
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
+import { CarouselEventCard } from './CarouselEventCard';
 import type { CarouselEventCardContent } from './CarouselEventCardContent';
 
 const image: Picture = {

package/src/components/CarouselInvestmentCard/CarouselInvestmentCard.fixture.tsx

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import { CarouselInvestmentCard } from './CarouselInvestmentCard';
 import type { CarouselInvestmentCardContent } from './CarouselInvestmentCardContent';
 

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/CarouselLinks/CarouselLinks.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import { CarouselLinks } from './CarouselLinks';
 
 const link = {

package/src/components/CarouselProductCard/CarouselProductCard.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselProductCard } from './CarouselProductCard';

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/CarouselProgramsCard/CarouselProgramsCard.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
 import { CarouselProgramsCard } from './CarouselProgramsCard';
 import type { CarouselProgramsCardContent } from './CarouselProgramsCardContent';

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

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import { CarouselRecommendationCard } from './CarouselRecommendationCard';
 import type {
   CarouselRecommendationCardContent,

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.fixture.tsx

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import { CarouselRecommendationCard } from './CarouselRecommendationCard';
 import type {
   CarouselRecommendationCardContent,

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/CarouselRichTextCard/CarouselRichTextCard.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import { CarouselRichTextCard } from './CarouselRichTextCard';
 import type { CarouselRichTextCardContent } from './CarouselRichTextCardContent';
 

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

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
 import type { ButtonProps, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselTariffsCard } from './CarouselTariffsCard';

package/src/components/CarouselTariffsCard/CarouselTariffsCard.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import type { Picture } from '../../model/Picture';
 import type { ButtonProps, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { CarouselTariffsCard } from './CarouselTariffsCard';

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

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import { ComparisonTable } from './ComparisonTable';
 import type { Column } from './ComparisonTableContent';
 

package/src/components/ComparisonTable/ComparisonTable.fixture.tsx

@@ -1,5 +1,6 @@
-import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
 import { ComparisonTable } from './ComparisonTable';
 import type { Column } from './ComparisonTableContent';
 

package/src/components/ContactsBlock/ContactsBlock.fixture.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ContactsBlock } from './ContactsBlock';
 
@@ -52,11 +53,5 @@ const contacts = [
 
 export default {
   secondary: <ContactsBlock className="col-span-12" contacts={contacts} />,
-  primary: (
-    <ContactsBlock
-      className="col-span-12"
-      version="primary"
-      contacts={contacts}
-    />
-  ),
+  primary: <ContactsBlock className="col-span-12" version="primary" contacts={contacts} />,
 };

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

@@ -17,7 +17,6 @@
   "jsonLd": "json",
   "date": "2022-04-08",
   "style": ["bg-main-divider"],
-  "likeControl": true,
   "slots": {
     "header": [
       {

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": "Попробуйте очистить фильтры"
+    }
+  }
+}