Merge branch 'master' into pictograms-name

carbon-design-system · Jan 13, 2020 · b1c0937 · b1c0937
2 parents 695dbeb + 462f956
commit b1c0937
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/react/src/components/TileGroup/TileGroup-test.js b/packages/react/src/components/TileGroup/TileGroup-test.js
@@ -14,8 +14,8 @@ describe('TileGroup', () => {
   describe('renders as expected', () => {
     const wrapper = mount(
       <TileGroup defaultSelected="female" name="gender">
-        <RadioTile labelText="Male" value="male" />
-        <RadioTile labelText="Female" value="female" />
+        <RadioTile value="male" />
+        <RadioTile value="female" />
       </TileGroup>
     );
 

diff --git a/packages/react/src/components/UIShell/HeaderMenu.js b/packages/react/src/components/UIShell/HeaderMenu.js
@@ -105,9 +105,18 @@ class HeaderMenu extends React.Component {
   handleOnBlur = event => {
     // Rough guess for a blur event that is triggered outside of our menu or
     // menubar context
-    if (!event.relatedTarget) {
-      this.setState({ expanded: false, selectedIndex: null });
+    const itemTriggeredBlur = this.items.find(
+      element => element === event.relatedTarget
+    );
+
+    if (
+      event.relatedTarget &&
+      (event.relatedTarget.getAttribute('href') !== '#' || itemTriggeredBlur)
+    ) {
+      return;
     }
+
+    this.setState({ expanded: false, selectedIndex: null });
   };
 
   /**