fix(Tooltip): make screenreader description less verbose (#8641)

* fix: tooltip screenreader description * fix: add back removed triggerId Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
carbon-design-system · May 11, 2021 · b5f40d8 · b5f40d8
1 parent f69f887
commit b5f40d8
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js
@@ -510,7 +510,8 @@ class Tooltip extends Component {
               <div
                 className={`${prefix}--tooltip__trigger`}
                 {...properties}
-                ref={refProp}>
+                ref={refProp}
+                aria-describedby={tooltipBodyId}>
                 <IconCustomElement {...iconProperties} />
               </div>
             </div>
@@ -519,7 +520,8 @@ class Tooltip extends Component {
               id={triggerId}
               className={triggerClasses}
               ref={refProp}
-              {...properties}>
+              {...properties}
+              aria-describedby={tooltipBodyId}>
               {triggerText}
             </div>
           )}
@@ -544,14 +546,9 @@ class Tooltip extends Component {
               onMouseOut={this.handleMouse}
               onFocus={this.handleMouse}
               onBlur={this.handleMouse}
-              onContextMenu={this.handleMouse}
-              role="tooltip">
+              onContextMenu={this.handleMouse}>
               <span className={`${prefix}--tooltip__caret`} />
-              <div
-                className={`${prefix}--tooltip__content`}
-                role="dialog"
-                aria-describedby={tooltipBodyId}
-                aria-labelledby={triggerId}>
+              <div className={`${prefix}--tooltip__content`} role="dialog">
                 {children}
               </div>
             </div>