Fixed cloneElement bug on Form.js

Expensify · Mar 17, 2023 · c4d8509 · c4d8509
1 parent 4f81115
commit c4d8509
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/components/Form.js b/src/components/Form.js
@@ -269,12 +269,24 @@ class Form extends React.Component {
                 .value() || '';
 
             return React.cloneElement(child, {
-                ref: node => this.inputRefs[inputID] = node,
+                ref: (node) => {
+                    this.inputRefs[inputID] = node;
+
+                    // Call the original ref, if any
+                    const {ref} = child;
+                    if (_.isFunction(ref)) {
+                        ref(node);
+                    }
+                },
                 value: this.state.inputValues[inputID],
                 errorText: this.state.errors[inputID] || fieldErrorMessage,
-                onBlur: () => {
+                onBlur: (event) => {
                     this.setTouchedInput(inputID);
                     this.validate(this.state.inputValues);
+
+                    if (_.isFunction(child.props.onBlur)) {
+                        child.props.onBlur(event);
+                    }
                 },
                 onInputChange: (value, key) => {
                     const inputKey = key || inputID;