@hh.ru/magritte-ui-input 9.4.51 → 9.4.52

package/index.js

@@ -27,6 +27,6 @@ import './useFocus.js';
 import '@hh.ru/magritte-ui-typography';
 import '@hh.ru/magritte-common-number-formatter';
 import './useDateTimeMask.js';
-import './index.esm-BVoBfbo-.js';
+import './index.esm-t97x9DTo.js';
 import './useUncontrolledInput.js';
 //# sourceMappingURL=index.js.map

package/index.mock.d.ts

@@ -1,5 +1,5 @@
 import { ForwardRefExoticComponent } from 'react';
-export { type InputSize } from '@hh.ru/magritte-ui-input/types';
+export { type InputSize } from './types';
 export declare const Input: ForwardRefExoticComponent<Record<string, unknown>>;
 export declare const PasswordInput: ForwardRefExoticComponent<Record<string, unknown>>;
 export declare const NumberInput: ForwardRefExoticComponent<Record<string, unknown>>;

package/index.mock.js

@@ -1,36 +1,64 @@
 import './index.css';
 import { mockComponent } from '@hh.ru/magritte-ui-mock-component';
 
-const Input = mockComponent('Input', undefined, {
-    withChildren: false,
+const Input = mockComponent("Input", void 0, {
+  withChildren: false
 });
-const PasswordInput = mockComponent('PasswordInput', undefined, {
-    withChildren: false,
+const PasswordInput = mockComponent(
+  "PasswordInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const NumberInput = mockComponent("NumberInput", void 0, {
+  withChildren: false
 });
-const NumberInput = mockComponent('NumberInput', undefined, {
-    withChildren: false,
-});
-const SearchInput = mockComponent('SearchInput', undefined, {
-    withChildren: false,
-});
-const DateTimeInput = mockComponent('DateTimeInput', undefined, {
-    withChildren: false,
-});
-const UncontrolledInput = mockComponent('UncontrolledInput', undefined, {
-    withChildren: false,
-});
-const UncontrolledPasswordInput = mockComponent('UncontrolledPasswordInput', undefined, {
-    withChildren: false,
-});
-const UncontrolledNumberInput = mockComponent('UncontrolledNumberInput', undefined, {
-    withChildren: false,
-});
-const UncontrolledSearchInput = mockComponent('UncontrolledSearchInput', undefined, {
-    withChildren: false,
-});
-const UncontrolledDateTimeInput = mockComponent('UncontrolledDateTimeInput', undefined, {
-    withChildren: false,
+const SearchInput = mockComponent("SearchInput", void 0, {
+  withChildren: false
 });
+const DateTimeInput = mockComponent(
+  "DateTimeInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const UncontrolledInput = mockComponent(
+  "UncontrolledInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const UncontrolledPasswordInput = mockComponent(
+  "UncontrolledPasswordInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const UncontrolledNumberInput = mockComponent(
+  "UncontrolledNumberInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const UncontrolledSearchInput = mockComponent(
+  "UncontrolledSearchInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
+const UncontrolledDateTimeInput = mockComponent(
+  "UncontrolledDateTimeInput",
+  void 0,
+  {
+    withChildren: false
+  }
+);
 
 export { DateTimeInput, Input, NumberInput, PasswordInput, SearchInput, UncontrolledDateTimeInput, UncontrolledInput, UncontrolledNumberInput, UncontrolledPasswordInput, UncontrolledSearchInput };
 //# sourceMappingURL=index.mock.js.map

package/index.mock.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.mock.js","sources":["src/index.mock.ts"],"sourcesContent":["import { ForwardRefExoticComponent } from 'react';\n\nimport { mockComponent } from '@hh.ru/magritte-ui-mock-component';\n\nexport { type InputSize } from '@hh.ru/magritte-ui-input/types';\n\nexport const Input: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('Input', undefined, {\n    withChildren: false,\n});\n\nexport const PasswordInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'PasswordInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const NumberInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('NumberInput', undefined, {\n    withChildren: false,\n});\n\nexport const SearchInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('SearchInput', undefined, {\n    withChildren: false,\n});\n\nexport const DateTimeInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'DateTimeInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledPasswordInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledPasswordInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledNumberInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledNumberInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledSearchInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledSearchInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledDateTimeInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledDateTimeInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n"],"names":[],"mappings":";;MAMa,KAAK,GAAuD,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE;AACvG,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EAAE;MAEU,aAAa,GAAuD,aAAa,CAC1F,eAAe,EACf,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,WAAW,GAAuD,aAAa,CAAC,aAAa,EAAE,SAAS,EAAE;AACnH,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EAAE;MAEU,WAAW,GAAuD,aAAa,CAAC,aAAa,EAAE,SAAS,EAAE;AACnH,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EAAE;MAEU,aAAa,GAAuD,aAAa,CAC1F,eAAe,EACf,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,iBAAiB,GAAuD,aAAa,CAC9F,mBAAmB,EACnB,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,yBAAyB,GAAuD,aAAa,CACtG,2BAA2B,EAC3B,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,uBAAuB,GAAuD,aAAa,CACpG,yBAAyB,EACzB,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,uBAAuB,GAAuD,aAAa,CACpG,yBAAyB,EACzB,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA,EACH;MAEW,yBAAyB,GAAuD,aAAa,CACtG,2BAA2B,EAC3B,SAAS,EACT;AACI,IAAA,YAAY,EAAE,KAAK;AACtB,CAAA;;;;"}
+{"version":3,"file":"index.mock.js","sources":["src/index.mock.ts"],"sourcesContent":["import { ForwardRefExoticComponent } from 'react';\n\nimport { mockComponent } from '@hh.ru/magritte-ui-mock-component';\n\nexport { type InputSize } from '@hh.ru/magritte-ui-input/types';\n\nexport const Input: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('Input', undefined, {\n    withChildren: false,\n});\n\nexport const PasswordInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'PasswordInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const NumberInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('NumberInput', undefined, {\n    withChildren: false,\n});\n\nexport const SearchInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent('SearchInput', undefined, {\n    withChildren: false,\n});\n\nexport const DateTimeInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'DateTimeInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledPasswordInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledPasswordInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledNumberInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledNumberInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledSearchInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledSearchInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n\nexport const UncontrolledDateTimeInput: ForwardRefExoticComponent<Record<string, unknown>> = mockComponent(\n    'UncontrolledDateTimeInput',\n    undefined,\n    {\n        withChildren: false,\n    }\n);\n"],"names":[],"mappings":";;AAMa,MAAA,KAAA,GAA4D,aAAc,CAAA,OAAA,EAAS,KAAW,CAAA,EAAA;AAAA,EACvG,YAAc,EAAA,KAAA;AAClB,CAAC,EAAA;AAEM,MAAM,aAAoE,GAAA,aAAA;AAAA,EAC7E,eAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEa,MAAA,WAAA,GAAkE,aAAc,CAAA,aAAA,EAAe,KAAW,CAAA,EAAA;AAAA,EACnH,YAAc,EAAA,KAAA;AAClB,CAAC,EAAA;AAEY,MAAA,WAAA,GAAkE,aAAc,CAAA,aAAA,EAAe,KAAW,CAAA,EAAA;AAAA,EACnH,YAAc,EAAA,KAAA;AAClB,CAAC,EAAA;AAEM,MAAM,aAAoE,GAAA,aAAA;AAAA,EAC7E,eAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEO,MAAM,iBAAwE,GAAA,aAAA;AAAA,EACjF,mBAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEO,MAAM,yBAAgF,GAAA,aAAA;AAAA,EACzF,2BAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEO,MAAM,uBAA8E,GAAA,aAAA;AAAA,EACvF,yBAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEO,MAAM,uBAA8E,GAAA,aAAA;AAAA,EACvF,yBAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ,EAAA;AAEO,MAAM,yBAAgF,GAAA,aAAA;AAAA,EACzF,2BAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA;AAAA,IACI,YAAc,EAAA,KAAA;AAAA,GAClB;AACJ;;;;"}

package/maskito-exports.js

@@ -1,4 +1,4 @@
 import './index.css';
-export { M as MASKITO_DEFAULT_OPTIONS, m as maskitoDateOptionsGenerator, a as maskitoDateRangeOptionsGenerator, b as maskitoDateTimeOptionsGenerator, c as maskitoTimeOptionsGenerator, u as useMaskito } from './index.esm-BVoBfbo-.js';
+export { M as MASKITO_DEFAULT_OPTIONS, m as maskitoDateOptionsGenerator, a as maskitoDateRangeOptionsGenerator, b as maskitoDateTimeOptionsGenerator, c as maskitoTimeOptionsGenerator, u as useMaskito } from './index.esm-t97x9DTo.js';
 import 'react';
 //# sourceMappingURL=maskito-exports.js.map

package/numberFormatter.d.ts

@@ -1,5 +1,5 @@
 import { type FormatParams } from '@hh.ru/magritte-common-number-formatter';
-import { InputFormatter } from '@hh.ru/magritte-ui-input/types';
+import { InputFormatter } from './types';
 type Params = FormatParams & {
     maxLength?: number;
 };

package/numberFormatter.js

@@ -1,51 +1,51 @@
 import './index.css';
 import { defaults, format } from '@hh.ru/magritte-common-number-formatter';
 
-const calculateDelimiters = (rawText, formatted, groupSeparator, caretPosition) => formatted.substring(0, caretPosition).split(groupSeparator).length -
-    rawText.trim().substring(0, caretPosition).split(groupSeparator).length;
+const calculateDelimiters = (rawText, formatted, groupSeparator, caretPosition) => formatted.substring(0, caretPosition).split(groupSeparator).length - rawText.trim().substring(0, caretPosition).split(groupSeparator).length;
 const numberFormatterFactory = (passedParams = {}) => {
-    const filteredParams = Object.keys(passedParams).reduce((acc, key) => passedParams[key] === undefined
-        ? acc
-        : {
-            ...acc,
-            [key]: passedParams[key],
-        }, {});
-    const params = { ...defaults, ...filteredParams };
-    const ouputFormatParams = {
-        groupSeparator: '',
-        decimalMark: ['.', ...params.decimalMark],
-        allowNegative: params.allowNegative,
-        decimalLength: params.decimalLength,
-    };
-    const decimalDelimitersRegExp = new RegExp(`[${params.decimalMark?.join('')}]`, 'g');
-    const allowedChars = [...params.decimalMark];
-    if (params.allowNegative) {
-        allowedChars.push('-');
+  const filteredParams = Object.keys(passedParams).reduce(
+    (acc, key) => passedParams[key] === void 0 ? acc : {
+      ...acc,
+      [key]: passedParams[key]
+    },
+    {}
+  );
+  const params = { ...defaults, ...filteredParams };
+  const ouputFormatParams = {
+    groupSeparator: "",
+    decimalMark: [".", ...params.decimalMark],
+    allowNegative: params.allowNegative,
+    decimalLength: params.decimalLength
+  };
+  const decimalDelimitersRegExp = new RegExp(`[${params.decimalMark?.join("")}]`, "g");
+  const allowedChars = [...params.decimalMark];
+  if (params.allowNegative) {
+    allowedChars.push("-");
+  }
+  const disallowedCharsRegExp = new RegExp(`[^\\d${allowedChars.join("")}]`, "g");
+  return (prevValue, value, caretPosition) => {
+    const val = params.maxLength ? value.replace(disallowedCharsRegExp, "").substring(0, params.maxLength) : value;
+    const decimalDelimitersCount = val.match(decimalDelimitersRegExp)?.length || 0;
+    if (decimalDelimitersCount > 1) {
+      const lastChar2 = prevValue.charAt(val.length - 1);
+      const formattedValue2 = format(prevValue, params) + (params.decimalMark.includes(lastChar2) ? lastChar2 : "");
+      const decimalDelimitersPosition = formattedValue2.search(decimalDelimitersRegExp);
+      return {
+        formattedValue: formattedValue2,
+        outputValue: format(prevValue, ouputFormatParams) + (params.decimalMark.includes(lastChar2) ? lastChar2 : ""),
+        caretPosition: decimalDelimitersPosition + 1
+      };
     }
-    const disallowedCharsRegExp = new RegExp(`[^\\d${allowedChars.join('')}]`, 'g');
-    return (prevValue, value, caretPosition) => {
-        const val = params.maxLength ? value.replace(disallowedCharsRegExp, '').substring(0, params.maxLength) : value;
-        const decimalDelimitersCount = val.match(decimalDelimitersRegExp)?.length || 0;
-        if (decimalDelimitersCount > 1) {
-            const lastChar = prevValue.charAt(val.length - 1);
-            const formattedValue = format(prevValue, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');
-            const decimalDelimitersPosition = formattedValue.search(decimalDelimitersRegExp);
-            return {
-                formattedValue,
-                outputValue: format(prevValue, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : ''),
-                caretPosition: decimalDelimitersPosition + 1,
-            };
-        }
-        const lastChar = val.charAt(val.length - 1);
-        const formattedValue = format(val, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');
-        const outputValue = format(val, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : '');
-        const caret = caretPosition + calculateDelimiters(value, formattedValue, params.groupSeparator, caretPosition);
-        return {
-            formattedValue,
-            outputValue,
-            caretPosition: caret,
-        };
+    const lastChar = val.charAt(val.length - 1);
+    const formattedValue = format(val, params) + (params.decimalMark.includes(lastChar) ? lastChar : "");
+    const outputValue = format(val, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : "");
+    const caret = caretPosition + calculateDelimiters(value, formattedValue, params.groupSeparator, caretPosition);
+    return {
+      formattedValue,
+      outputValue,
+      caretPosition: caret
     };
+  };
 };
 
 export { numberFormatterFactory };

package/numberFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberFormatter.js","sources":["src/numberFormatter.ts"],"sourcesContent":["import { format, type FormatParams, defaults } from '@hh.ru/magritte-common-number-formatter';\nimport { InputFormatter } from '@hh.ru/magritte-ui-input/types';\n\nconst calculateDelimiters = (\n    rawText: string,\n    formatted: string,\n    groupSeparator: string,\n    caretPosition: number\n): number =>\n    formatted.substring(0, caretPosition).split(groupSeparator).length -\n    rawText.trim().substring(0, caretPosition).split(groupSeparator).length;\n\ntype Params = FormatParams & { maxLength?: number };\n\nexport const numberFormatterFactory: (params?: Params) => InputFormatter = (passedParams = {}) => {\n    const filteredParams = (Object.keys(passedParams) as Array<keyof typeof passedParams>).reduce<Params>(\n        (acc, key) =>\n            passedParams[key] === undefined\n                ? acc\n                : {\n                      ...acc,\n                      [key]: passedParams[key],\n                  },\n        {}\n    );\n    const params = { ...defaults, ...filteredParams };\n    const ouputFormatParams = {\n        groupSeparator: '',\n        decimalMark: ['.', ...params.decimalMark],\n        allowNegative: params.allowNegative,\n        decimalLength: params.decimalLength,\n    };\n    const decimalDelimitersRegExp = new RegExp(`[${params.decimalMark?.join('')}]`, 'g');\n    const allowedChars = [...params.decimalMark];\n    if (params.allowNegative) {\n        allowedChars.push('-');\n    }\n    const disallowedCharsRegExp = new RegExp(`[^\\\\d${allowedChars.join('')}]`, 'g');\n\n    return (prevValue: string, value: string, caretPosition: number) => {\n        const val = params.maxLength ? value.replace(disallowedCharsRegExp, '').substring(0, params.maxLength) : value;\n        const decimalDelimitersCount = val.match(decimalDelimitersRegExp)?.length || 0;\n        if (decimalDelimitersCount > 1) {\n            const lastChar = prevValue.charAt(val.length - 1);\n            const formattedValue = format(prevValue, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n            const decimalDelimitersPosition = formattedValue.search(decimalDelimitersRegExp);\n            return {\n                formattedValue,\n                outputValue:\n                    format(prevValue, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : ''),\n                caretPosition: decimalDelimitersPosition + 1,\n            };\n        }\n        const lastChar = val.charAt(val.length - 1);\n        const formattedValue = format(val, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n        const outputValue = format(val, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n        const caret = caretPosition + calculateDelimiters(value, formattedValue, params.groupSeparator, caretPosition);\n\n        return {\n            formattedValue,\n            outputValue,\n            caretPosition: caret,\n        };\n    };\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"numberFormatter.js","sources":["src/numberFormatter.ts"],"sourcesContent":["import { format, type FormatParams, defaults } from '@hh.ru/magritte-common-number-formatter';\nimport { InputFormatter } from '@hh.ru/magritte-ui-input/types';\n\nconst calculateDelimiters = (\n    rawText: string,\n    formatted: string,\n    groupSeparator: string,\n    caretPosition: number\n): number =>\n    formatted.substring(0, caretPosition).split(groupSeparator).length -\n    rawText.trim().substring(0, caretPosition).split(groupSeparator).length;\n\ntype Params = FormatParams & { maxLength?: number };\n\nexport const numberFormatterFactory: (params?: Params) => InputFormatter = (passedParams = {}) => {\n    const filteredParams = (Object.keys(passedParams) as Array<keyof typeof passedParams>).reduce<Params>(\n        (acc, key) =>\n            passedParams[key] === undefined\n                ? acc\n                : {\n                      ...acc,\n                      [key]: passedParams[key],\n                  },\n        {}\n    );\n    const params = { ...defaults, ...filteredParams };\n    const ouputFormatParams = {\n        groupSeparator: '',\n        decimalMark: ['.', ...params.decimalMark],\n        allowNegative: params.allowNegative,\n        decimalLength: params.decimalLength,\n    };\n    const decimalDelimitersRegExp = new RegExp(`[${params.decimalMark?.join('')}]`, 'g');\n    const allowedChars = [...params.decimalMark];\n    if (params.allowNegative) {\n        allowedChars.push('-');\n    }\n    const disallowedCharsRegExp = new RegExp(`[^\\\\d${allowedChars.join('')}]`, 'g');\n\n    return (prevValue: string, value: string, caretPosition: number) => {\n        const val = params.maxLength ? value.replace(disallowedCharsRegExp, '').substring(0, params.maxLength) : value;\n        const decimalDelimitersCount = val.match(decimalDelimitersRegExp)?.length || 0;\n        if (decimalDelimitersCount > 1) {\n            const lastChar = prevValue.charAt(val.length - 1);\n            const formattedValue = format(prevValue, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n            const decimalDelimitersPosition = formattedValue.search(decimalDelimitersRegExp);\n            return {\n                formattedValue,\n                outputValue:\n                    format(prevValue, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : ''),\n                caretPosition: decimalDelimitersPosition + 1,\n            };\n        }\n        const lastChar = val.charAt(val.length - 1);\n        const formattedValue = format(val, params) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n        const outputValue = format(val, ouputFormatParams) + (params.decimalMark.includes(lastChar) ? lastChar : '');\n        const caret = caretPosition + calculateDelimiters(value, formattedValue, params.groupSeparator, caretPosition);\n\n        return {\n            formattedValue,\n            outputValue,\n            caretPosition: caret,\n        };\n    };\n};\n"],"names":["lastChar","formattedValue"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hh.ru/magritte-ui-input",
-  "version": "9.4.51",
+  "version": "9.4.52",
   "main": "index.js",
   "types": "index.d.ts",
   "sideEffects": [
@@ -30,16 +30,16 @@
     "@hh.ru/magritte-common-focus-visible": "0.1.11",
     "@hh.ru/magritte-common-mouse": "1.2.1",
     "@hh.ru/magritte-common-number-formatter": "1.0.11",
-    "@hh.ru/magritte-common-text-selection": "0.1.9",
+    "@hh.ru/magritte-common-text-selection": "0.1.10",
     "@hh.ru/magritte-common-use-disabled": "1.0.16",
     "@hh.ru/magritte-common-use-multiple-refs": "1.1.12",
     "@hh.ru/magritte-common-use-translation": "3.6.1",
-    "@hh.ru/magritte-design-tokens": "26.0.0",
+    "@hh.ru/magritte-design-tokens": "26.0.1",
     "@hh.ru/magritte-ui-breakpoint": "6.1.2",
-    "@hh.ru/magritte-ui-form-helper": "2.1.24",
-    "@hh.ru/magritte-ui-icon": "15.1.4",
+    "@hh.ru/magritte-ui-form-helper": "2.1.25",
+    "@hh.ru/magritte-ui-icon": "15.1.5",
     "@hh.ru/magritte-ui-mock-component": "1.1.8",
-    "@hh.ru/magritte-ui-typography": "5.3.15"
+    "@hh.ru/magritte-ui-typography": "5.3.16"
   },
   "devDependencies": {
     "@maskito/core": "2.4.0",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b0ff5da48fb29d516c8289082560ee1882d16986"
+  "gitHead": "f6539d7a0e7cd42dd851458db1de04a748bbee03"
 }

package/useDateTimeMask.d.ts

@@ -1,3 +1,3 @@
 import { RefCallback } from 'react';
-import { type TimeInputRounding, type DateInputMask } from '@hh.ru/magritte-ui-input/types';
+import { type TimeInputRounding, type DateInputMask } from './types';
 export declare const useDateTimeMask: (dateMask?: DateInputMask, timeMask?: boolean, timeRounding?: TimeInputRounding, range?: boolean) => RefCallback<HTMLElement>;

package/useDateTimeMask.js

@@ -1,151 +1,125 @@
 import './index.css';
 import { useMemo } from 'react';
-import { M as MASKITO_DEFAULT_OPTIONS, b as maskitoDateTimeOptionsGenerator, a as maskitoDateRangeOptionsGenerator, m as maskitoDateOptionsGenerator, c as maskitoTimeOptionsGenerator, u as useMaskito } from './index.esm-BVoBfbo-.js';
+import { M as MASKITO_DEFAULT_OPTIONS, b as maskitoDateTimeOptionsGenerator, a as maskitoDateRangeOptionsGenerator, m as maskitoDateOptionsGenerator, c as maskitoTimeOptionsGenerator, u as useMaskito } from './index.esm-t97x9DTo.js';
 
-/**
- * Округление времени (в формате 00:00) до ближайшего заданного шага
- *
- * @param dateTime {String} Строка с постфиксом HH:MM, где H - часы, M - минуты
- * @param roundValue {Number} Шаг для округления
- * @returns {String}
- *
- * @example
- * roundTime('20.12.2023 15:19', 15); // '20.12.2023 15:15'
- * @example
- * roundTime('15:31', 60); // '16:00'
- */
 const roundTime = (dateTime, roundValue) => {
-    const regexp = /(\d{2}):(\d{2})$/;
-    const match = dateTime.match(regexp);
-    const time = match?.[0];
-    if (time) {
-        const [hours, minutes] = time.split(':').map(Number);
-        const totalMinutes = hours * 60 + minutes;
-        const roundedMinutes = Math.round(totalMinutes / roundValue) * roundValue;
-        const roundedHours = Math.floor(roundedMinutes / 60) % 24;
-        const formattedHours = String(roundedHours).padStart(2, '0');
-        const formattedMinutes = String(roundedMinutes % 60).padStart(2, '0');
-        return dateTime.replace(regexp, `${formattedHours}:${formattedMinutes}`);
-    }
-    return dateTime;
+  const regexp = /(\d{2}):(\d{2})$/;
+  const match = dateTime.match(regexp);
+  const time = match?.[0];
+  if (time) {
+    const [hours, minutes] = time.split(":").map(Number);
+    const totalMinutes = hours * 60 + minutes;
+    const roundedMinutes = Math.round(totalMinutes / roundValue) * roundValue;
+    const roundedHours = Math.floor(roundedMinutes / 60) % 24;
+    const formattedHours = String(roundedHours).padStart(2, "0");
+    const formattedMinutes = String(roundedMinutes % 60).padStart(2, "0");
+    return dateTime.replace(regexp, `${formattedHours}:${formattedMinutes}`);
+  }
+  return dateTime;
 };
-/** Постпроцессор для округления времени до заданного шага */
 const roundTimePostprocessor = (enabled, rounding) => (state) => enabled && rounding ? { ...state, value: roundTime(state.value, rounding) } : state;
-/** Препроцессор для автоматического добавления разделителей из маски */
 const autoSeparatorsPreprocessor = (mask) => {
-    let lastActionIsInsert = false;
-    return (state, actionType) => {
-        if (actionType === 'insert') {
-            lastActionIsInsert = true;
-            return state;
+  let lastActionIsInsert = false;
+  return (state, actionType) => {
+    if (actionType === "insert") {
+      lastActionIsInsert = true;
+      return state;
+    }
+    const canAddSeparator = actionType === "validation" && lastActionIsInsert;
+    lastActionIsInsert = false;
+    if (canAddSeparator) {
+      const { value, selection } = state.elementState;
+      const [from, to] = selection;
+      let newValue = "";
+      const dateArray = value.split("");
+      for (let i = 0; i < mask.length; i++) {
+        if (i < dateArray.length) {
+          newValue += dateArray[i];
+        } else if (typeof mask[i] === "string") {
+          newValue += mask[i];
+        } else {
+          break;
         }
-        const canAddSeparator = actionType === 'validation' && lastActionIsInsert;
-        lastActionIsInsert = false;
-        if (canAddSeparator) {
-            const { value, selection } = state.elementState;
-            const [from, to] = selection;
-            let newValue = '';
-            const dateArray = value.split('');
-            for (let i = 0; i < mask.length; i++) {
-                if (i < dateArray.length) {
-                    newValue += dateArray[i];
-                }
-                else if (typeof mask[i] === 'string') {
-                    newValue += mask[i];
-                }
-                else {
-                    break;
-                }
-            }
-            const addedCharacters = newValue.length - value.length;
-            return {
-                ...state,
-                elementState: {
-                    value: newValue,
-                    selection: [from + addedCharacters, to + addedCharacters],
-                },
-            };
+      }
+      const addedCharacters = newValue.length - value.length;
+      return {
+        ...state,
+        elementState: {
+          value: newValue,
+          selection: [from + addedCharacters, to + addedCharacters]
         }
-        return state;
-    };
-};
-/** Препроцессор для замены разделителей "., :;/_" на точку */
-const replaceSeparatorsPreprocessor = (state, actionType) => {
-    if (actionType === 'insert') {
-        return {
-            ...state,
-            data: state.data
-                .replace(/[^0-9., :;/_]/g, '')
-                .replace(/[., :;/_]/g, '.')
-                .replace(/([^0-9])\1+/g, '$1'),
-        };
+      };
     }
     return state;
+  };
+};
+const replaceSeparatorsPreprocessor = (state, actionType) => {
+  if (actionType === "insert") {
+    return {
+      ...state,
+      data: state.data.replace(/[^0-9., :;/_]/g, "").replace(/[., :;/_]/g, ".").replace(/([^0-9])\1+/g, "$1")
+    };
+  }
+  return state;
 };
-/** Постпроцессор для преобразования 4 -> 04 при вводе с маской dd */
 const formatDDMaskPostprocessor = (state) => {
-    if (state.value.length === 1 && Number(state.value) > 3) {
-        const [from, to] = state.selection;
-        return {
-            ...state,
-            value: state.value.padStart(2, '0'),
-            selection: [from + 1, to + 1],
-        };
-    }
-    return state;
+  if (state.value.length === 1 && Number(state.value) > 3) {
+    const [from, to] = state.selection;
+    return {
+      ...state,
+      value: state.value.padStart(2, "0"),
+      selection: [from + 1, to + 1]
+    };
+  }
+  return state;
 };
 const useDateTimeMask = (dateMask, timeMask, timeRounding, range) => {
-    const options = useMemo(() => {
-        // маска 'dd' - исключение, которого нету в maskito api:
-        if (dateMask === 'dd') {
-            return {
-                mask: /^([0-9]|0\d|1\d|2[0-9]|3[01])$/,
-                postprocessors: [formatDDMaskPostprocessor],
-            };
-        }
-        const dateSeparator = '.';
-        const dateMode = dateMask?.replace(/\./g, '/');
-        const rangeSeparator = ' – ';
-        const timeMode = 'HH:MM';
-        let options = { ...MASKITO_DEFAULT_OPTIONS };
-        if (dateMask && timeMask) {
-            options = maskitoDateTimeOptionsGenerator({
-                dateMode,
-                timeMode,
-                dateSeparator,
-            });
-        }
-        else if (dateMask) {
-            options = range
-                ? maskitoDateRangeOptionsGenerator({
-                    mode: dateMode,
-                    dateSeparator,
-                    rangeSeparator,
-                })
-                : maskitoDateOptionsGenerator({
-                    mode: dateMode,
-                    separator: dateSeparator,
-                });
-        }
-        else if (timeMask) {
-            options = maskitoTimeOptionsGenerator({
-                mode: timeMode,
-            });
-        }
-        return {
-            ...options,
-            preprocessors: [
-                replaceSeparatorsPreprocessor,
-                ...(options.preprocessors || []),
-                autoSeparatorsPreprocessor(options.mask),
-            ],
-            postprocessors: [
-                ...(options.postprocessors || []),
-                roundTimePostprocessor(Boolean(timeRounding && timeMode), timeRounding),
-            ],
-        };
-    }, [dateMask, timeMask, timeRounding, range]);
-    return useMaskito({ options });
+  const options = useMemo(() => {
+    if (dateMask === "dd") {
+      return {
+        mask: /^([0-9]|0\d|1\d|2[0-9]|3[01])$/,
+        postprocessors: [formatDDMaskPostprocessor]
+      };
+    }
+    const dateSeparator = ".";
+    const dateMode = dateMask?.replace(/\./g, "/");
+    const rangeSeparator = " \u2013 ";
+    const timeMode = "HH:MM";
+    let options2 = { ...MASKITO_DEFAULT_OPTIONS };
+    if (dateMask && timeMask) {
+      options2 = maskitoDateTimeOptionsGenerator({
+        dateMode,
+        timeMode,
+        dateSeparator
+      });
+    } else if (dateMask) {
+      options2 = range ? maskitoDateRangeOptionsGenerator({
+        mode: dateMode,
+        dateSeparator,
+        rangeSeparator
+      }) : maskitoDateOptionsGenerator({
+        mode: dateMode,
+        separator: dateSeparator
+      });
+    } else if (timeMask) {
+      options2 = maskitoTimeOptionsGenerator({
+        mode: timeMode
+      });
+    }
+    return {
+      ...options2,
+      preprocessors: [
+        replaceSeparatorsPreprocessor,
+        ...options2.preprocessors || [],
+        autoSeparatorsPreprocessor(options2.mask)
+      ],
+      postprocessors: [
+        ...options2.postprocessors || [],
+        roundTimePostprocessor(Boolean(timeRounding && timeMode), timeRounding)
+      ]
+    };
+  }, [dateMask, timeMask, timeRounding, range]);
+  return useMaskito({ options });
 };
 
 export { useDateTimeMask };