Fixed issue #11.

jsillitoe · Feb 15, 2017 · ab99be7 · ab99be7
1 parent 94e30dd
commit ab99be7
Show file tree

Hide file tree

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

diff --git a/src/index.js b/src/index.js
@@ -67,6 +67,24 @@ const CurrencyInput = React.createClass({
         }else{
 
             if (typeof initialValue == 'string') {
+                // Some people, when confronted with a problem, think "I know, I'll use regular expressions."
+                // Now they have two problems.
+
+                // Strip out thousand separators, prefix, and suffix, etc.
+                if (props.thousandSeparator === "."){
+                    // special handle the . thousand separator
+                    initialValue = initialValue.replace(/\./g, '');
+                }
+
+                if (props.decimalSeparator != "."){
+                    // fix the decimal separator
+                    initialValue = initialValue.replace(new RegExp(props.decimalSeparator, 'g'), '.');
+                }
+
+                //Strip out anything that is not a digit, -, or decimal separator
+                initialValue = initialValue.replace(/[^0-9-.]/g, '');
+
+                // now we can parse.
                 initialValue = Number.parseFloat(initialValue);
             }
             initialValue = Number(initialValue).toLocaleString(undefined, {

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -145,6 +145,91 @@ describe('react-currency-input', function(){
             expect (renderedComponent.getMaskedValue()).to.equal('1,234,568')
         });
 
+
+        it('Handles strings with separators', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1,000.01" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,000.01')
+        });
+
+
+        it('Handles strings with prefixes', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="$10.01" prefix="$" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('$10.01')
+        });
+
+        it('Handles strings with suffixes', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="10.01 kr" suffix=" kr" />
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('10.01 kr')
+        });
+
+
+        it('Handles strings with custom separators', function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="123.456.789,12" decimalSeparator="," thousandSeparator="."/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('123.456.789,12')
+        });
+
+
+        it("Handles 1,234,567.89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1,234,567.89" decimalSeparator="." thousandSeparator=","/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567.89')
+        });
+
+
+        it("Handles 1 234 567.89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1,234,567.89" decimalSeparator="." thousandSeparator=" "/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1 234 567.89')
+        });
+
+        it("Handles 1 234 567,89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1 234 567,89" decimalSeparator="," thousandSeparator=" "/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1 234 567,89')
+        });
+
+        it("Handles 1,234,567·89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1,234,567·89" decimalSeparator="·" thousandSeparator=","/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1,234,567·89')
+        });
+
+        it("Handles 1.234.567,89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1.234.567,89" decimalSeparator="," thousandSeparator="."/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1.234.567,89')
+        });
+
+        it("Handles 1˙234˙567,89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1˙234˙567,89" decimalSeparator="," thousandSeparator="˙"/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal('1˙234˙567,89')
+        });
+
+
+        it("Handles 1'234'567.89 format", function() {
+            var renderedComponent = ReactTestUtils.renderIntoDocument(
+                <CurrencyInput value="1'234'567.89" decimalSeparator="." thousandSeparator="'"/>
+            );
+            expect (renderedComponent.getMaskedValue()).to.equal("1'234'567.89")
+        });
+
+
+
     });
 
     describe('change events', function(){