@redneckz/wildless-cms-uni-blocks 0.14.990 → 0.14.992

package/mobile/src/retail/components/Fields/MiddleNameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,9 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('middleName')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('middleName')?.onChange?.(translatedValue);
       }
     },
     [field],

package/mobile/src/retail/components/Fields/NameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,9 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('name')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('name')?.onChange?.(translatedValue);
       }
     },
     [field],

package/mobile/src/retail/components/Fields/SurnameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,10 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('surname')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('surname')?.onChange?.(translatedValue);
       }
     },
     [field],

package/mobile/src/retail/utils/autoLayoutKeyboard.ts

@@ -0,0 +1,57 @@
+export const autoLayoutKeyboard = (str: string): string => {
+  const replacer = {
+    q: 'й',
+    w: 'ц',
+    e: 'у',
+    r: 'к',
+    t: 'е',
+    y: 'н',
+    u: 'г',
+
+    i: 'ш',
+    o: 'щ',
+    p: 'з',
+    '[': 'х',
+    ']': 'ъ',
+    a: 'ф',
+    s: 'ы',
+
+    d: 'в',
+    f: 'а',
+    g: 'п',
+    h: 'р',
+    j: 'о',
+    k: 'л',
+    l: 'д',
+
+    ';': 'ж',
+    "'": 'э',
+    z: 'я',
+    x: 'ч',
+    c: 'с',
+    v: 'м',
+    b: 'и',
+
+    n: 'т',
+    m: 'ь',
+    ',': 'б',
+    '.': 'ю',
+    '`': 'ё',
+
+    '{': 'Х',
+    '}': 'Ъ',
+    ':': 'Ж',
+    '~': 'Ё',
+    '"': 'Э',
+    '<': 'Б',
+    '>': 'Ю',
+
+    '\\': '\\',
+    '^': '^',
+    _: '_',
+  };
+
+  return str.replace(/[A-z,`~<.>;:\\'"[{\]}]/g, (x: string) => {
+    return x === x.toLowerCase() ? replacer[x] : replacer[x.toLowerCase()].toUpperCase();
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.990",
+  "version": "0.14.992",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/api/LeadServiceAPI.ts

@@ -24,6 +24,7 @@ export type CheckCodeProps = {
   reqId: string;
   code: string;
   body: LeadRequest;
+  router: Router;
 };
 
 type CheckCodeResponse = {
@@ -51,6 +52,7 @@ export type sendProps = {
 
 type SubmitBody = PhoneOnly | LeadRequest | CheckCodeProps | VerifiedLeadRequest;
 
+// eslint-disable-next-line max-lines-per-function
 export function LeadServiceAPI() {
   async function send({ body, router, endpoint }: sendProps) {
     const calculatedEndpoint = endpoint && getEndpoint(endpoint, body);
@@ -95,11 +97,16 @@ export function LeadServiceAPI() {
     }
   }
 
-  async function checkCode({ reqId, code, body }: CheckCodeProps): Promise<CheckCodeResponse> {
+  async function checkCode({
+    reqId,
+    code,
+    body,
+    router,
+  }: CheckCodeProps): Promise<CheckCodeResponse> {
     const submitBody = {
       requestId: reqId,
       confimationCode: code, // не исправлять опечатку!
-      leadRequest: getSubmitBody({ body }),
+      leadRequest: getSubmitBody({ body, router }),
     };
     try {
       const response = await LeadServiceFetch(`${API_BASE_URI}/confirmCorporateLead`, submitBody);

package/src/components/ApplicationForm/useVerifyPhoneDialogSubmit.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { LeadServiceAPI, type LeadRequest } from '../../api/LeadServiceAPI';
+import { useRouter } from '../../external/useRouter';
 import { getTimer } from '../../utils/getTimer';
 const API = LeadServiceAPI();
 
@@ -18,6 +19,7 @@ export const useVerifyPhoneDialogSubmit = ({
   reqId,
 }: useVerifyPhoneDialogSubmitProps) => {
   const timer = Math.max(getTimer(Date.now()), 0);
+  const router = useRouter();
 
   const [errorText, setErrorText] = useState('');
   const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
@@ -34,6 +36,7 @@ export const useVerifyPhoneDialogSubmit = ({
         code: values.join(''),
         body: formatData,
         reqId,
+        router,
       });
       if (response?.errorDesc) {
         setErrorText(response?.errorDesc);

package/src/retail/components/CaptchaDialog/CaptchaDialog.tsx

@@ -46,7 +46,7 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(({ phoneNumber, sendCode, o
   useEffect(handleCreateCaptcha, []);
 
   return (
-    <Dialog head={<Logo />} onClose={onClose}>
+    <Dialog head={<Logo />} onClose={closeAll}>
       <div className="flex flex-col gap-lg items-center">
         <div className="flex">
           <img className="grow" src={captcha}></img>

package/src/retail/components/Fields/MiddleNameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,9 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('middleName')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('middleName')?.onChange?.(translatedValue);
       }
     },
     [field],

package/src/retail/components/Fields/NameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,9 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('name')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('name')?.onChange?.(translatedValue);
       }
     },
     [field],

package/src/retail/components/Fields/SurnameField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { autoLayoutKeyboard } from '../../utils/autoLayoutKeyboard';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
@@ -8,8 +9,10 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
-      if (retailCyrillicPattern.test(value) || value.length === 0) {
-        field('surname')?.onChange?.(value);
+      const translatedValue = autoLayoutKeyboard(value);
+
+      if (retailCyrillicPattern.test(translatedValue) || translatedValue.length === 0) {
+        field('surname')?.onChange?.(translatedValue);
       }
     },
     [field],

package/src/retail/utils/autoLayoutKeyboard.ts

@@ -0,0 +1,57 @@
+export const autoLayoutKeyboard = (str: string): string => {
+  const replacer = {
+    q: 'й',
+    w: 'ц',
+    e: 'у',
+    r: 'к',
+    t: 'е',
+    y: 'н',
+    u: 'г',
+
+    i: 'ш',
+    o: 'щ',
+    p: 'з',
+    '[': 'х',
+    ']': 'ъ',
+    a: 'ф',
+    s: 'ы',
+
+    d: 'в',
+    f: 'а',
+    g: 'п',
+    h: 'р',
+    j: 'о',
+    k: 'л',
+    l: 'д',
+
+    ';': 'ж',
+    "'": 'э',
+    z: 'я',
+    x: 'ч',
+    c: 'с',
+    v: 'м',
+    b: 'и',
+
+    n: 'т',
+    m: 'ь',
+    ',': 'б',
+    '.': 'ю',
+    '`': 'ё',
+
+    '{': 'Х',
+    '}': 'Ъ',
+    ':': 'Ж',
+    '~': 'Ё',
+    '"': 'Э',
+    '<': 'Б',
+    '>': 'Ю',
+
+    '\\': '\\',
+    '^': '^',
+    _: '_',
+  };
+
+  return str.replace(/[A-z,`~<.>;:\\'"[{\]}]/g, (x: string) => {
+    return x === x.toLowerCase() ? replacer[x] : replacer[x.toLowerCase()].toUpperCase();
+  });
+};