From 10ccf12c6e252d742e2b8343a49165d0e0d0cbf3 Mon Sep 17 00:00:00 2001 From: Evan Sharp Date: Mon, 27 Jan 2020 11:00:41 -0500 Subject: [PATCH] fix(Tooltip,Popover): account for shadowDOM target (#1769) Ref #1691 --- src/TooltipPopoverWrapper.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/TooltipPopoverWrapper.js b/src/TooltipPopoverWrapper.js index a4ca92e74..898d3e529 100644 --- a/src/TooltipPopoverWrapper.js +++ b/src/TooltipPopoverWrapper.js @@ -162,7 +162,11 @@ class TooltipPopoverWrapper extends React.Component { show(e) { if (!this.props.isOpen) { this.clearShowTimeout(); - this.currentTargetElement = e && e.currentTarget; + this.currentTargetElement = e ? e.currentTarget || e.target : null; + if (e && e.composedPath && typeof e.composedPath === 'function') { + const path = e.composedPath(); + this.currentTargetElement = path && path[0] || this.currentTargetElement; + } this.toggle(e); } }