@patternfly/react-core 5.0.0-alpha.1 → 5.0.0-alpha.10

package/src/components/ExpandableSection/ExpandableSection.tsx

@@ -4,6 +4,8 @@ import { css } from '@patternfly/react-styles';
 import lineClamp from '@patternfly/react-tokens/dist/esm/c_expandable_section_m_truncate__content_LineClamp';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import { PickOptional } from '../../helpers/typeUtils';
+import { debounce } from '../../helpers/util';
+import { getResizeObserver } from '../../helpers/resizeObserver';
 
 export enum ExpandableSectionVariant {
   default = 'default',
@@ -61,6 +63,8 @@ export interface ExpandableSectionProps extends React.HTMLProps<HTMLDivElement>
 
 interface ExpandableSectionState {
   isExpanded: boolean;
+  hasToggle: boolean;
+  previousWidth: number;
 }
 
 const setLineClamp = (lines: number, element: HTMLDivElement) => {
@@ -77,11 +81,15 @@ export class ExpandableSection extends React.Component<ExpandableSectionProps, E
     super(props);
 
     this.state = {
-      isExpanded: props.isExpanded
+      isExpanded: props.isExpanded,
+      hasToggle: true,
+      previousWidth: undefined
     };
   }
 
   expandableContentRef = React.createRef<HTMLDivElement>();
+  observer: any = () => {};
+
   static defaultProps: PickOptional<ExpandableSectionProps> = {
     className: '',
     toggleText: '',
@@ -114,9 +122,16 @@ export class ExpandableSection extends React.Component<ExpandableSectionProps, E
   }
 
   componentDidMount() {
-    if (this.props.variant === ExpandableSectionVariant.truncate && this.props.truncateMaxLines) {
+    if (this.props.variant === ExpandableSectionVariant.truncate) {
       const expandableContent = this.expandableContentRef.current;
-      setLineClamp(this.props.truncateMaxLines, expandableContent);
+      this.setState({ previousWidth: expandableContent.offsetWidth });
+      this.observer = getResizeObserver(expandableContent, this.handleResize, false);
+
+      if (this.props.truncateMaxLines) {
+        setLineClamp(this.props.truncateMaxLines, expandableContent);
+      }
+
+      this.checkToggleVisibility();
     }
   }
 
@@ -127,9 +142,38 @@ export class ExpandableSection extends React.Component<ExpandableSectionProps, E
     ) {
       const expandableContent = this.expandableContentRef.current;
       setLineClamp(this.props.truncateMaxLines, expandableContent);
+      this.checkToggleVisibility();
+    }
+  }
+
+  componentWillUnmount() {
+    if (this.props.variant === ExpandableSectionVariant.truncate) {
+      this.observer();
     }
   }
 
+  checkToggleVisibility = () => {
+    if (this.expandableContentRef?.current) {
+      const maxLines = this.props.truncateMaxLines || parseInt(lineClamp.value);
+      const totalLines =
+        this.expandableContentRef.current.scrollHeight /
+        parseInt(getComputedStyle(this.expandableContentRef.current).lineHeight);
+
+      this.setState({
+        hasToggle: totalLines > maxLines
+      });
+    }
+  };
+
+  resize = () => {
+    const { offsetWidth } = this.expandableContentRef.current;
+    if (this.state.previousWidth !== offsetWidth) {
+      this.setState({ previousWidth: offsetWidth });
+      this.checkToggleVisibility();
+    }
+  };
+  handleResize = debounce(this.resize, 250);
+
   render() {
     const {
       onToggle: onToggleProp,
@@ -210,7 +254,7 @@ export class ExpandableSection extends React.Component<ExpandableSectionProps, E
         >
           {children}
         </div>
-        {variant === ExpandableSectionVariant.truncate && expandableToggle}
+        {variant === ExpandableSectionVariant.truncate && this.state.hasToggle && expandableToggle}
       </div>
     );
   }

package/src/components/FileUpload/FileUpload.tsx

@@ -64,7 +64,7 @@ export interface FileUploadProps
   // Props available in FileUpload but not FileUploadField:
 
   /** Optional extra props to customize react-dropzone. */
-  dropzoneProps?: DropzoneOptions;
+  dropzoneProps?: Partial<DropzoneOptions>;
   /** Clear button was clicked. */
   onClearClick?: React.MouseEventHandler<HTMLButtonElement>;
   /** On data changed - if type='text' or type='dataURL' and file was loaded it will call this method */

package/src/components/Icon/Icon.tsx

@@ -39,11 +39,7 @@ export const Icon: React.FunctionComponent<IconComponentProps> = ({
   defaultProgressArialabel = 'Loading...',
   ...props
 }: IconComponentProps) => {
-  const _progressIcon = progressIcon ? (
-    progressIcon
-  ) : (
-    <Spinner diameter="1em" isSVG aria-label={defaultProgressArialabel} />
-  );
+  const _progressIcon = progressIcon ?? <Spinner diameter="1em" aria-label={defaultProgressArialabel} />;
 
   return (
     <span

package/src/components/Icon/examples/IconCustomProgress.tsx

@@ -16,7 +16,7 @@ export const IconProgress: React.FunctionComponent = () => {
           name="toggle-icon-progress-custom"
         />
       </div>
-      <Icon isInProgress={isInProgress} progressIcon={<Spinner diameter="2em" isSVG aria-label="Loading..." />}>
+      <Icon isInProgress={isInProgress} progressIcon={<Spinner diameter="2em" aria-label="Loading..." />}>
         <CheckCircleIcon />
       </Icon>
     </React.Fragment>

package/src/components/Label/Label.tsx

@@ -24,9 +24,9 @@ export interface LabelProps extends React.HTMLProps<HTMLSpanElement> {
   /** @beta Additional props passed to the editable label text div. Optionally passing onInput and onBlur callbacks will allow finer custom text input control. */
   editableProps?: any;
   /** @beta Callback when an editable label completes an edit. */
-  onEditComplete?: (newText: string) => void;
+  onEditComplete?: (event: MouseEvent | KeyboardEvent, newText: string) => void;
   /** @beta Callback when an editable label cancels an edit. */
-  onEditCancel?: (previousText: string) => void;
+  onEditCancel?: (event: KeyboardEvent, previousText: string) => void;
   /** Flag indicating the label text should be truncated. */
   isTruncated?: boolean;
   /** Position of the tooltip which is displayed if text is truncated */
@@ -126,7 +126,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
       !editableInputRef.current.contains(event.target as Node)
     ) {
       if (editableInputRef.current.value) {
-        onEditComplete && onEditComplete(editableInputRef.current.value);
+        onEditComplete && onEditComplete(event, editableInputRef.current.value);
       }
       setIsEditableActive(false);
     }
@@ -148,7 +148,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
       event.preventDefault();
       event.stopImmediatePropagation();
       if (editableInputRef.current.value) {
-        onEditComplete && onEditComplete(editableInputRef.current.value);
+        onEditComplete && onEditComplete(event, editableInputRef.current.value);
       }
       setIsEditableActive(false);
       editableButtonRef?.current?.focus();
@@ -159,7 +159,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
       // Reset div text to initial children prop - pre-edit
       if (editableInputRef.current.value) {
         editableInputRef.current.value = children as string;
-        onEditCancel && onEditCancel(children as string);
+        onEditCancel && onEditCancel(event, children as string);
       }
       setIsEditableActive(false);
       editableButtonRef?.current?.focus();

package/src/components/Label/examples/LabelEditable.tsx

@@ -5,19 +5,19 @@ export const LabelEditable: React.FunctionComponent = () => {
   const [labelText, setLabelText] = React.useState('Editable label');
   const [compactLabelText, setCompactLabelText] = React.useState('Compact editable label');
 
-  const onEditCancel = (prevText: string) => {
+  const onEditCancel = (_event: KeyboardEvent, prevText: string) => {
     setLabelText(prevText);
   };
 
-  const onEditComplete = (text: string) => {
+  const onEditComplete = (_event: MouseEvent | KeyboardEvent, text: string) => {
     setLabelText(text);
   };
 
-  const onCompactEditCancel = (prevText: string) => {
+  const onCompactEditCancel = (_event: KeyboardEvent, prevText: string) => {
     setCompactLabelText(prevText);
   };
 
-  const onCompactEditComplete = (text: string) => {
+  const onCompactEditComplete = (_event: MouseEvent | KeyboardEvent, text: string) => {
     setCompactLabelText(text);
   };
 

package/src/components/LabelGroup/LabelGroup.tsx

@@ -156,15 +156,14 @@ export class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState
       ...rest
     } = this.props;
     const { isOpen } = this.state;
-    const numChildren = React.Children.count(children);
+    const renderedChildren = React.Children.toArray(children);
+    const numChildren = renderedChildren.length;
     const collapsedTextResult = fillTemplate(collapsedText as string, {
-      remaining: React.Children.count(children) - numLabels
+      remaining: numChildren - numLabels
     });
 
     const renderLabelGroup = (id: string) => {
-      const labelArray = !isOpen
-        ? React.Children.toArray(children).slice(0, numLabels)
-        : React.Children.toArray(children);
+      const labelArray = !isOpen ? renderedChildren.slice(0, numLabels) : renderedChildren;
 
       const content = (
         <React.Fragment>

package/src/components/LabelGroup/examples/LabelGroupEditableAdd.tsx

@@ -67,8 +67,8 @@ export const LabelGroupEditableAdd: React.FunctionComponent = () => {
           id={label.id}
           color="blue"
           onClose={() => onClose(label.id)}
-          onEditCancel={prevText => onEdit(prevText, index)}
-          onEditComplete={newText => onEdit(newText, index)}
+          onEditCancel={(_event, prevText) => onEdit(prevText, index)}
+          onEditComplete={(_event, newText) => onEdit(newText, index)}
           {...label.props}
         >
           {label.name}

package/src/components/LabelGroup/examples/LabelGroupEditableAddDropdown.tsx

@@ -130,8 +130,8 @@ export const LabelGroupEditableAddDropdown: React.FunctionComponent = () => {
             id={label.id}
             color="blue"
             onClose={() => onClose(label.id)}
-            onEditCancel={prevText => onEdit(prevText, index)}
-            onEditComplete={newText => onEdit(newText, index)}
+            onEditCancel={(_event, prevText) => onEdit(prevText, index)}
+            onEditComplete={(_event, newText) => onEdit(newText, index)}
             {...label.props}
           >
             {label.name}

package/src/components/LabelGroup/examples/LabelGroupEditableAddModal.tsx

@@ -247,8 +247,8 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
             id={label.id}
             color="blue"
             onClose={() => onClose(label.id)}
-            onEditCancel={prevText => onEdit(prevText, index)}
-            onEditComplete={newText => onEdit(newText, index)}
+            onEditCancel={(_event, prevText) => onEdit(prevText, index)}
+            onEditComplete={(_event, newText) => onEdit(newText, index)}
             {...label.props}
           >
             {label.name}

package/src/components/LabelGroup/examples/LabelGroupEditableLabels.tsx

@@ -11,8 +11,8 @@ export const LabelGroupEditableLabels: React.FunctionComponent = () => {
       <Label
         color="blue"
         onClose={() => Function.prototype}
-        onEditCancel={prevText => setLabel1(prevText)}
-        onEditComplete={newText => setLabel1(newText)}
+        onEditCancel={(_event, prevText) => setLabel1(prevText)}
+        onEditComplete={(_event, newText) => setLabel1(newText)}
         isEditable
         editableProps={{
           'aria-label': `Editable label with text ${label1}`,
@@ -25,8 +25,8 @@ export const LabelGroupEditableLabels: React.FunctionComponent = () => {
       <Label
         color="blue"
         onClose={() => Function.prototype}
-        onEditCancel={prevText => setLabel2(prevText)}
-        onEditComplete={newText => setLabel2(newText)}
+        onEditCancel={(_event, prevText) => setLabel2(prevText)}
+        onEditComplete={(_event, newText) => setLabel2(newText)}
         isEditable
         editableProps={{
           'aria-label': `Editable label with text ${label2}`,
@@ -38,8 +38,8 @@ export const LabelGroupEditableLabels: React.FunctionComponent = () => {
       <Label
         color="blue"
         onClose={() => Function.prototype}
-        onEditCancel={prevText => setLabel3(prevText)}
-        onEditComplete={newText => setLabel3(newText)}
+        onEditCancel={(_event, prevText) => setLabel3(prevText)}
+        onEditComplete={(_event, newText) => setLabel3(newText)}
         isEditable
         editableProps={{
           'aria-label': `Editable label with text ${label3}`,

package/src/components/LoginPage/LoginPage.tsx

@@ -35,7 +35,7 @@ export interface LoginPageProps extends React.HTMLProps<HTMLDivElement> {
   loginTitle: string;
   /** Subtitle for the login main body header of the login page */
   loginSubtitle?: string;
-  /** @beta Header utilities for the login main body header of the login page */
+  /** Header utilities for the login main body header of the login page */
   headerUtilities?: React.ReactNode;
   /** Content rendered inside of login main footer band to display a sign up for account message */
   signUpForAccountMessage?: React.ReactNode;

package/src/components/Masthead/MastheadBrand.tsx

@@ -15,12 +15,19 @@ export interface MastheadBrandProps
 export const MastheadBrand: React.FunctionComponent<MastheadBrandProps> = ({
   children,
   className,
-  component = 'a',
+  component,
   ...props
 }: MastheadBrandProps) => {
-  const Component = component as any;
+  let Component = component as any;
+  if (!component) {
+    if (props?.href !== undefined) {
+      Component = 'a';
+    } else {
+      Component = 'span';
+    }
+  }
   return (
-    <Component className={css(styles.mastheadBrand, className)} tabIndex={0} {...props}>
+    <Component className={css(styles.mastheadBrand, className)} {...(Component === 'a' && { tabIndex: 0 })} {...props}>
       {children}
     </Component>
   );

package/src/components/Masthead/__tests__/Masthead.test.tsx

@@ -85,11 +85,23 @@ describe('MastheadBrand', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
+  test('verify default component', () => {
+    const { asFragment } = render(<MastheadBrand>test</MastheadBrand>);
+
+    expect(asFragment()).toMatchSnapshot();
+  });
+
   test('verify custom component', () => {
     const { asFragment } = render(<MastheadBrand component="div">test</MastheadBrand>);
 
     expect(asFragment()).toMatchSnapshot();
   });
+
+  test('verify anchor component with href', () => {
+    const { asFragment } = render(<MastheadBrand href="#">test</MastheadBrand>);
+
+    expect(asFragment()).toMatchSnapshot();
+  });
 });
 
 describe('MastheadContent', () => {

package/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap

@@ -33,12 +33,11 @@ exports[`Masthead verify full structure 1`] = `
     <div
       class="pf-c-masthead__main"
     >
-      <a
+      <span
         class="pf-c-masthead__brand"
-        tabindex="0"
       >
         Logo
-      </a>
+      </span>
     </div>
     <div
       class="pf-c-masthead__content"
@@ -151,10 +150,11 @@ exports[`Masthead verify stack display breakpoints 1`] = `
 </DocumentFragment>
 `;
 
-exports[`MastheadBrand verify basic 1`] = `
+exports[`MastheadBrand verify anchor component with href 1`] = `
 <DocumentFragment>
   <a
     class="pf-c-masthead__brand"
+    href="#"
     tabindex="0"
   >
     test
@@ -162,14 +162,23 @@ exports[`MastheadBrand verify basic 1`] = `
 </DocumentFragment>
 `;
 
+exports[`MastheadBrand verify basic 1`] = `
+<DocumentFragment>
+  <span
+    class="pf-c-masthead__brand"
+  >
+    test
+  </span>
+</DocumentFragment>
+`;
+
 exports[`MastheadBrand verify custom class 1`] = `
 <DocumentFragment>
-  <a
+  <span
     class="pf-c-masthead__brand custom-css"
-    tabindex="0"
   >
     test
-  </a>
+  </span>
 </DocumentFragment>
 `;
 
@@ -177,13 +186,22 @@ exports[`MastheadBrand verify custom component 1`] = `
 <DocumentFragment>
   <div
     class="pf-c-masthead__brand"
-    tabindex="0"
   >
     test
   </div>
 </DocumentFragment>
 `;
 
+exports[`MastheadBrand verify default component 1`] = `
+<DocumentFragment>
+  <span
+    class="pf-c-masthead__brand"
+  >
+    test
+  </span>
+</DocumentFragment>
+`;
+
 exports[`MastheadContent verify basic 1`] = `
 <DocumentFragment>
   <div

package/src/components/Menu/Menu.tsx

@@ -40,9 +40,14 @@ export interface MenuProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'r
   /** @beta Array of menus that are drilled in */
   drilledInMenus?: string[];
   /** @beta Callback for drilling into a submenu */
-  onDrillIn?: (fromItemId: string, toItemId: string, itemId: string) => void;
+  onDrillIn?: (
+    event: React.KeyboardEvent | React.MouseEvent,
+    fromItemId: string,
+    toItemId: string,
+    itemId: string
+  ) => void;
   /** @beta Callback for drilling out of a submenu */
-  onDrillOut?: (toItemId: string, itemId: string) => void;
+  onDrillOut?: (event: React.KeyboardEvent | React.MouseEvent, toItemId: string, itemId: string) => void;
   /** @beta Callback for collecting menu heights */
   onGetMenuHeight?: (menuId: string, height: number) => void;
   /** @beta ID of parent menu for drilldown menus */
@@ -63,6 +68,9 @@ export interface MenuProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'r
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
   ouiaSafe?: boolean;
+  /** @beta Determines the accessible role of the menu. For a non-checkbox menu that can have
+   * one or more items selected, pass in "listbox". */
+  role?: string;
 }
 
 export interface MenuState {
@@ -84,7 +92,8 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
     ouiaSafe: true,
     isRootMenu: true,
     isPlain: false,
-    isScrollable: false
+    isScrollable: false,
+    role: 'menu'
   };
 
   constructor(props: MenuProps) {
@@ -267,6 +276,7 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
       innerRef,
       isRootMenu,
       activeMenu,
+      role,
       /* eslint-enable @typescript-eslint/no-unused-vars */
       ...props
     } = this.props;
@@ -287,7 +297,8 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
           onGetMenuHeight,
           flyoutRef: this.state.flyoutRef,
           setFlyoutRef: flyoutRef => this.setState({ flyoutRef }),
-          disableHover: this.state.disableHover
+          disableHover: this.state.disableHover,
+          role
         }}
       >
         {isRootMenu && (

package/src/components/Menu/MenuContext.ts

@@ -9,12 +9,18 @@ export const MenuContext = React.createContext<{
   selected?: any | any[];
   drilldownItemPath?: string[];
   drilledInMenus?: string[];
-  onDrillIn?: (fromItemId: string, toItemId: string, itemId: string) => void;
-  onDrillOut?: (toItemId: string, itemId: string) => void;
+  onDrillIn?: (
+    event: React.KeyboardEvent | React.MouseEvent,
+    fromItemId: string,
+    toItemId: string,
+    itemId: string
+  ) => void;
+  onDrillOut?: (event: React.KeyboardEvent | React.MouseEvent, toItemId: string, itemId: string) => void;
   onGetMenuHeight?: (menuId: string, height: number) => void;
   flyoutRef?: React.Ref<HTMLLIElement>;
   setFlyoutRef?: (ref: React.Ref<HTMLLIElement>) => void;
   disableHover?: boolean;
+  role?: string;
 }>({
   menuId: null,
   parentMenu: null,
@@ -29,7 +35,8 @@ export const MenuContext = React.createContext<{
   onGetMenuHeight: () => null,
   flyoutRef: null,
   setFlyoutRef: () => null,
-  disableHover: false
+  disableHover: false,
+  role: 'menu'
 });
 
 export const MenuItemContext = React.createContext<{

package/src/components/Menu/MenuGroup.tsx

@@ -2,16 +2,16 @@ import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 
-export interface MenuGroupProps extends React.HTMLProps<HTMLElement> {
+export interface MenuGroupProps extends Omit<React.HTMLProps<HTMLElement>, 'label'> {
   /** Items within group */
   children?: React.ReactNode;
   /** Additional classes added to the MenuGroup */
   className?: string;
   /** Group label */
-  label?: string;
+  label?: React.ReactNode;
   /** ID for title label */
   titleId?: string;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Group label heading level. Default is h1. */
   labelHeadingLevel?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
@@ -25,16 +25,23 @@ const MenuGroupBase: React.FunctionComponent<MenuGroupProps> = ({
   innerRef,
   labelHeadingLevel: HeadingLevel = 'h1',
   ...props
-}: MenuGroupProps) => (
-  <section {...props} className={css('pf-c-menu__group', className)} ref={innerRef}>
-    {label && (
-      <HeadingLevel className={css(styles.menuGroupTitle)} id={titleId}>
-        {label}
-      </HeadingLevel>
-    )}
-    {children}
-  </section>
-);
+}: MenuGroupProps) => {
+  const Wrapper = typeof label === 'function' ? label : HeadingLevel;
+  return (
+    <section {...props} className={css('pf-c-menu__group', className)} ref={innerRef}>
+      <>
+        {['function', 'string'].includes(typeof label) ? (
+          <Wrapper className={css(styles.menuGroupTitle)} id={titleId}>
+            {label}
+          </Wrapper>
+        ) : (
+          label
+        )}
+        {children}
+      </>
+    </section>
+  );
+};
 
 export const MenuGroup = React.forwardRef((props: MenuGroupProps, ref: React.Ref<HTMLElement>) => (
   <MenuGroupBase {...props} innerRef={ref} />

package/src/components/Menu/MenuInput.tsx

@@ -5,7 +5,7 @@ import { css } from '@patternfly/react-styles';
 export interface MenuInputProps extends React.HTMLProps<HTMLElement> {
   /** Items within input */
   children?: React.ReactNode;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
 }
 

package/src/components/Menu/MenuItem.tsx

@@ -68,6 +68,8 @@ export interface MenuItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'onC
   'aria-label'?: string;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<HTMLAnchorElement | HTMLButtonElement>;
+  /** Sets the id attribute on the menu item component. */
+  id?: string;
 }
 
 const FlyoutContext = React.createContext({
@@ -100,6 +102,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
   drilldownMenu,
   isOnPath,
   innerRef,
+  id,
   ...props
 }: MenuItemProps) => {
   const {
@@ -114,7 +117,8 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
     onDrillOut,
     flyoutRef,
     setFlyoutRef,
-    disableHover
+    disableHover,
+    role: menuRole
   } = React.useContext(MenuContext);
   let Component = (to ? 'a' : component) as any;
   if (hasCheckbox && !to) {
@@ -224,12 +228,13 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
     onClick && onClick(event);
   };
   const _isOnPath = (isOnPath && isOnPath) || (drilldownItemPath && drilldownItemPath.includes(itemId)) || false;
-  let _drill: () => void;
+  let drill: (event: React.KeyboardEvent | React.MouseEvent) => void;
   if (direction) {
     if (direction === 'down') {
-      _drill = () =>
+      drill = event =>
         onDrillIn &&
         onDrillIn(
+          event,
           menuId,
           typeof drilldownMenu === 'function'
             ? (drilldownMenu() as any).props.id
@@ -237,7 +242,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
           itemId
         );
     } else {
-      _drill = () => onDrillOut && onDrillOut(parentMenu, itemId);
+      drill = event => onDrillOut && onDrillOut(event, parentMenu, itemId);
     }
   }
   let additionalProps = {} as any;
@@ -289,6 +294,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
       setFlyoutRef(null);
     }
   };
+  const isSelectMenu = menuRole === 'listbox';
 
   return (
     <li
@@ -311,16 +317,18 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
       <GenerateId>
         {randomId => (
           <Component
+            id={id}
             tabIndex={-1}
             className={css(styles.menuItem, getIsSelected() && !hasCheckbox && styles.modifiers.selected, className)}
             aria-current={getAriaCurrent()}
             {...(!hasCheckbox && { disabled: isDisabled })}
-            {...(!hasCheckbox && !flyoutMenu && { role: 'menuitem' })}
+            {...(!hasCheckbox && !flyoutMenu && { role: isSelectMenu ? 'option' : 'menuitem' })}
+            {...(!hasCheckbox && !flyoutMenu && isSelectMenu && { 'aria-selected': getIsSelected() })}
             ref={innerRef}
             {...(!hasCheckbox && {
-              onClick: (event: any) => {
+              onClick: (event: React.KeyboardEvent | React.MouseEvent) => {
                 onItemSelect(event, onSelect);
-                _drill && _drill();
+                drill && drill(event);
                 flyoutMenu && handleFlyout(event);
               }
             })}