fix active state w/ menu (#305)

mongodb · Mar 6, 2020 · fd6408b · fd6408b
1 parent ebb5102
commit fd6408b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/packages/menu/src/Menu.story.js b/packages/menu/src/Menu.story.js
@@ -51,7 +51,6 @@ function Controlled() {
           setOpen={setOpen}
         >
           <MenuItem
-            active
             size={select('Size', ['default', 'large'], 'large')}
             glyph={<Icon glyph="Laptop" size="xlarge" />}
           >
@@ -60,7 +59,7 @@ function Controlled() {
           <MenuItem disabled={boolean('Disabled', true)} size="large">
             Disabled Menu Item
           </MenuItem>
-          <MenuItem description="I am a description" size="large">
+          <MenuItem active description="I am a description" size="large">
             Menu Item With Description
           </MenuItem>
           <MenuItem href="http://mongodb.design" size="large">

diff --git a/packages/menu/src/Menu.tsx b/packages/menu/src/Menu.tsx
@@ -6,7 +6,6 @@ import { isComponentType, keyMap } from '@leafygreen-ui/lib';
 import { css, cx } from '@leafygreen-ui/emotion';
 import { uiColors } from '@leafygreen-ui/palette';
 import { transparentize } from 'polished';
-import { useUsingKeyboardContext } from '@leafygreen-ui/leafygreen-provider';
 
 const rootMenuStyle = css`
   width: 200px;
@@ -105,8 +104,6 @@ function Menu({
   > | null>(null);
   const [uncontrolledOpen, uncontrolledSetOpen] = useState(false);
 
-  const { setUsingKeyboard } = useUsingKeyboardContext();
-
   const setOpen =
     (typeof controlledOpen === 'boolean' && controlledSetOpen) ||
     uncontrolledSetOpen;
@@ -132,8 +129,6 @@ function Menu({
 
         if (open && hasSetInitialFocus.current === false) {
           setFocus(refs[0]);
-          // This allows the focus state to be shown via the LeafyGreen Provider
-          setUsingKeyboard(true);
           hasSetInitialFocus.current = true;
         }
       };
@@ -213,13 +208,11 @@ function Menu({
       if (focusedRefIndex !== -1) {
         const subMenu = refs[focusedRefIndex];
         subMenu.focus();
-        setUsingKeyboard(true);
       }
     } else {
       if (focusedRefIndex !== -1) {
         const subMenuFirstChild = refs[focusedRefIndex + 1];
         subMenuFirstChild?.focus();
-        setUsingKeyboard(true);
       }
     }
   }, [currentSubMenu]);