From aae89af88a206db0019e0d27578e7070dca613a3 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 22 Feb 2021 13:58:06 +0300
Subject: [PATCH] Fixed #1818 - InputText component reference returns Invalid
 prop forwardRef

---
 src/components/inputtext/InputText.js | 38 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/inputtext/InputText.js b/src/components/inputtext/InputText.js
index a004ec0472..4dc6286dd6 100644
--- a/src/components/inputtext/InputText.js
+++ b/src/components/inputtext/InputText.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, createRef } from 'react';
 import PropTypes from 'prop-types';
 import { classNames } from '../utils/ClassNames';
 import KeyFilter from '../keyfilter/KeyFilter';
@@ -25,28 +25,15 @@ class InputTextComponent extends Component {
         validateOnly: PropTypes.bool,
         tooltip: PropTypes.string,
         tooltipOptions: PropTypes.object,
-        forwardRef: PropTypes.func
+        forwardRef: PropTypes.any
     };
 
     constructor(props) {
         super(props);
         this.onInput = this.onInput.bind(this);
         this.onKeyPress = this.onKeyPress.bind(this);
-    }
-
-    getElementRef(el) {
-        this.element = el;
-
-        if (this.props.forwardRef) {
-            if (ObjectUtils.isFunction(this.props.forwardRef)) {
-                return this.props.forwardRef(el);
-            }
-            else {
-                return this.props.forwardRef;
-            }
-        }
 
-        return this.element;
+        this.elementRef = createRef(this.props.forwardRef);
     }
 
     isFilled() {
@@ -81,7 +68,22 @@ class InputTextComponent extends Component {
         }
     }
 
+    updateForwardRef() {
+        let ref = this.props.forwardRef;
+
+        if (ref) {
+            if (typeof ref === 'function') {
+                ref(this.elementRef.current);
+            }
+            else {
+                ref.current = this.elementRef.current;
+            }
+        }
+    }
+
     componentDidMount() {
+        this.updateForwardRef();
+
         if (this.props.tooltip) {
             this.renderTooltip();
         }
@@ -105,7 +107,7 @@ class InputTextComponent extends Component {
 
     renderTooltip() {
         this.tooltip = tip({
-            target: this.element,
+            target: this.elementRef.current,
             content: this.props.tooltip,
             options: this.props.tooltipOptions
         });
@@ -119,7 +121,7 @@ class InputTextComponent extends Component {
 
         let inputProps = ObjectUtils.findDiffKeys(this.props, InputTextComponent.defaultProps);
 
-        return <input ref={(el) => this.getElementRef(el)} {...inputProps} className={className} onInput={this.onInput} onKeyPress={this.onKeyPress} />;
+        return <input ref={this.elementRef} {...inputProps} className={className} onInput={this.onInput} onKeyPress={this.onKeyPress} />;
     }
 }