From 546eda608aef4d7468f38d62716a638366467080 Mon Sep 17 00:00:00 2001
From: Duy Tran <duybkit13@gmail.com>
Date: Sat, 8 Feb 2020 04:09:36 +0700
Subject: [PATCH] chore(tooltip): remove aria-hashpopup property in tooltip
 component (#5301)

Co-authored-by: TJ Egan <tw15egan@gmail.com>
---
 packages/components/src/components/tooltip/tooltip.hbs | 6 +++---
 packages/react/src/components/Tooltip/Tooltip.js       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/components/tooltip/tooltip.hbs b/packages/components/src/components/tooltip/tooltip.hbs
index 85ccd8a5997f..c1e796a0bc72 100644
--- a/packages/components/src/components/tooltip/tooltip.hbs
+++ b/packages/components/src/components/tooltip/tooltip.hbs
@@ -9,7 +9,7 @@
 <div id="{{noHeading.idSuffix}}-label" class="{{@root.prefix}}--tooltip__label">
   Tooltip label
   <button aria-expanded="false" aria-labelledby="{{noHeading.idSuffix}}-label" data-tooltip-trigger data-tooltip-target="#{{noHeading.idSuffix}}"
-    class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{noHeading.idSuffix}}" aria-haspopup="true">
+    class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{noHeading.idSuffix}}">
     {{ carbon-icon 'Information16' }}
   </button>
 </div>
@@ -32,7 +32,7 @@
 <div id="{{heading.idSuffix}}-label" class="{{@root.prefix}}--tooltip__label">
   Tooltip label
   <button aria-expanded="false" aria-labelledby="{{heading.idSuffix}}-label" data-tooltip-trigger data-tooltip-target="#{{heading.idSuffix}}"
-    class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{heading.idSuffix}}" aria-haspopup="true">
+    class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{heading.idSuffix}}">
     {{ carbon-icon 'Information16' }}
   </button>
 </div>
@@ -50,7 +50,7 @@
 <div id="{{label.idSuffix}}-label" class="{{@root.prefix}}--tooltip__label">
   Tooltip label
   <div tabindex="0" aria-expanded="false" aria-labelledby="{{label.idSuffix}}-label" data-tooltip-trigger data-tooltip-target="#{{label.idSuffix}}"
-    role="button" class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{label.idSuffix}}" aria-haspopup="true">
+    role="button" class="{{@root.prefix}}--tooltip__trigger" aria-controls="{{label.idSuffix}}">
     {{ carbon-icon 'Information16' }}
   </div>
 </div>
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
index 993d91f98e77..0a11262a4308 100644
--- a/packages/react/src/components/Tooltip/Tooltip.js
+++ b/packages/react/src/components/Tooltip/Tooltip.js
@@ -419,7 +419,6 @@ class Tooltip extends Component {
       onFocus: this.handleMouse,
       onBlur: this.handleMouse,
       'aria-controls': !open ? undefined : tooltipId,
-      'aria-haspopup': 'true',
       'aria-expanded': open,
       'aria-describedby': open ? tooltipId : null,
       // if the user provides property `triggerText`,