fix(Tooltip): avoid stealing focus when dismissing with mouseclick

carbon-design-system · Jun 1, 2021 · 07cd72b · 07cd72b
1 parent 309be08
commit 07cd72b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
@@ -300,7 +300,11 @@ class Tooltip extends Component {
       if (!open && tooltipBody && tooltipBody.id === this._tooltipId) {
         this._tooltipDismissed = true;
         const currentActiveNode = event?.relatedTarget;
-        if (!currentActiveNode && document.activeElement === document.body) {
+        if (
+          !currentActiveNode &&
+          document.activeElement === document.body &&
+          event.type !== 'click'
+        ) {
           this._triggerRef?.current.focus();
         }
       }