Merge pull request #17 from telerik/constant-format

fix(numbers): constant format is interpreted as zero format

Author: danielkaradachki

src/numbers/custom-number-format.js

@@ -80,14 +80,22 @@ function roundNumber(formatOptions) {
     formatOptions.decimalIndex = decimalIndex;
 }
 
+function isConstantFormat(format) {
+    return format.indexOf(SHARP) === -1 && format.indexOf(ZERO) === -1;
+}
+
 function setValueSpecificFormat(formatOptions) {
     let { number, format } = formatOptions;
     format = format.split(";");
     if (formatOptions.negative && format[1]) {
         format = format[1];
         formatOptions.hasNegativeFormat = true;
     } else if (number === 0) {
-        format = format[2] || format[0];
+        const zeroFormat = format[2];
+        format = zeroFormat || format[0];
+        if (zeroFormat && isConstantFormat(zeroFormat)) {
+            formatOptions.constant = zeroFormat;
+        }
     } else {
         format = format[0];
     }
@@ -246,10 +254,6 @@ function applyCustomFormat(formatOptions, info) {
     return number;
 }
 
-function isConstantFormat(format) {
-    return format.indexOf(SHARP) === -1 && format.indexOf(ZERO) === -1;
-}
-
 export default function customNumberFormat(number, format, info) {
     const formatOptions = {
         negative: number < 0,
@@ -259,8 +263,8 @@ export default function customNumberFormat(number, format, info) {
 
     setValueSpecificFormat(formatOptions);
 
-    if (isConstantFormat(formatOptions.format)) {
-        return formatOptions.format;
+    if (formatOptions.constant) {
+        return formatOptions.constant;
     }
 
     setFormatLiterals(formatOptions);

test/numbers.js

@@ -482,6 +482,10 @@ describe('custom formatting', () => {
         expect(formatNumber(17.115, "#.##")).toEqual("17.12");
     });
 
+    it("returns number if format is a constant", () => {
+        expect(formatNumber(0, "Foo")).toEqual("0");
+    });
+
 });
 
 describe('parseNumber', () => {