[Issue-196] Add numeral integer scale

nosir · Jun 24, 2017 · eb8dc0a · eb8dc0a
1 parent 05ccd32
commit eb8dc0a
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.7.19",
+  "version": "0.7.20",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -123,6 +123,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        pps.numeralFormatter = new Cleave.NumeralFormatter(
 	            pps.numeralDecimalMark,
+	            pps.numeralIntegerScale,
 	            pps.numeralDecimalScale,
 	            pps.numeralThousandsGroupStyle,
 	            pps.numeralPositiveOnly,
@@ -424,13 +425,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	var NumeralFormatter = function (numeralDecimalMark,
+	                                 numeralIntegerScale,
 	                                 numeralDecimalScale,
 	                                 numeralThousandsGroupStyle,
 	                                 numeralPositiveOnly,
 	                                 delimiter) {
 	    var owner = this;
 
 	    owner.numeralDecimalMark = numeralDecimalMark || '.';
+	    owner.numeralIntegerScale = numeralIntegerScale >= 0 ? numeralIntegerScale : 10;
 	    owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
 	    owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
 	    owner.numeralPositiveOnly = !!numeralPositiveOnly;
@@ -484,6 +487,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	            partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
 	        }
 
+	        if (owner.numeralIntegerScale > 0) {
+	          partInteger = partInteger.slice(0, owner.numeralIntegerScale + (value.slice(0, 1) === '-' ? 1 : 0));
+	        }
+
 	        switch (owner.numeralThousandsGroupStyle) {
 	        case NumeralFormatter.groupStyle.lakh:
 	            partInteger = partInteger.replace(/(\d)(?=(\d\d)+\d$)/g, '$1' + owner.delimiter);
@@ -946,6 +953,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        // numeral
 	        target.numeral = !!opts.numeral;
+	        target.numeralIntegerScale = opts.numeralIntegerScale >= 0 ? opts.numeralIntegerScale : 10;
 	        target.numeralDecimalScale = opts.numeralDecimalScale >= 0 ? opts.numeralDecimalScale : 2;
 	        target.numeralDecimalMark = opts.numeralDecimalMark || '.';
 	        target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -152,7 +152,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            return;
 	        }
 
-	        pps.numeralFormatter = new NumeralFormatter(pps.numeralDecimalMark, pps.numeralDecimalScale, pps.numeralThousandsGroupStyle, pps.numeralPositiveOnly, pps.delimiter);
+	        pps.numeralFormatter = new NumeralFormatter(pps.numeralDecimalMark, pps.numeralIntegerScale, pps.numeralDecimalScale, pps.numeralThousandsGroupStyle, pps.numeralPositiveOnly, pps.delimiter);
 	    },
 
 	    initDateFormatter: function initDateFormatter() {
@@ -1582,10 +1582,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	'use strict';
 
-	var NumeralFormatter = function NumeralFormatter(numeralDecimalMark, numeralDecimalScale, numeralThousandsGroupStyle, numeralPositiveOnly, delimiter) {
+	var NumeralFormatter = function NumeralFormatter(numeralDecimalMark, numeralIntegerScale, numeralDecimalScale, numeralThousandsGroupStyle, numeralPositiveOnly, delimiter) {
 	    var owner = this;
 
 	    owner.numeralDecimalMark = numeralDecimalMark || '.';
+	    owner.numeralIntegerScale = numeralIntegerScale >= 0 ? numeralIntegerScale : 10;
 	    owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
 	    owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
 	    owner.numeralPositiveOnly = !!numeralPositiveOnly;
@@ -1642,6 +1643,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	            partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
 	        }
 
+	        if (owner.numeralIntegerScale > 0) {
+	            partInteger = partInteger.slice(0, owner.numeralIntegerScale + (value.slice(0, 1) === '-' ? 1 : 0));
+	        }
+
 	        switch (owner.numeralThousandsGroupStyle) {
 	            case NumeralFormatter.groupStyle.lakh:
 	                partInteger = partInteger.replace(/(\d)(?=(\d\d)+\d$)/g, '$1' + owner.delimiter);
@@ -2099,6 +2104,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        // numeral
 	        target.numeral = !!opts.numeral;
+	        target.numeralIntegerScale = opts.numeralIntegerScale >= 0 ? opts.numeralIntegerScale : 10;
 	        target.numeralDecimalScale = opts.numeralDecimalScale >= 0 ? opts.numeralDecimalScale : 2;
 	        target.numeralDecimalMark = opts.numeralDecimalMark || '.';
 	        target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -123,6 +123,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        pps.numeralFormatter = new Cleave.NumeralFormatter(
 	            pps.numeralDecimalMark,
+	            pps.numeralIntegerScale,
 	            pps.numeralDecimalScale,
 	            pps.numeralThousandsGroupStyle,
 	            pps.numeralPositiveOnly,
@@ -424,13 +425,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	'use strict';
 
 	var NumeralFormatter = function (numeralDecimalMark,
+	                                 numeralIntegerScale,
 	                                 numeralDecimalScale,
 	                                 numeralThousandsGroupStyle,
 	                                 numeralPositiveOnly,
 	                                 delimiter) {
 	    var owner = this;
 
 	    owner.numeralDecimalMark = numeralDecimalMark || '.';
+	    owner.numeralIntegerScale = numeralIntegerScale >= 0 ? numeralIntegerScale : 10;
 	    owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
 	    owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
 	    owner.numeralPositiveOnly = !!numeralPositiveOnly;
@@ -484,6 +487,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	            partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
 	        }
 
+	        if (owner.numeralIntegerScale > 0) {
+	          partInteger = partInteger.slice(0, owner.numeralIntegerScale + (value.slice(0, 1) === '-' ? 1 : 0));
+	        }
+
 	        switch (owner.numeralThousandsGroupStyle) {
 	        case NumeralFormatter.groupStyle.lakh:
 	            partInteger = partInteger.replace(/(\d)(?=(\d\d)+\d$)/g, '$1' + owner.delimiter);
@@ -946,6 +953,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        // numeral
 	        target.numeral = !!opts.numeral;
+	        target.numeralIntegerScale = opts.numeralIntegerScale >= 0 ? opts.numeralIntegerScale : 10;
 	        target.numeralDecimalScale = opts.numeralDecimalScale >= 0 ? opts.numeralDecimalScale : 2;
 	        target.numeralDecimalMark = opts.numeralDecimalMark || '.';
 	        target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/doc/options.md b/doc/options.md
@@ -15,6 +15,7 @@
 - Numerals:
     - [numeral](#numeral)
     - [numeralThousandsGroupStyle](#numeralthousandsgroupstyle)
+    - [numeralIntegerScale](#numeralintegerscale)
     - [numeralDecimalScale](#numeraldecimalscale)
     - [numeralDecimalMark](#numeraldecimalmark)
     - [numeralPositiveOnly](#numeralpositiveonly)
@@ -197,6 +198,23 @@ new Cleave('.my-input', {
 // 123,4567.89
 ```
 
+### `numeralIntegerScale`
+
+An `Int` value indicates the numeral integer scale.
+
+**Default value**: `10`
+
+```js
+new Cleave('.my-input', {
+    numeral: true,
+    numeralIntegerScale: 4
+});
+```
+
+```js
+// 1,234.56
+```
+
 ### `numeralDecimalScale`
 
 An `Int` value indicates the numeral decimal scale.

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.7.19",
+  "version": "0.7.20",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -67,6 +67,7 @@ Cleave.prototype = {
 
         pps.numeralFormatter = new Cleave.NumeralFormatter(
             pps.numeralDecimalMark,
+            pps.numeralIntegerScale,
             pps.numeralDecimalScale,
             pps.numeralThousandsGroupStyle,
             pps.numeralPositiveOnly,

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -88,6 +88,7 @@ var Cleave = CreateReactClass({
 
         pps.numeralFormatter = new NumeralFormatter(
             pps.numeralDecimalMark,
+            pps.numeralIntegerScale,
             pps.numeralDecimalScale,
             pps.numeralThousandsGroupStyle,
             pps.numeralPositiveOnly,

diff --git a/src/common/DefaultProperties.js b/src/common/DefaultProperties.js
@@ -30,6 +30,7 @@ var DefaultProperties = {
 
         // numeral
         target.numeral = !!opts.numeral;
+        target.numeralIntegerScale = opts.numeralIntegerScale >= 0 ? opts.numeralIntegerScale : 10;
         target.numeralDecimalScale = opts.numeralDecimalScale >= 0 ? opts.numeralDecimalScale : 2;
         target.numeralDecimalMark = opts.numeralDecimalMark || '.';
         target.numeralThousandsGroupStyle = opts.numeralThousandsGroupStyle || 'thousand';

diff --git a/src/shortcuts/NumeralFormatter.js b/src/shortcuts/NumeralFormatter.js
@@ -1,13 +1,15 @@
 'use strict';
 
 var NumeralFormatter = function (numeralDecimalMark,
+                                 numeralIntegerScale,
                                  numeralDecimalScale,
                                  numeralThousandsGroupStyle,
                                  numeralPositiveOnly,
                                  delimiter) {
     var owner = this;
 
     owner.numeralDecimalMark = numeralDecimalMark || '.';
+    owner.numeralIntegerScale = numeralIntegerScale >= 0 ? numeralIntegerScale : 10;
     owner.numeralDecimalScale = numeralDecimalScale >= 0 ? numeralDecimalScale : 2;
     owner.numeralThousandsGroupStyle = numeralThousandsGroupStyle || NumeralFormatter.groupStyle.thousand;
     owner.numeralPositiveOnly = !!numeralPositiveOnly;
@@ -61,6 +63,10 @@ NumeralFormatter.prototype = {
             partDecimal = owner.numeralDecimalMark + parts[1].slice(0, owner.numeralDecimalScale);
         }
 
+        if (owner.numeralIntegerScale > 0) {
+          partInteger = partInteger.slice(0, owner.numeralIntegerScale + (value.slice(0, 1) === '-' ? 1 : 0));
+        }
+
         switch (owner.numeralThousandsGroupStyle) {
         case NumeralFormatter.groupStyle.lakh:
             partInteger = partInteger.replace(/(\d)(?=(\d\d)+\d$)/g, '$1' + owner.delimiter);

diff --git a/test/fixtures/numeral.json b/test/fixtures/numeral.json
@@ -77,6 +77,27 @@
       ]
     ]
   },
+  {
+    "numeralIntegerScale": 4,
+    "numbers": [
+      [
+        "12",
+        "12"
+      ],
+      [
+        "1234",
+        "1,234"
+      ],
+      [
+        "1234567",
+        "1,234"
+      ],
+      [
+        "-12345",
+        "-1,234"
+      ]
+    ]
+  },
   {
     "numeralDecimalScale": 0,
     "numbers": [
@@ -195,6 +216,23 @@
       ]
     ]
   },
+  {
+    "thousandsGroupStyle": "lakh",
+    "numeralIntegerScale": 6,
+    "numeralDecimalScale": 3,
+    "numeralDecimalMark": "'",
+    "delimiter": "|",
+    "numbers": [
+      [
+        "1234567'8901234",
+        "1|23|456'890"
+      ],
+      [
+        "-1234567'8901234",
+        "-1|23|456'890"
+      ]
+    ]
+  },
   {
     "thousandsGroupStyle": "thousand",
     "numeralPositiveOnly": true,

diff --git a/test/unit/NumeralFormatter_spec.js b/test/unit/NumeralFormatter_spec.js
@@ -10,6 +10,10 @@ describe('NumeralFormatter', function () {
             title.push('Thousands Group Style: ' + numeral.thousandsGroupStyle);
         }
 
+        if (numeral.numeralIntegerScale) {
+            title.push('Integer Scale: ' + numeral.numeralIntegerScale);
+        }
+
         if (numeral.numeralDecimalScale || numeral.numeralDecimalScale === 0) {
             title.push('Decimal Scale: ' + numeral.numeralDecimalScale);
         }
@@ -33,6 +37,7 @@ describe('NumeralFormatter', function () {
         describe(title.join(', '), function () {
             var numeralFormatter = new NumeralFormatter(
                 numeral.numeralDecimalMark,
+                numeral.numeralIntegerScale,
                 numeral.numeralDecimalScale,
                 numeral.thousandsGroupStyle,
                 numeral.numeralPositiveOnly,