From d5ff9e275e02f80f0249a803e06c3d6a1d38f930 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 31 Mar 2021 16:14:46 +0200 Subject: [PATCH 1/2] check on ref existence before re-setting input- and forwardedRef --- src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 82a774c..4dfe6fe 100644 --- a/src/index.js +++ b/src/index.js @@ -268,11 +268,11 @@ const InputMask = forwardRef(function InputMask(props, forwardedRef) { onChange: isMasked && isEditable ? onChange : props.onChange, onMouseDown: isMasked && isEditable ? onMouseDown : props.onMouseDown, ref: ref => { - inputRef.current = findDOMNode(ref); + if (ref) inputRef.current = findDOMNode(ref); - if (isFunction(forwardedRef)) { + if (ref && isFunction(forwardedRef)) { forwardedRef(ref); - } else if (forwardedRef !== null && typeof forwardedRef === "object") { + } else if (ref && forwardedRef !== null && typeof forwardedRef === "object") { forwardedRef.current = ref; } }, From 7605ddcf6a8da2fe670338f755736327cf77ad5c Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 31 Mar 2021 16:16:15 +0200 Subject: [PATCH 2/2] check on ref existence before re-setting input- and forwardedRef --- src/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index 4dfe6fe..dfa21a0 100644 --- a/src/index.js +++ b/src/index.js @@ -268,12 +268,14 @@ const InputMask = forwardRef(function InputMask(props, forwardedRef) { onChange: isMasked && isEditable ? onChange : props.onChange, onMouseDown: isMasked && isEditable ? onMouseDown : props.onMouseDown, ref: ref => { - if (ref) inputRef.current = findDOMNode(ref); + if (ref) { + inputRef.current = findDOMNode(ref); - if (ref && isFunction(forwardedRef)) { - forwardedRef(ref); - } else if (ref && forwardedRef !== null && typeof forwardedRef === "object") { - forwardedRef.current = ref; + if (isFunction(forwardedRef)) { + forwardedRef(ref); + } else if (forwardedRef !== null && typeof forwardedRef === "object") { + forwardedRef.current = ref; + } } }, value: isMasked && isControlled ? lastValue : props.value