fix: move hyphen replacement to correct place, fix e2e test

taiga-family · Jan 7, 2024 · de45c32 · de45c32
1 parent 0cbb6ce
commit de45c32
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/projects/kit/src/lib/constants/unicode-characters.ts b/projects/kit/src/lib/constants/unicode-characters.ts
@@ -35,3 +35,9 @@ export const CHAR_HYPHEN = '\u002D';
  * Can be used as `&minus;`. Don't confuse with {@link CHAR_HYPHEN}
  */
 export const CHAR_MINUS = '\u2212';
+
+/**
+ * {@link https://symbl.cc/en/30FC/ Katakana-Hiragana Prolonged Sound Mark}
+ * is used as prolonged sounds in Japanese.
+ */
+export const CHAR_JP_HYPEN = '\u30FC';
diff --git a/projects/kit/src/lib/masks/number/number-mask.ts b/projects/kit/src/lib/masks/number/number-mask.ts
@@ -4,6 +4,7 @@ import {
     CHAR_EM_DASH,
     CHAR_EN_DASH,
     CHAR_HYPHEN,
+    CHAR_JP_HYPEN,
     CHAR_MINUS,
     CHAR_NO_BREAK_SPACE,
 } from '../../constants';
@@ -51,7 +52,7 @@ export function maskitoNumberOptionsGenerator({
     prefix?: string;
     postfix?: string;
 } = {}): Required<MaskitoOptions> {
-    const pseudoMinuses = [CHAR_HYPHEN, CHAR_EN_DASH, CHAR_EM_DASH].filter(
+    const pseudoMinuses = [CHAR_HYPHEN, CHAR_EN_DASH, CHAR_EM_DASH, CHAR_JP_HYPEN].filter(
         char => char !== thousandSeparator && char !== decimalSeparator,
     );
     const validatedDecimalPseudoSeparators = validateDecimalPseudoSeparators({

diff --git a/projects/kit/src/lib/masks/number/processors/create-fullwidth-to-halfwidth-preprocessor.ts b/projects/kit/src/lib/masks/number/processors/create-fullwidth-to-halfwidth-preprocessor.ts
@@ -1,7 +1,5 @@
 import {MaskitoPreprocessor} from '@maskito/core';
 
-import {CHAR_MINUS} from '../../../constants';
-
 /**
  * Convert full width numbers like １, ２ to half width numbers 1, 2
  *
@@ -14,15 +12,13 @@ export function createFullWidthToHalfWidthPreprocessor(): MaskitoPreprocessor {
         return {
             elementState: {
                 selection,
-                value: value
-                    .replace(/[０-９]/g, s =>
-                        String.fromCharCode(s.charCodeAt(0) - 0xfee0),
-                    )
-                    .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, CHAR_MINUS),
+                value: value.replace(/[０-９]/g, s =>
+                    String.fromCharCode(s.charCodeAt(0) - 0xfee0),
+                ),
             },
-            data: data
-                .replace(/[０-９]/g, s => String.fromCharCode(s.charCodeAt(0) - 0xfee0))
-                .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, CHAR_MINUS),
+            data: data.replace(/[０-９]/g, s =>
+                String.fromCharCode(s.charCodeAt(0) - 0xfee0),
+            ),
         };
     };
 }