fix: fix pluralization when using full currency/unit names

dm4t2 · Mar 16, 2022 · fab0e93 · fab0e93
1 parent 291d841
commit fab0e93
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 44 deletions.
diff --git a/src/numberFormat.ts b/src/numberFormat.ts
@@ -2,6 +2,20 @@ import { escapeRegExp, substringBefore } from './utils'
 import { CurrencyDisplay, NumberFormatStyle, NumberInputOptions, UnitDisplay } from './api'
 import NumberFormatOptions = Intl.NumberFormatOptions
 
+const getPrefix = (parts: Intl.NumberFormatPart[]) =>
+  parts
+    .slice(0, parts.map((p) => p.type).indexOf('integer'))
+    .map((p) => p.value)
+    .join('')
+
+const getSuffix = (parts: Intl.NumberFormatPart[]) => {
+  const types = parts.map((p) => p.type)
+  return parts
+    .slice(Math.max(types.lastIndexOf('integer'), types.indexOf('fraction')) + 1)
+    .map((p) => p.value)
+    .join('')
+}
+
 export const DECIMAL_SEPARATORS = [',', '.', '٫']
 export const INTEGER_PATTERN = '(0|[1-9]\\d*)'
 
@@ -20,18 +34,20 @@ export class NumberFormat {
   maximumFractionDigits: number
   prefix: string
   negativePrefix: string
-  suffix: string
+  suffix: string[]
 
   constructor(options: NumberInputOptions) {
+    const createNumberFormat = (options: Intl.NumberFormatOptions) =>
+      new Intl.NumberFormat(locale, {
+        currency,
+        currencyDisplay,
+        unit,
+        unitDisplay,
+        style,
+        ...options
+      })
     const { formatStyle: style, currency, currencyDisplay, unit, unitDisplay, locale, precision } = options
-    const numberFormat = new Intl.NumberFormat(locale, {
-      currency,
-      currencyDisplay,
-      unit,
-      unitDisplay,
-      style,
-      minimumFractionDigits: style !== NumberFormatStyle.Currency ? 1 : undefined
-    })
+    const numberFormat = createNumberFormat({ minimumFractionDigits: style !== NumberFormatStyle.Currency ? 1 : undefined })
     const formatParts = numberFormat.formatToParts(style === NumberFormatStyle.Percent ? 1234.56 : 123456)
 
     this.locale = locale
@@ -58,12 +74,9 @@ export class NumberFormat {
       this.maximumFractionDigits = maximumFractionDigits
     }
 
-    const getPrefix = (str: string) => substringBefore(str, this.digits[1])
-    const getSuffix = (str: string) => str.substring(str.lastIndexOf(this.decimalSymbol ? this.digits[0] : this.digits[1]) + 1)
-
-    this.prefix = getPrefix(numberFormat.format(1))
-    this.suffix = getSuffix(numberFormat.format(1))
-    this.negativePrefix = getPrefix(numberFormat.format(-1))
+    this.prefix = getPrefix(numberFormat.formatToParts(1))
+    this.suffix = [getSuffix(createNumberFormat({ minimumFractionDigits: 0 }).formatToParts(1)), getSuffix(numberFormat.formatToParts(2))]
+    this.negativePrefix = getPrefix(numberFormat.formatToParts(-1))
   }
 
   parse(str: string | null): number | null {
@@ -99,8 +112,22 @@ export class NumberFormat {
       integerNumber /= 100
     }
     return [
-      this.stripPrefixOrSuffix(this.normalizeDigits(integerNumber.toLocaleString(this.locale, { ...options, useGrouping: true }))),
-      this.stripPrefixOrSuffix(this.normalizeDigits(integerNumber.toLocaleString(this.locale, { ...options, useGrouping: false })))
+      this.stripPrefixOrSuffix(
+        this.normalizeDigits(
+          integerNumber.toLocaleString(this.locale, {
+            ...options,
+            useGrouping: true
+          })
+        )
+      ),
+      this.stripPrefixOrSuffix(
+        this.normalizeDigits(
+          integerNumber.toLocaleString(this.locale, {
+            ...options,
+            useGrouping: false
+          })
+        )
+      )
     ].includes(formattedNumber)
   }
 
@@ -136,7 +163,7 @@ export class NumberFormat {
   }
 
   insertPrefixOrSuffix(str: string, negative: boolean): string {
-    return `${negative ? this.negativePrefix : this.prefix}${str}${this.suffix}`
+    return `${negative ? this.negativePrefix : this.prefix}${str}${this.suffix[1]}`
   }
 
   stripGroupingSeparator(str: string): string {
@@ -148,7 +175,7 @@ export class NumberFormat {
   }
 
   stripPrefixOrSuffix(str: string): string {
-    return str.replace(this.negativePrefix, '').replace(this.prefix, '').replace(this.suffix, '')
+    return str.replace(this.negativePrefix, '').replace(this.prefix, '').replace(this.suffix[1], '').replace(this.suffix[0], '')
   }
 
   normalizeDecimalSeparator(str: string, from: number): string {

diff --git a/src/numberInput.ts b/src/numberInput.ts
@@ -170,7 +170,8 @@ export class NumberInput {
         formattedValue = formattedValue
           .replace(this.numberFormat.negativePrefix, this.numberFormat.minusSymbol)
           .replace(this.numberFormat.prefix, '')
-          .replace(this.numberFormat.suffix, '')
+          .replace(this.numberFormat.suffix[1], '')
+          .replace(this.numberFormat.suffix[0], '')
       }
 
       this.el.value = formattedValue
@@ -222,9 +223,15 @@ export class NumberInput {
                 }
               }
             }
-            return this.options.hidePrefixOrSuffixOnFocus
-              ? newValueLength - caretPositionFromLeft
-              : Math.max(newValueLength - Math.max(caretPositionFromLeft, suffix.length), prefix.length)
+            if (this.options.hidePrefixOrSuffixOnFocus) {
+              return newValueLength - caretPositionFromLeft
+            } else {
+              const getSuffixLength = (str: string) => (str.includes(suffix[1]) ? suffix[1] : str.includes(suffix[0]) ? suffix[0] : '').length
+              const oldSuffixLength = getSuffixLength(value)
+              const newSuffixLength = getSuffixLength(this.formattedValue)
+              const suffixLengthDifference = Math.abs(newSuffixLength - oldSuffixLength)
+              return Math.max(newValueLength - Math.max(caretPositionFromLeft - suffixLengthDifference, newSuffixLength), prefix.length)
+            }
           }
           this.setCaretPosition(getCaretPositionAfterFormat())
         }
@@ -243,8 +250,9 @@ export class NumberInput {
           const getCaretPositionOnFocus = () => {
             const { prefix, suffix, groupingSymbol } = this.numberFormat
             if (!this.options.hidePrefixOrSuffixOnFocus) {
-              if (selectionStart >= value.length - suffix.length) {
-                return this.formattedValue.length - suffix.length
+              const suffixLength = suffix[this.numberValue === 1 ? 0 : 1].length
+              if (selectionStart >= value.length - suffixLength) {
+                return this.formattedValue.length - suffixLength
               } else if (selectionStart < prefix.length) {
                 return prefix.length
               }