From 5515e867df0b46385d446aa41f36918dcb414efb Mon Sep 17 00:00:00 2001
From: Rasmus Eneman <rasmus@eneman.eu>
Date: Tue, 10 Apr 2018 19:21:14 +0200
Subject: [PATCH] [react-dom] fix signature of findDOMNode (#24211)

fixes #24167
---
 types/react-dom/index.d.ts                  | 2 +-
 types/react-tooltip/react-tooltip-tests.tsx | 4 ++--
 types/react/test/index.ts                   | 4 ++--
 types/react/v15/test/index.ts               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index da494182d6..bd9541217d 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -16,7 +16,7 @@ import {
     DOMAttributes, DOMElement, ReactNode, ReactPortal
 } from 'react';
 
-export function findDOMNode(instance: ReactInstance): Element;
+export function findDOMNode(instance: ReactInstance): Element | null | Text;
 export function unmountComponentAtNode(container: Element): boolean;
 
 export function createPortal(children: ReactNode, container: Element): ReactPortal;
diff --git a/types/react-tooltip/react-tooltip-tests.tsx b/types/react-tooltip/react-tooltip-tests.tsx
index 3fee5dba3e..97b7a085ea 100644
--- a/types/react-tooltip/react-tooltip-tests.tsx
+++ b/types/react-tooltip/react-tooltip-tests.tsx
@@ -91,7 +91,7 @@ export class ReactTooltipTest extends React.PureComponent {
             <p data-for="show-on-click" ref="fooShow" data-tip="tooltip" />
             <button
                 onClick={() => {
-                    ReactTooltip.show(findDOMNode(this.refs.fooShow));
+                    ReactTooltip.show(findDOMNode(this.refs.fooShow) as Element);
                 }}
             />
             <ReactTooltip id="show-on-click" />
@@ -99,7 +99,7 @@ export class ReactTooltipTest extends React.PureComponent {
             <p data-for="hide-on-click" ref="fooHide" data-tip="tooltip"/>
             <button
                 onClick={() => {
-                    ReactTooltip.hide(findDOMNode(this.refs.fooHide));
+                    ReactTooltip.hide(findDOMNode(this.refs.fooHide) as Element);
                 }}
             />
             <ReactTooltip id="hide-on-click" />
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index e0e4a09065..1df0282ee8 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -237,8 +237,8 @@ const str: string = ReactDOMServer.renderToString(element);
 const markup: string = ReactDOMServer.renderToStaticMarkup(element);
 const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
-let domNode: Element = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode);
+let domNode = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode as Element);
 const fragmentType: React.ComponentType = React.Fragment;
 
 //
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 8cd6765f4c..45894cb397 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -255,8 +255,8 @@ const str: string = ReactDOMServer.renderToString(element);
 const markup: string = ReactDOMServer.renderToStaticMarkup(element);
 const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
-let domNode: Element = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode);
+let domNode = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode as Element);
 
 //
 // React Elements