From ebd664074e4992bc74f2f8524dc3beb15d685dcd Mon Sep 17 00:00:00 2001
From: tomoya yokota <yokotaso.t@gmail.com>
Date: Wed, 19 Jun 2019 03:18:07 +0900
Subject: [PATCH] fix(react-overlay): fix types for some of ref properties
 (#36188)

* fix(react-overlay): fix types for some of ref properties

- OverlayRenderProps.props.ref
- OverlayRenderProps.arrowProps.ref
- DropdownToggleRenderProps.props.ref

* Update DropdownToggle.d.ts

* Update Overlay.d.ts
---
 types/react-overlays/lib/DropdownToggle.d.ts           |  2 +-
 types/react-overlays/lib/Overlay.d.ts                  |  4 ++--
 .../test/react-overlays-tests-individual.tsx           | 10 ++++++++--
 types/react-overlays/test/react-overlays-tests.tsx     | 10 ++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/types/react-overlays/lib/DropdownToggle.d.ts b/types/react-overlays/lib/DropdownToggle.d.ts
index 723bd5d490..78310c6f31 100644
--- a/types/react-overlays/lib/DropdownToggle.d.ts
+++ b/types/react-overlays/lib/DropdownToggle.d.ts
@@ -10,7 +10,7 @@ declare namespace DropdownToggle {
         show: boolean;
         toggle(show: boolean): void;
         props: {
-            ref?(element: HTMLElement): void;
+            ref: (popperNode: HTMLElement | null) => void;
             'aria-haspopup': true;
             'aria-expanded': boolean;
         };
diff --git a/types/react-overlays/lib/Overlay.d.ts b/types/react-overlays/lib/Overlay.d.ts
index 43b95353f7..dc091f4c26 100644
--- a/types/react-overlays/lib/Overlay.d.ts
+++ b/types/react-overlays/lib/Overlay.d.ts
@@ -18,12 +18,12 @@ declare namespace Overlay {
         outOfBoundaries?: boolean;
         scheduleUpdate(): void;
         props: {
-            ref?(element: HTMLElement): void;
+            ref: (popperNode: HTMLElement | null) => void;
             style: { [key: string]: string | number };
             'aria-labelledby'?: string;
         };
         arrowProps: {
-            ref?(element: HTMLElement): void;
+            ref: (popperNode: HTMLElement | null) => void;
             style: { [key: string]: string | number };
         };
     }
diff --git a/types/react-overlays/test/react-overlays-tests-individual.tsx b/types/react-overlays/test/react-overlays-tests-individual.tsx
index 1872ebca66..3044da21c4 100644
--- a/types/react-overlays/test/react-overlays-tests-individual.tsx
+++ b/types/react-overlays/test/react-overlays-tests-individual.tsx
@@ -22,8 +22,14 @@ interface OverlayTriggerProps extends Overlay.OverlayProps {
     overlay: any;
 }
 
-function renderOverlayContent({ props }: Overlay.OverlayRenderProps) {
-    return <div {...props}>Popover content</div>;
+function renderOverlayContent({ props, arrowProps }: Overlay.OverlayRenderProps) {
+    return (
+        <div ref={props.ref} {...props}>
+            <div ref={arrowProps.ref}>
+                Popover content
+            </div>
+        </div>
+    );
 }
 class TestOverlay extends React.Component<{}, { open: boolean }> {
     target: HTMLElement | null = null;
diff --git a/types/react-overlays/test/react-overlays-tests.tsx b/types/react-overlays/test/react-overlays-tests.tsx
index f1465dc384..aeffb68a00 100644
--- a/types/react-overlays/test/react-overlays-tests.tsx
+++ b/types/react-overlays/test/react-overlays-tests.tsx
@@ -17,8 +17,14 @@ class TestAffix extends React.Component {
     }
 }
 
-function renderOverlayContent({ props }: OverlayRenderProps) {
-    return <div {...props}>Popover content</div>;
+function renderOverlayContent({ props, arrowProps }: OverlayRenderProps) {
+    return (
+        <div ref={props.ref} {...props}>
+            <div ref={arrowProps.ref}>
+                Popover content
+            </div>
+        </div>
+    );
 }
 
 class TestOverlay extends React.Component<{}, { open: boolean }> {