fix(kit): Number fails to trim leading zeroes after deleting of lea…

…ding digit (#268)
taiga-family · Apr 25, 2023 · 4ae0010 · 4ae0010
1 parent 100b793
commit 4ae0010
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/projects/demo-integrations/cypress/tests/kit/number/number-zero-integer-part.cy.ts b/projects/demo-integrations/cypress/tests/kit/number/number-zero-integer-part.cy.ts
@@ -88,9 +88,7 @@ describe('Number | Zero integer part', () => {
                 .should('have.prop', 'selectionEnd', '0'.length);
         });
 
-        // TODO: BUG!
-        // https://github.com/Tinkoff/maskito/issues/266
-        it.skip('1|-000-000 => Backspace => 0', () => {
+        it('1|-000-000 => Backspace => 0', () => {
             openNumberPage('thousandSeparator=_&precision=2');
 
             cy.get('@input')

diff --git a/projects/kit/src/lib/masks/number/number-mask.ts b/projects/kit/src/lib/masks/number/number-mask.ts
@@ -72,7 +72,10 @@ export function maskitoNumberOptionsGenerator({
             createZeroPrecisionPreprocessor(precision, decimalSeparator),
         ),
         postprocessor: maskitoPipe(
-            createLeadingZeroesValidationPostprocessor(decimalSeparator),
+            createLeadingZeroesValidationPostprocessor(
+                decimalSeparator,
+                thousandSeparator,
+            ),
             createMaxValidationPostprocessor({decimalSeparator, max}),
             maskitoPrefixPostprocessorGenerator(prefix),
             maskitoPostfixPostprocessorGenerator(postfix),

diff --git a/projects/kit/src/lib/masks/number/processors/leading-zeroes-validation-postprocessor.ts b/projects/kit/src/lib/masks/number/processors/leading-zeroes-validation-postprocessor.ts
@@ -1,5 +1,7 @@
 import {MaskitoOptions} from '@maskito/core';
 
+import {escapeRegExp} from '../../../utils';
+
 /**
  * It removes repeated leading zeroes for integer part.
  * @example 0,|00005 => Backspace => |5
@@ -9,7 +11,35 @@ import {MaskitoOptions} from '@maskito/core';
  */
 export function createLeadingZeroesValidationPostprocessor(
     decimalSeparator: string,
+    thousandSeparator: string,
 ): NonNullable<MaskitoOptions['postprocessor']> {
+    const trimLeadingZeroes = (value: string): string => {
+        const escapedThousandSeparator = escapeRegExp(thousandSeparator);
+
+        return value
+            .replace(
+                // all leading zeroes followed by another zero
+                new RegExp(`^(\\D+)?[0${escapedThousandSeparator}]+(?=0)`),
+                '$1',
+            )
+            .replace(
+                // zero followed by not-zero digit
+                new RegExp(`^(\\D+)?[0${escapedThousandSeparator}]+(?=[1-9])`),
+                '$1',
+            );
+    };
+
+    const countTrimmedZeroesBefore = (value: string, index: number): number => {
+        const valueBefore = value.slice(0, index);
+        const followedByZero = value.slice(index).startsWith('0');
+
+        return (
+            valueBefore.length -
+            trimLeadingZeroes(valueBefore).length +
+            (followedByZero ? 1 : 0)
+        );
+    };
+
     return ({value, selection}) => {
         const [from, to] = selection;
         const hasDecimalSeparator = value.includes(decimalSeparator);
@@ -32,20 +62,3 @@ export function createLeadingZeroesValidationPostprocessor(
         };
     };
 }
-
-function trimLeadingZeroes(value: string): string {
-    return value
-        .replace(/^(\D+)?0+(?=0)/, '$1') // all leading zeroes followed by another zero
-        .replace(/^(\D+)?0+(?=[1-9])/, '$1'); // zero followed by not-zero digit
-}
-
-function countTrimmedZeroesBefore(value: string, index: number): number {
-    const valueBefore = value.slice(0, index);
-    const followedByZero = value.slice(index).startsWith('0');
-
-    return (
-        valueBefore.length -
-        trimLeadingZeroes(valueBefore).length +
-        (followedByZero ? 1 : 0)
-    );
-}
diff --git a/...kit/src/lib/masks/number/processors/tests/leading-zeroes-validation-postprocessor.spec.ts b/...kit/src/lib/masks/number/processors/tests/leading-zeroes-validation-postprocessor.spec.ts
@@ -1,7 +1,7 @@
 import {createLeadingZeroesValidationPostprocessor} from '../leading-zeroes-validation-postprocessor';
 
 describe('createLeadingZeroesValidationPostprocessor', () => {
-    const processor = createLeadingZeroesValidationPostprocessor(',');
+    const processor = createLeadingZeroesValidationPostprocessor(',', '');
     const DYMMY_INITIAL_STATE = {value: '', selection: [0, 0]} as const;
 
     const process = (