Merge pull request #234 from salesforce-ux/tooltip-bug

Bring back assistive text for disabled button with tooltip

Author: donnieberg

components/SLDSPopoverTooltip/trigger.jsx

@@ -102,7 +102,7 @@ class Trigger extends React.Component {
       onFocus={this.handleTooltipMouseEnter.bind(this)}
       onMouseOut={this.handleTooltipMouseLeave.bind(this)}
       onBlur={this.handleTooltipMouseLeave.bind(this)}
-    ><span className="slds-assistive-text">&nbsp;</span>&nbsp;</a>:null;
+    ><span className="slds-assistive-text">{this.props.label || this.props.assistiveText}</span></a>:null;
   }
 
   getTooltip(){

lib/SLDSButton/index.js

@@ -43,6 +43,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 var classNames = require("classnames");
 
+
 var displayName = 'SLDSButton';
 var propTypes = {
   /**

lib/SLDSButtonStateful/index.js

@@ -43,6 +43,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 var classNames = require("classnames");
 
+
 var blurElement = function blurElement(e) {
   return e.currentTarget.blur();
 };

lib/SLDSContextBar/index.js

@@ -55,6 +55,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 var classNames = require("classnames");
 
+
 var pf = _styling2.default.pf;
 
 var displayName = 'SLDSContextBar';
@@ -103,6 +104,7 @@ var ContextBar = function (_React$Component) {
     value: function componentWillUnmount() {}
     // TODO: componentWillUnmount
 
+
     // handleClick() {
     //   if(this.props.onClick) this.props.onClick();
     //   this.setState({ active: !this.state.active });

lib/SLDSDatepickerSingleSelect/SLDSCalendar/SLDSCalendarWeek/index.js

@@ -60,6 +60,7 @@ module.exports = _react2.default.createClass({
     }
   },
 
+
   render: function render() {
     var days = [];
     var date = this.props.date;

lib/SLDSLookup/Menu/index.js

@@ -61,6 +61,7 @@ var Menu = function (_React$Component) {
 
   //Set filtered list length in parent to determine active indexes for aria-activedescendent
 
+
   _createClass(Menu, [{
     key: 'componentDidUpdate',
     value: function componentDidUpdate() {

lib/SLDSMenuList/List.js

@@ -164,12 +164,12 @@ var SLDSList = function (_React$Component) {
           }
         }
       }
-      for (var i = 0; i < index; i++) {
-        var option = this.props.options[i];
-        if (option && option.label) {
-          if (option.label.charAt(0).toLowerCase() === searchChar) {
+      for (var _i = 0; _i < index; _i++) {
+        var _option = this.props.options[_i];
+        if (_option && _option.label) {
+          if (_option.label.charAt(0).toLowerCase() === searchChar) {
             if (this.props.onUpdateHighlighted) {
-              this.props.onUpdateHighlighted(i);
+              this.props.onUpdateHighlighted(_i);
             }
             return;
           }
@@ -222,8 +222,8 @@ var SLDSList = function (_React$Component) {
         } else if (event.keyCode === _KEYS2.default.TAB) {} else {
           _EventUtil2.default.trapEvent(event);
           var ch = String.fromCharCode(event.keyCode);
-          var index = parseInt(event.target.getAttribute('data-index'));
-          this.handleSearch(index, ch);
+          var _index = parseInt(event.target.getAttribute('data-index'));
+          this.handleSearch(_index, ch);
         }
       }
     }

lib/SLDSNotification/index.js

@@ -39,6 +39,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 var classNames = require("classnames");
 
+
 var displayName = "SLDSNotification";
 var propTypes = {
   /**

lib/SLDSPopover.js

@@ -42,6 +42,7 @@ module.exports = _react2.default.createClass({
     }
   },
 
+
   propTypes: {
     //    targetAttachment: React.PropTypes.string,
   },

lib/SLDSPopoverTooltip/trigger.js

@@ -115,13 +115,12 @@ var Trigger = function (_React$Component) {
   }, {
     key: "getMouseEventTarget",
     value: function getMouseEventTarget() {
-      var tooltipTriggerLabel = (this.props.label || this.props.assistiveText) + " tooltip trgiger";
       return this.props.disabled ? _react2.default.createElement(
         "a",
         {
           key: "MouseEventTarget",
           href: "javascript:void(0)",
-          ariaHidden: true,
+          "aria-hidden": true,
           tabIndex: -1,
           style: {
             backgroundColor: 'transparent',
@@ -139,7 +138,7 @@ var Trigger = function (_React$Component) {
         _react2.default.createElement(
           "span",
           { className: "slds-assistive-text" },
-          tooltipTriggerLabel
+          this.props.label || this.props.assistiveText
         )
       ) : null;
     }