Fixed issue #9: Non-standard conversion from given value into display…

…ed value version set to 1.2.1
jsillitoe · Feb 13, 2017 · b58119b · b58119b
1 parent b50a03e
commit b58119b
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-currency-input",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "React component for inputing currency amounts",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -64,6 +64,17 @@ const CurrencyInput = React.createClass({
         let initialValue = props.value;
         if (!initialValue) {
             initialValue = props.allowEmpty? null : '';
+        }else{
+
+            if (typeof initialValue == 'string') {
+                initialValue = Number.parseFloat(initialValue);
+            }
+            initialValue = Number(initialValue).toLocaleString(undefined, {
+                style                : 'decimal',
+                minimumFractionDigits: props.precision,
+                maximumFractionDigits: props.precision
+            })
+
         }
 
         const { maskedValue, value } = mask(

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -53,7 +53,7 @@ describe('react-currency-input', function(){
         });
 
         it('<CurrencyInput> should have masked value of "123.456,789"', function() {
-            expect(this.renderedComponent.getMaskedValue()).to.equal('123.456,789')
+            expect(this.renderedComponent.getMaskedValue()).to.equal('123.456.789,000')
         });
 
         it('<input> should be of type "tel"', function() {
@@ -62,6 +62,91 @@ describe('react-currency-input', function(){
     });
 
 
+    describe('properly convert number value props into display values', function(){
+
+        it('adds decimals to whole numbers to match precision', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value={123456789} />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('123,456,789.00')
+        });
+
+        it('Does not change value when precision matches', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value={1234567.89} />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.89')
+        });
+
+
+        it('Rounds down properly when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value={1234567.89123} />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.89')
+        });
+
+
+        it('Rounds up properly when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value={1234567.89999} />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.90')
+        });
+
+        it('Rounds up the whole number when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="0" value={1234567.89999} />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,568')
+        });
+
+    });
+
+
+    describe('properly convert string value props into display values', function(){
+
+        it('adds decimals to whole numbers to match precision', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value="6300" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('6,300.00')
+        });
+
+
+        it('Does not change value when precision matches', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value="1234567.89" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.89')
+        });
+
+
+        it('Rounds down properly when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value="1234567.89123" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.89')
+        });
+
+
+        it('Rounds up properly when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="2" value="1234567.89999" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.90')
+        });
+
+
+        it('Rounds up the whole number when an number with extra decimals is passed in', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput precision="0" value="1234567.89999" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,568')
+        });
+
+    });
+
     describe('change events', function(){
 
         before('render and locate element', function() {