Merge branch 'feature/update-formatted-input' into master

Author: Michael Braun

src/react-chayns-formatted_input/component/FormattedInput.jsx

@@ -86,9 +86,29 @@ export default class FormattedInput extends Component {
         this.handleChangeEvent(parsedValue, ...args);
     };
 
+    handleEnter = (value, ...args) => {
+        const { onEnter } = this.props;
+        if (onEnter) {
+            const { formatter } = this;
+
+            if (!(formatter instanceof Formatter)) {
+                return;
+            }
+
+            const parsedValue = formatter.parse(value);
+
+            onEnter(parsedValue, ...args);
+        }
+    };
+
     render() {
         const { value } = this.state;
-        const { defaultValue, initialFormatter, ...props } = this.props;
+        const {
+            defaultValue,
+            initialFormatter,
+            inputRef,
+            ...props
+        } = this.props;
 
         if (!(initialFormatter instanceof Formatter)) {
             return null;
@@ -99,10 +119,15 @@ export default class FormattedInput extends Component {
                 {...props}
                 inputRef={(ref) => {
                     this.input = ref;
+
+                    if (inputRef) {
+                        inputRef(ref);
+                    }
                 }}
                 value={value}
                 onChange={this.handleInputChange}
                 onBlur={this.handleChange}
+                onEnter={this.handleEnter}
             />
         );
     }
@@ -111,13 +136,17 @@ export default class FormattedInput extends Component {
 FormattedInput.propTypes = {
     initialFormatter: PropTypes.instanceOf(Formatter).isRequired,
     onChange: PropTypes.func,
+    onEnter: PropTypes.func,
+    inputRef: PropTypes.func,
     // eslint-disable-next-line react/forbid-prop-types
     defaultValue: PropTypes.any,
 };
 
 FormattedInput.defaultProps = {
     onChange: null,
+    onEnter: null,
     defaultValue: null,
+    inputRef: null,
 };
 
 FormattedInput.displayName = 'FormattedInput';

src/react-chayns-formatted_input/utils/IntegerFormatter.js

@@ -5,11 +5,12 @@ export default class IntegerFormatter extends Formatter {
 
     /* eslint-disable-next-line class-methods-use-this */
     format(value) {
-        if (value === null) {
+        const parsed = this.parse(value);
+        if (!parsed && parsed !== 0) {
             return '';
         }
 
-        return String(parseInt(value, 10));
+        return String(parsed);
     }
 
     /* eslint-disable-next-line class-methods-use-this */