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

package/mobile/lib/ui-kit/SlideCheckboxGroup/SlideCheckboxGroup.js

@@ -3,13 +3,15 @@ import { JSX } from '@redneckz/uni-jsx';
 import { SlideCheckbox } from '../SlideCheckbox/SlideCheckbox.js';
 export const SlideCheckboxGroup = JSX(({ value, onChange, items = [], multiple }) => {
     const handleChange = (newValue) => {
+        if (!onChange) {
+            return;
+        }
         if (multiple) {
             const hasAlready = value?.includes(newValue);
-            onChange &&
-                onChange(hasAlready ? value?.filter((v) => v !== newValue) : [...(value || []), newValue]);
+            onChange(hasAlready ? (value || []).filter((v) => v !== newValue) : [...(value || []), newValue]);
         }
         else {
-            onChange && onChange(value === newValue ? undefined : newValue);
+            onChange(value === newValue ? '' : newValue);
         }
     };
     return items.map((item) => (_jsx(SlideCheckbox, { text: item.title, value: [value].flatMap((_) => _).includes(item.value), onChange: () => handleChange(item.value), type: multiple ? 'checkbox' : 'radio' }, item.value)));

package/mobile/lib/ui-kit/SlideCheckboxGroup/SlideCheckboxGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"SlideCheckboxGroup.js","sourceRoot":"","sources":["../../../src/ui-kit/SlideCheckboxGroup/SlideCheckboxGroup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAiB/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5C,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;QACxC,IAAI,QAAQ,EAAE;YACZ,MAAM,UAAU,GAAG,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7C,QAAQ;gBACN,QAAQ,CACN,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CACjF,CAAC;SACL;aAAM;YACL,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SACjE;IACH,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACzB,KAAC,aAAa,IAEZ,IAAI,EAAE,IAAI,CAAC,KAAK,EAChB,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EACrD,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EACxC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,IAJhC,IAAI,CAAC,KAAK,CAKf,CACH,CAAC,CAAC;AACL,CAAC,CACF,CAAC"}
+{"version":3,"file":"SlideCheckboxGroup.js","sourceRoot":"","sources":["../../../src/ui-kit/SlideCheckboxGroup/SlideCheckboxGroup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAiB/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5C,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;QACxC,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,IAAI,QAAQ,EAAE;YACZ,MAAM,UAAU,GAAG,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAE7C,QAAQ,CACN,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CACxF,CAAC;SACH;aAAM;YACL,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC9C;IACH,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACzB,KAAC,aAAa,IAEZ,IAAI,EAAE,IAAI,CAAC,KAAK,EAChB,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EACrD,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EACxC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,IAJhC,IAAI,CAAC,KAAK,CAKf,CACH,CAAC,CAAC;AACL,CAAC,CACF,CAAC"}

package/mobile/lib/utils/appendSlash.d.ts

@@ -0,0 +1 @@
+export declare const appendSlash: (url: string | undefined) => string | undefined;

package/mobile/lib/utils/appendSlash.js

@@ -0,0 +1,2 @@
+export const appendSlash = (url) => url && !url.endsWith('/') ? `${url}/` : url;
+//# sourceMappingURL=appendSlash.js.map

package/mobile/lib/utils/appendSlash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appendSlash.js","sourceRoot":"","sources":["../../src/utils/appendSlash.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAuB,EAAE,EAAE,CACrD,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC"}

package/mobile/lib/utils/identity.d.ts

@@ -0,0 +1 @@
+export declare const identity: <T>(_: T) => T;

package/mobile/lib/utils/identity.js

@@ -0,0 +1,2 @@
+export const identity = (_) => _;
+//# sourceMappingURL=identity.js.map

package/mobile/lib/utils/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/utils/identity.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAI,CAAI,EAAE,EAAE,CAAC,CAAC,CAAC"}

package/mobile/lib/utils/toLocalNumberFormat.d.ts

@@ -0,0 +1 @@
+export declare const toLocalNumberFormat: (fractionDigits?: number) => (_?: string | number | undefined) => string;

package/mobile/lib/utils/toLocalNumberFormat.js

@@ -0,0 +1,5 @@
+export const toLocalNumberFormat = (fractionDigits = 0) => (_ = 0) => new Intl.NumberFormat('ru-RU', {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: fractionDigits,
+}).format(Number(_) || 0);
+//# sourceMappingURL=toLocalNumberFormat.js.map

package/mobile/lib/utils/toLocalNumberFormat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toLocalNumberFormat.js","sourceRoot":"","sources":["../../src/utils/toLocalNumberFormat.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,cAAc,GAAG,CAAC,EAAE,EAAE,CACvB,CAAC,IAAiC,CAAC,EAAU,EAAE,CAC7C,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,cAAc;CACtC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC"}

package/mobile/src/ProjectSettings.ts

@@ -1,3 +1,5 @@
+import { appendSlash } from './utils/appendSlash';
+
 export interface ProjectSettings {
   TEST_BRANCH?: string;
   RC_BRANCH?: string;
@@ -59,5 +61,3 @@ export const projectSettings = new (class implements ProjectSettings {
     return this._.YANDEX_METRIKA_ID;
   }
 })();
-
-const appendSlash = (url: string | undefined) => (url && !url.endsWith('/') ? `${url}/` : url);

package/mobile/src/components/ApplicationForm/ApplicationFormDeposit.tsx

@@ -51,12 +51,12 @@ export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
       />
       <div className="max-w-[560px] m-auto">
         <InputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="Имя"
           {...withValidator(field('name'), nameValidator)}
         />
         <PhoneInputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="Телефон"
           {...withValidator(field('phone'), phoneValidator)}
         />

package/mobile/src/components/ApplicationForm/renderAcquiringDataOrganization.tsx

@@ -9,24 +9,24 @@ export const renderAcquiringDataOrganization = (field: FormFieldRegisterer<Acqui
   <div className="flex justify-between gap-5 mb-5">
     <div className="w-1/2">
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Наименование организации"
         {...withValidator(field('fullName'), defaultValidator)}
       />
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Контактное лицо"
         {...withValidator(field('name'), nameValidator)}
       />
     </div>
     <div className="w-1/2">
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="ИНН"
         {...withValidator(field('inn'), innValidator)}
       />
       <PhoneInputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Телефон"
         {...withValidator(field('phone'), phoneValidator)}
       />

package/mobile/src/components/ApplicationForm/renderBusinessCardDataOrganization.tsx

@@ -11,24 +11,24 @@ export const renderBusinessCardDataOrganization = (
   <div className="flex justify-between gap-5">
     <div className="w-1/2">
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Контактное лицо"
         {...withValidator(field('name'), nameValidator)}
       />
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="ИНН"
         {...withValidator(field('inn'), innValidator)}
       />
     </div>
     <div className="w-1/2">
       <PhoneInputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Телефон"
         {...withValidator(field('phone'), phoneValidator)}
       />
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Электронная почта"
         {...withValidator(field('mail'), defaultValidator)}
       />

package/mobile/src/components/ApplicationForm/renderCreditDataOrganization.tsx

@@ -9,37 +9,33 @@ export const renderCreditDataOrganization = (field: FormFieldRegisterer<CreditFo
   <div className="flex justify-between gap-5 mb-7">
     <div className="w-1/2">
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Наименование организации"
         {...field('fullName')}
       />
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="ИНН"
         {...withValidator(field('inn'), innValidator)}
       />
       <PhoneInputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Телефон"
         {...withValidator(field('phone'), phoneValidator)}
       />
     </div>
     <div className="w-1/2">
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Годовая выручка, ₽"
         {...withValidator(field('annualRevenue'), defaultValidator)}
       />
       <InputControl
-        className="shrink-0 text-l w-full mb-3"
+        className="shrink-0 w-full mb-3"
         label="Контактное лицо"
         {...withValidator(field('name'), nameValidator)}
       />
-      <InputControl
-        className="shrink-0 text-l w-full mb-3"
-        label="Электронная почта"
-        {...field('mail')}
-      />
+      <InputControl className="shrink-0 w-full mb-3" label="Электронная почта" {...field('mail')} />
     </div>
   </div>
 );

package/mobile/src/components/ApplicationForm/renderWedDataOrganization.tsx

@@ -10,14 +10,14 @@ export const renderWedDataOrganization = (field: FormFieldRegisterer<WedFormStat
     <div className="flex justify-between gap-5">
       <div className="w-1/2">
         <InputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="Наименование организации"
           {...withValidator(field('fullName'), defaultValidator)}
         />
       </div>
       <div className="w-1/2">
         <InputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="ФИО"
           {...withValidator(field('name'), nameValidator)}
         />
@@ -26,14 +26,14 @@ export const renderWedDataOrganization = (field: FormFieldRegisterer<WedFormStat
     <div className="flex justify-between gap-5 mb-7">
       <div className="w-1/2">
         <PhoneInputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="Телефон"
           {...withValidator(field('phone'), phoneValidator)}
         />
       </div>
       <div className="w-1/2">
         <InputControl
-          className="shrink-0 text-l w-full mb-3"
+          className="shrink-0 w-full mb-3"
           label="Электронная почта"
           {...withValidator(field('mail'), defaultValidator)}
         />

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/src/components/Calculator/useCreditCalculatorParams.ts

@@ -87,7 +87,7 @@ export const useCreditCalculatorParams = (
       ...userInputParams,
       monthlyPayment,
     }),
-    [userInputParams],
+    [userInputParams, data],
   );
 };
 

package/mobile/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/mobile/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/mobile/src/components/Filtration/Filtration.tsx

@@ -24,7 +24,7 @@ export const Filtration: JSXBlock<FiltrationProps> = JSX<FiltrationProps>(
           </div>
           {resetButton ? (
             <div>
-              <Button className="w-72" onClick={reset} {...resetButton} />
+              <Button className="w-72 ml-3" onClick={reset} {...resetButton} />
             </div>
           ) : null}
         </form>

package/mobile/src/components/Filtration/FiltrationContent.ts

@@ -46,7 +46,6 @@ export type StringArray = {
   };
 };
 
-// TODO: Make customizable to implement arbitrary filtration blocks
 export type FiltrationSchema = {
   /** @title Тип недвижимости */
   propertyType?: StringArray;
@@ -62,13 +61,9 @@ export type FiltrationSchema = {
  * @title Кнопка сброса
  */
 export type ResetButton = {
-  /**
-   * @title Текст кнопки
-   */
+  /** @title Текст кнопки */
   text: string;
-  /**
-   * @title Цвет кнопки
-   */
+  /** @title Цвет кнопки */
   version: ButtonVersion;
 };
 

package/mobile/src/components/Filtration/renderFormItem.tsx

@@ -30,7 +30,7 @@ const renderCheckboxes = (key: string, field: FormFieldRegisterer<any>) => (item
           </Text>
         </div>
       ) : null}
-      <SlideCheckboxGroup items={options} multiple {...field(key)} />
+      <SlideCheckboxGroup items={options} multiple {...field<string, string[] | undefined>(key)} />
     </div>
   );
 };

package/mobile/src/components/InsuranceAmountBlock/InsuranceAmountBlockInner.tsx

@@ -5,7 +5,7 @@ import { Button } from '../../ui-kit/Button/Button';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import type { CardItem, InsuranceAmountBlockTab } from './InsuranceAmountBlockContent';
 
 export interface InsuranceAmountBlockInnerProps extends InsuranceAmountBlockTab {
@@ -122,7 +122,7 @@ function renderNavButton({ slide, i, isActive, onClick }: NavButtonProps) {
 function renderValueBlock(title: string, sum: number) {
   return (
     <div className="flex flex-col text-left whitespace-pre">
-      <span className="text-h6">{addSpacesBetweenNumbers(sum)} ₽</span>
+      <span className="text-h6">{toLocalNumberFormat(2)(sum)} ₽</span>
       <span className="text-secondary-text text-l mt-1">{title}</span>
     </div>
   );

package/mobile/src/components/OfficeMap/OfficeMap.tsx

@@ -2,17 +2,17 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
+import { OFFICE_MAP } from './mockOfficeMap';
 import { nearbyOffices } from './nearbyOffices';
 import type { OfficeMapContent, WorkScheduleWeek } from './OfficeMapContent';
 import { renderCurrentDaySchedule, renderDay, renderNearbyOffice } from './renderFunctions';
-import { useOfficeMap } from './useOfficeMap';
 
 export interface OfficeMapProps extends OfficeMapContent, UniBlockProps {}
 export const OfficeMap = JSX<UniBlockProps>(({ className = '' }) => {
   // TODO: useOfficeMap endpoint had use /api/v1/branches. This endpoint now is`t correct/
   // TODO: useOfficeMap has return MOCK OBJECT!
   // TODO: Fix this when endpoint /api/v1/branches (or new endpoint) had returning right data
-  const resultOfficeMap = useOfficeMap('000');
+  const resultOfficeMap = OFFICE_MAP;
   const { name, address, gpsLatitude, gpsLongitude, workSchedule } =
     resultOfficeMap as OfficeMapContent;
   const {

package/mobile/src/components/OfficeMap/useOfficeMap.ts

@@ -12,9 +12,7 @@ export function useOfficeMap(regionCode?: string) {
     fetchOfficeMap,
   );
 
-  console.warn('Hook useOfficeMap RETURNs MOCK object for testing', data);
-
-  return OFFICE_MAP;
+  return data || OFFICE_MAP;
 }
 
 function fetchOfficeMap(url?: string) {

package/mobile/src/components/PictureText/PictureText.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
-import { addSpacesBetweenNumbers } from '../../utils/addSpacesBetweenNumbers';
+import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import { Headline } from '../Headline/Headline';
 import type { PictureTextContent } from './PictureTextContent';
 import { renderBenefit } from './renderBenefit';
@@ -54,7 +54,7 @@ function renderValueBlock(title: string, sum = 0, isAnotherBlock = false) {
   return (
     <div className={`flex justify-between items-center gap-2 w-full whitespace-pre ${widthStyle}`}>
       <span className="text-secondary-text text-l-light">{title}</span>
-      <span className="text-primary-main text-h6">{addSpacesBetweenNumbers(sum)} ₽</span>
+      <span className="text-primary-main text-h6">{toLocalNumberFormat(2)(sum)} ₽</span>
     </div>
   );
 }

package/mobile/src/hooks/useForm.ts

@@ -1,15 +1,21 @@
 import { useCallback, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { ControlProps } from '../ui-kit/ControlProps';
 import type { PreventableEvent } from '../ui-kit/PreventableEvent';
+import { identity } from '../utils/identity';
 
-export interface FieldProps<V> {
-  value?: V;
+export interface FieldProps<V> extends ControlProps<V> {
   isDirty?: boolean;
-  onChange?: (value: V) => void;
 }
 
-export type FormFieldRegisterer<FormState> = <N extends keyof FormState>(
+type Options<In, Out> = {
+  parse?: (_: In) => Out;
+  format?: (_: Out) => In;
+};
+
+export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
   fieldName: N,
-) => FieldProps<FormState[N]>;
+  options?: Options<V, FormState[N]>,
+) => FieldProps<V extends undefined ? FormState[N] : V>;
 
 export const useForm = <FormState extends Record<string, any>>(
   initialState: FormState,
@@ -33,18 +39,20 @@ export const useForm = <FormState extends Record<string, any>>(
   const handlersMap = useRef<Partial<Record<keyof FormState, (value: any) => void>>>({});
 
   const field: FormFieldRegisterer<FormState> = useCallback(
-    (fieldName) => {
+    (fieldName, options) => {
+      const { parse = identity, format = identity } = options || {};
+
       if (!handlersMap.current) {
         handlersMap.current = {};
       }
 
       handlersMap.current[fieldName] ||= (value) => {
-        setFormState((prev) => ({ ...prev, [fieldName]: value }));
+        setFormState((prev) => ({ ...prev, [fieldName]: parse(value) }));
         setDirtyFieldsMap((prev) => ({ ...prev, [fieldName]: true }));
       };
 
       return {
-        value: formState[fieldName],
+        value: format(formState[fieldName]) as any,
         isDirty: isDirtyForm || dirtyFieldsMap[fieldName],
         onChange: handlersMap.current[fieldName],
       };

package/mobile/src/hooks/useNormalizedInput.ts

@@ -0,0 +1,33 @@
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { InputProps } from '../ui-kit/Input/InputProps';
+
+interface UseNormalizedInputOptions<V, R> {
+  normalize: (v: V | undefined) => V;
+  format?: (v: V | undefined) => R;
+}
+
+export const useNormalizedInput = <V, P extends InputProps<V>, R = V>(
+  props: P,
+  { normalize, format }: UseNormalizedInputOptions<V, R>,
+) => {
+  const { value, onFocus, onBlur, onChange } = props;
+
+  const [isFocused, setIsFocused] = useState(false);
+
+  const handleFocus = useCallback((e) => {
+    setIsFocused(true);
+    onFocus && onFocus(e);
+  }, []);
+
+  const handleBlur = useCallback(() => {
+    setIsFocused(false);
+    onChange && onChange(normalize(value));
+    onBlur && onBlur();
+  }, [onChange, value]);
+
+  return {
+    value: (isFocused || !format ? value : format(value)) as R,
+    onFocus: handleFocus,
+    onBlur: handleBlur,
+  };
+};

package/mobile/src/hooks/useSWRResource.ts

@@ -2,10 +2,12 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { Fallback } from '../model/Fallback';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
 
+const EMPTY_VALUE = {};
+
 export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
   const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
     fallback,
   });
 
-  return data || ({} as Data);
+  return data || (EMPTY_VALUE as Data);
 }