From 4a95fb77ba8a8a585aa627261462cc00d185e331 Mon Sep 17 00:00:00 2001
From: Alessandra Davila <aledavila@ibm.com>
Date: Thu, 21 Oct 2021 13:17:47 -0500
Subject: [PATCH] fix(button): remove tooltip on click on button in and tooltip
 icon (#9882)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 packages/react/src/components/Button/Button.js           | 1 +
 packages/react/src/components/TooltipIcon/TooltipIcon.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react/src/components/Button/Button.js b/packages/react/src/components/Button/Button.js
index be79fd9d398b..368a182bf6d4 100644
--- a/packages/react/src/components/Button/Button.js
+++ b/packages/react/src/components/Button/Button.js
@@ -106,6 +106,7 @@ const Button = React.forwardRef(function Button(
 
   const handleClick = (evt) => {
     // Prevent clicks on the tooltip from triggering the button click event
+    setAllowTooltipVisibility(false);
     if (evt.target === tooltipRef.current) {
       evt.preventDefault();
       return;
diff --git a/packages/react/src/components/TooltipIcon/TooltipIcon.js b/packages/react/src/components/TooltipIcon/TooltipIcon.js
index 2a63b180dd51..cfc27662a3b7 100644
--- a/packages/react/src/components/TooltipIcon/TooltipIcon.js
+++ b/packages/react/src/components/TooltipIcon/TooltipIcon.js
@@ -98,6 +98,7 @@ const TooltipIcon = ({
   };
 
   const handleClick = (evt) => {
+    setAllowTooltipVisibility(false);
     // Prevent clicks on the tooltip from triggering the button click event
     if (evt.target === tooltipRef.current) {
       evt.preventDefault();