fix 0 precision commaNumber formatting

player-ui · Mar 8, 2024 · 2efc708 · 2efc708
1 parent 1c572a8
commit 2efc708
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/plugins/common-types/core/src/formats/__tests__/formats.test.ts b/plugins/common-types/core/src/formats/__tests__/formats.test.ts
@@ -68,6 +68,9 @@ describe('commaNumber', () => {
       expect(commaNumber.format?.(1000.999, { precision: 2 })).toBe('1,000.99');
       expect(commaNumber.format?.(1000, { precision: 2 })).toBe('1,000.00');
       expect(commaNumber.format?.(1000.1, { precision: 2 })).toBe('1,000.10');
+      expect(commaNumber.format?.(123456789, { precision: 0 })).toBe(
+        '123,456,789'
+      );
     });
 
     it('handles out of bounds', () => {

diff --git a/plugins/common-types/core/src/formats/index.ts b/plugins/common-types/core/src/formats/index.ts
@@ -66,6 +66,10 @@ export const commaNumber: FormatType<
   {
     /** The number of decimal places to show */
     precision?: number;
+    /** show zero in preDecDigits if true, hide otherwise  */
+    showZero?: boolean;
+    /** show zero(es) in postDecDeigits if true, hide otherwise */
+    showZeroDecimal?: boolean;
   }
 > = {
   name: 'commaNumber',
@@ -81,6 +85,8 @@ export const commaNumber: FormatType<
     }
 
     const value = String(_value);
+    const showZero = (options?.showZero as boolean) ?? true;
+    const showZeroDecimal = (options?.showZeroDecimal as boolean) ?? true;
 
     // Check to see if first valid char is a negative
     const isNeg = value.replace(/[^0-9.-]/g, '').charAt(0) === '-';
@@ -108,26 +114,39 @@ export const commaNumber: FormatType<
     }
 
     if (options?.precision !== undefined) {
-      postDecDigits = postDecDigits
-        .substring(0, options.precision)
-        .padEnd(options.precision, '0');
+      if (showZeroDecimal) {
+        postDecDigits = postDecDigits
+          .substring(0, options.precision)
+          .padEnd(options.precision, '0');
+      } else if (postDecDigits.length >= options.precision) {
+        postDecDigits =
+          Number(postDecDigits.substring(0, options.precision)) === 0
+            ? ''
+            : postDecDigits.substring(0, options.precision);
+      }
     }
 
     // Beautify
     preDecDigits = preDecDigits.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-
     if (preDecDigits === '' && firstDecimal === 0) {
       preDecDigits = '0';
     }
 
+    if (Number(preDecDigits) === 0 && !showZero && postDecDigits === '') {
+      preDecDigits = '';
+    }
+
     // Put pieces together
     let retVal = preDecDigits;
 
     if (isNeg) {
       retVal = `-${retVal}`;
     }
 
-    if (firstDecimal >= 0 || options?.precision !== undefined) {
+    if (
+      (firstDecimal >= 0 || options?.precision !== undefined) &&
+      postDecDigits !== ''
+    ) {
       retVal += `.${postDecDigits}`;
     }