Merge branch 'master' into joshblack-patch-1

carbon-design-system · Mar 5, 2020 · 05086ae · 05086ae
2 parents dcda247 + f3049c1
commit 05086ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/packages/components/tests/spec/tooltip--simple_spec.js b/packages/components/tests/spec/tooltip--simple_spec.js
@@ -1,4 +1,3 @@
-import Promise, { delay } from 'bluebird';
 import Tooltip from '../../src/components/tooltip/tooltip--simple';
 import TooltipDefinitionHTML from '../../html/tooltip/tooltip--definition.html';
 import TooltipIconHTML from '../../html/tooltip/tooltip--icon.html';
@@ -95,15 +94,14 @@ describe('Test simple tooltip', function() {
     });
 
     it('Should not have visible class after mouseleave', async function() {
-      await new Promise(resolve => {
-        resolve(
-          element.dispatchEvent(
-            new CustomEvent('mouseleave', { bubbles: true })
-          )
-        );
+      return Tooltip.__with__({
+        debounce: fn => fn,
+      })(() => {
+        tooltip.release();
+        tooltip = new Tooltip(element);
+        element.dispatchEvent(new CustomEvent('mouseleave', { bubbles: true }));
+        expect(element.classList.contains('bx--tooltip--visible')).toBe(false);
       });
-      await delay(100);
-      expect(element.classList.contains('bx--tooltip--visible')).toBe(false);
     });
 
     it('Should not have hidden class after focus', function() {

diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
@@ -281,6 +281,7 @@ export default class Dropdown extends React.Component {
                   <span
                     id={fieldLabelId}
                     className={`${prefix}--list-box__label`}
+                    title={selectedItem ? itemToString(selectedItem) : label}
                     {...getLabelProps()}>
                     {selectedItem ? itemToString(selectedItem) : label}
                   </span>

diff --git a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
@@ -114,6 +114,7 @@ exports[`Dropdown should render 1`] = `
                 className="bx--list-box__label"
                 htmlFor="downshift-0-input"
                 id="dropdown-field-label-test-dropdown"
+                title="input"
               >
                 input
               </span>
@@ -287,6 +288,7 @@ exports[`Dropdown should render custom item components 1`] = `
                 className="bx--list-box__label"
                 htmlFor="downshift-4-input"
                 id="dropdown-field-label-test-dropdown"
+                title="input"
               >
                 input
               </span>
@@ -619,6 +621,7 @@ exports[`Dropdown should render with strings as items 1`] = `
                 className="bx--list-box__label"
                 htmlFor="downshift-3-input"
                 id="dropdown-field-label-test-dropdown"
+                title="input"
               >
                 input
               </span>