@patternfly/react-core 5.0.0-alpha.2 → 5.0.0-alpha.20

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

@@ -117,8 +117,9 @@ export const LabelGroupEditableAddDropdown: React.FunctionComponent = () => {
         addLabelControl={
           <Popper
             trigger={toggle}
+            triggerRef={toggleRef}
             popper={menu}
-            appendTo={containerRef.current}
+            popperRef={menuRef}
             isVisible={isOpen}
             popperMatchesTriggerWidth={false}
           />
@@ -130,8 +131,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}
@@ -284,7 +284,9 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
             <div ref={colorContainerRef}>
               <Popper
                 trigger={colorToggle}
+                triggerRef={colorToggleRef}
                 popper={colorMenu}
+                popperRef={colorMenuRef}
                 appendTo={colorContainerRef.current as HTMLElement}
                 isVisible={isColorOpen}
                 popperMatchesTriggerWidth={false}
@@ -295,7 +297,9 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
             <div ref={iconContainerRef}>
               <Popper
                 trigger={iconToggle}
+                triggerRef={iconToggleRef}
                 popper={iconMenu}
+                popperRef={iconMenuRef}
                 appendTo={iconContainerRef.current as HTMLElement}
                 isVisible={isIconOpen}
                 popperMatchesTriggerWidth={false}

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/LoginForm.tsx

@@ -142,7 +142,7 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
             id="pf-login-remember-me-id"
             label={rememberMeLabel}
             isChecked={isRememberMeChecked}
-            onChange={onChangeRememberMe}
+            onChange={(event, checked) => onChangeRememberMe(checked, event)}
           />
         </FormGroup>
       )}

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/LoginPage/examples/LoginPageLanguageSelect.tsx

@@ -45,7 +45,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
     <SelectOption key={6} value={i18n.Bengali} />
   ];
 
-  const onHeaderUtilsToggle = (isExpanded: boolean) => {
+  const onHeaderUtilsToggle = (_event: any, isExpanded: boolean) => {
     setIsHeaderUtilsOpen(isExpanded);
   };
 

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

@@ -25,8 +25,6 @@ export interface MenuProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'r
     event: React.FormEvent<HTMLInputElement> | React.SyntheticEvent<HTMLButtonElement>,
     value: string
   ) => void;
-  /** Accessibility label */
-  'aria-label'?: string;
   /** @beta Indicates if menu contains a flyout menu */
   containsFlyout?: boolean;
   /** @beta Indicating that the menu should have nav flyout styling */
@@ -40,9 +38,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 +66,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 +90,8 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
     ouiaSafe: true,
     isRootMenu: true,
     isPlain: false,
-    isScrollable: false
+    isScrollable: false,
+    role: 'menu'
   };
 
   constructor(props: MenuProps) {
@@ -241,7 +248,6 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
 
   render() {
     const {
-      'aria-label': ariaLabel,
       id,
       children,
       className,
@@ -267,6 +273,7 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
       innerRef,
       isRootMenu,
       activeMenu,
+      role,
       /* eslint-enable @typescript-eslint/no-unused-vars */
       ...props
     } = this.props;
@@ -287,7 +294,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 && (
@@ -328,7 +336,6 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
             _isMenuDrilledIn && styles.modifiers.drilledIn,
             className
           )}
-          aria-label={ariaLabel}
           ref={this.menuRef}
           {...getOUIAProps(Menu.displayName, ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe)}
           {...props}

package/src/components/Menu/MenuContent.tsx

@@ -6,7 +6,7 @@ import { MenuContext } from './MenuContext';
 export interface MenuContentProps extends React.HTMLProps<HTMLElement> {
   /** Items within group */
   children?: React.ReactNode;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
   /** Height of the menu content */
   menuHeight?: string;

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';
@@ -21,20 +21,27 @@ const MenuGroupBase: React.FunctionComponent<MenuGroupProps> = ({
   children,
   className = '',
   label = '',
-  titleId = '',
+  titleId,
   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

@@ -64,10 +64,12 @@ export interface MenuItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'onC
   direction?: 'down' | 'up';
   /** @beta True if item is on current selection path */
   isOnPath?: boolean;
-  /** Accessibility label */
+  /** Adds an accessible name to the menu item. */
   '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,8 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
   drilldownMenu,
   isOnPath,
   innerRef,
+  id,
+  'aria-label': ariaLabel,
   ...props
 }: MenuItemProps) => {
   const {
@@ -114,7 +118,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 +229,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 +243,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 +295,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
       setFlyoutRef(null);
     }
   };
+  const isSelectMenu = menuRole === 'listbox';
 
   return (
     <li
@@ -306,21 +313,24 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
       {...(flyoutMenu && { onKeyDown: handleFlyout })}
       ref={ref}
       role={!hasCheckbox ? 'none' : 'menuitem'}
+      {...(hasCheckbox && { 'aria-label': ariaLabel })}
       {...props}
     >
       <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 && { disabled: isDisabled, 'aria-label': ariaLabel })}
+            {...(!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);
               }
             })}
@@ -340,7 +350,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
                     id={randomId}
                     component="span"
                     isChecked={isSelected || false}
-                    onChange={event => onItemSelect(event, onSelect)}
+                    onChange={(event) => onItemSelect(event, onSelect)}
                     isDisabled={isDisabled}
                   />
                 </span>

package/src/components/Menu/MenuItemAction.tsx

@@ -12,14 +12,14 @@ export interface MenuItemActionProps extends Omit<React.HTMLProps<HTMLButtonElem
   /** Callback on action click, can also specify onActionClick on the Menu instead */
   onClick?: (event?: any) => void;
   /** Accessibility label */
-  'aria-label'?: string;
+  'aria-label': string;
   /** Flag indicating if the item is favorited */
   isFavorited?: boolean;
   /** Disables action, can also be specified on the MenuItem instead */
   isDisabled?: boolean;
   /** Identifies the action item in the onActionClick on the Menu */
   actionId?: any;
-  /** Forwarded ref */
+  /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
 }
 

package/src/components/Menu/MenuList.tsx

@@ -1,21 +1,40 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
+import { MenuContext } from './MenuContext';
 
 export interface MenuListProps extends React.HTMLProps<HTMLUListElement> {
   /** Anything that can be rendered inside of menu list */
   children: React.ReactNode;
   /** Additional classes added to the menu list */
   className?: string;
+  /** @beta Indicates to assistive technologies whether more than one item can be selected
+   * for a non-checkbox menu. Only applies when the menu's role is "listbox".
+   */
+  isAriaMultiselectable?: boolean;
+  /** Adds an accessible name to the menu. */
+  'aria-label'?: string;
 }
 
 export const MenuList: React.FunctionComponent<MenuListProps> = ({
   children = null,
   className,
+  isAriaMultiselectable = false,
+  'aria-label': ariaLabel,
   ...props
-}: MenuListProps) => (
-  <ul role="menu" className={css(styles.menuList, className)} {...props}>
-    {children}
-  </ul>
-);
+}: MenuListProps) => {
+  const { role } = React.useContext(MenuContext);
+
+  return (
+    <ul
+      role={role}
+      {...(role === 'listbox' && { 'aria-multiselectable': isAriaMultiselectable })}
+      className={css(styles.menuList, className)}
+      aria-label={ariaLabel}
+      {...props}
+    >
+      {children}
+    </ul>
+  );
+};
 MenuList.displayName = 'MenuList';

package/src/components/Menu/__mocks__/Menu.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MenuProps } from '../Menu';
+
+export const Menu = ({ className, isPlain, isScrollable, style, onSelect, ...props }: MenuProps) => (
+  <>
+    <div className={className} data-testid="menu-mock" {...props}></div>
+    <div onClick={onSelect}>{'Mock item'}</div>
+    <p>{`isPlain: ${isPlain}`}</p>
+    <p>{`isScrollable: ${isScrollable}`}</p>
+    <p>{`minWidth: ${style?.['--pf-c-menu--MinWidth']}`}</p>
+  </>
+);

package/src/components/Menu/__mocks__/MenuContent.tsx

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const MenuContent = ({ children }) => <div>{children}</div>;

package/src/components/Menu/__mocks__/MenuGroup.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MenuGroupProps } from '../MenuGroup';
+
+export const MenuGroup = ({ className, children, label, labelHeadingLevel }: MenuGroupProps) => (
+  <>
+    <div className={className} data-testid="menu-group-mock">
+      {children}
+    </div>
+    <p>{`label: ${label}`}</p>
+    <p>{`labelHeadingLevel: ${labelHeadingLevel}`}</p>
+  </>
+);