Merge af43884 into 0cb504c

mui · Jul 29, 2017 · a452427 · a452427
2 parents 0cb504c + af43884
commit a452427
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Menu/Menu.js b/src/Menu/Menu.js
@@ -235,6 +235,17 @@ class Menu extends Component {
       return;
     }
 
+    const {focusIndex} = this.state;
+    if (focusIndex < 0) {
+      return;
+    }
+
+    const filteredChildren = this.getFilteredChildren(this.props.children);
+    const focusedItem = filteredChildren[focusIndex];
+    if (focusedItem.props.menuItems && focusedItem.props.menuItems.length > 0) {
+      return;
+    }
+
     this.setFocusIndex(event, -1, false);
   };
 

diff --git a/src/Menu/Menu.spec.js b/src/Menu/Menu.spec.js
@@ -257,4 +257,27 @@ describe('<Menu />', () => {
       assert.deepEqual(wrapper.state().value, ['item2', 'item3']);
     });
   });
+
+  describe('Nested menu', () => {
+    it('should ignore loosing focus on click away for item with menu items', () => {
+      const menuItems = [<MenuItem />, <MenuItem />];
+
+      const wrapper = mountWithContext(
+        <Menu className="menu">
+          <MenuItem className="item1" />
+          <MenuItem className="item2" menuItems={menuItems} />
+        </Menu>
+      );
+
+      wrapper.find('.item1').simulate('touchTap');
+      assert.strictEqual(wrapper.state('focusIndex'), 0);
+      document.body.dispatchEvent(new window.Event('mouseup', {bubbles: true}));
+      assert.strictEqual(wrapper.state('focusIndex'), -1);
+
+      wrapper.find('.item2').simulate('touchTap');
+      assert.strictEqual(wrapper.state('focusIndex'), 1);
+      document.body.dispatchEvent(new window.Event('mouseup', {bubbles: true}));
+      assert.strictEqual(wrapper.state('focusIndex'), 1);
+    });
+  });
 });