@patternfly/react-core 6.6.1-prerelease.4 → 6.6.2

package/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap

@@ -4,16 +4,10 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
-    data-ouia-component-id="OUIA-Generated-Form-:r1s:"
-    data-ouia-component-type="PF6/Form"
-    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r1t:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -44,7 +38,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r20:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r17:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -58,9 +52,6 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r21:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -91,7 +82,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r24:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1a:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -105,9 +96,6 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r25:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
@@ -118,7 +106,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           <input
             aria-invalid="false"
             class="pf-v6-c-check__input"
-            data-ouia-component-id="OUIA-Generated-Checkbox-:r28:"
+            data-ouia-component-id="OUIA-Generated-Checkbox-:r1d:"
             data-ouia-component-type="PF6/Checkbox"
             data-ouia-safe="true"
             id="pf-login-remember-me-id"
@@ -135,26 +123,27 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r29:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <button
-          class="pf-v6-c-button pf-m-primary pf-m-block"
-          data-ouia-component-id="OUIA-Generated-Button-primary-:r2b:"
-          data-ouia-component-type="PF6/Button"
-          data-ouia-safe="true"
-          type="submit"
+        <div
+          class="pf-v6-c-form__actions"
         >
-          <span
-            class="pf-v6-c-button__text"
+          <button
+            class="pf-v6-c-button pf-m-primary pf-m-block"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r1e:"
+            data-ouia-component-type="PF6/Button"
+            data-ouia-safe="true"
+            type="submit"
           >
-            Log In
-          </span>
-        </button>
+            <span
+              class="pf-v6-c-button__text"
+            >
+              Log In
+            </span>
+          </button>
+        </div>
       </div>
     </div>
   </form>
@@ -165,16 +154,10 @@ exports[`LoginForm LoginForm with show password 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
-    data-ouia-component-id="OUIA-Generated-Form-:r2c:"
-    data-ouia-component-type="PF6/Form"
-    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r2d:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -205,7 +188,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2g:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1h:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -219,9 +202,6 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r2h:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -258,7 +238,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             >
               <input
                 aria-invalid="false"
-                data-ouia-component-id="OUIA-Generated-TextInputBase-:r2k:"
+                data-ouia-component-id="OUIA-Generated-TextInputBase-:r1k:"
                 data-ouia-component-type="PF6/TextInput"
                 data-ouia-safe="true"
                 id="pf-login-password-id"
@@ -275,7 +255,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             <button
               aria-label="Show password"
               class="pf-v6-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-:r2l:"
+              data-ouia-component-id="OUIA-Generated-Button-control-:r1l:"
               data-ouia-component-type="PF6/Button"
               data-ouia-safe="true"
               type="button"
@@ -304,26 +284,27 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r2m:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <button
-          class="pf-v6-c-button pf-m-primary pf-m-block"
-          data-ouia-component-id="OUIA-Generated-Button-primary-:r2o:"
-          data-ouia-component-type="PF6/Button"
-          data-ouia-safe="true"
-          type="submit"
+        <div
+          class="pf-v6-c-form__actions"
         >
-          <span
-            class="pf-v6-c-button__text"
+          <button
+            class="pf-v6-c-button pf-m-primary pf-m-block"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r1m:"
+            data-ouia-component-type="PF6/Button"
+            data-ouia-safe="true"
+            type="submit"
           >
-            Log In
-          </span>
-        </button>
+            <span
+              class="pf-v6-c-button__text"
+            >
+              Log In
+            </span>
+          </button>
+        </div>
       </div>
     </div>
   </form>
@@ -334,16 +315,10 @@ exports[`LoginForm should render Login form 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
-    data-ouia-component-id="OUIA-Generated-Form-:r0:"
-    data-ouia-component-type="PF6/Form"
-    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r1:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -374,7 +349,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r4:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -388,9 +363,6 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r5:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -421,7 +393,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r8:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r5:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -435,26 +407,27 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
-      data-ouia-component-id="OUIA-Generated-FormGroup-:r9:"
-      data-ouia-component-type="PF6/FormGroup"
-      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <button
-          class="pf-v6-c-button pf-m-primary pf-m-block"
-          data-ouia-component-id="OUIA-Generated-Button-primary-:rb:"
-          data-ouia-component-type="PF6/Button"
-          data-ouia-safe="true"
-          type="submit"
+        <div
+          class="pf-v6-c-form__actions"
         >
-          <span
-            class="pf-v6-c-button__text"
+          <button
+            class="pf-v6-c-button pf-m-primary pf-m-block"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r6:"
+            data-ouia-component-type="PF6/Button"
+            data-ouia-safe="true"
+            type="submit"
           >
-            Log In
-          </span>
-        </button>
+            <span
+              class="pf-v6-c-button__text"
+            >
+              Log In
+            </span>
+          </button>
+        </div>
       </div>
     </div>
   </form>

package/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx

@@ -82,7 +82,6 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
       aria-label="Select Language"
       toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
         <MenuToggle
-          aria-haspopup="listbox"
           ref={toggleRef}
           onClick={() => setIsHeaderUtilsOpen(!isHeaderUtilsOpen)}
           isExpanded={isHeaderUtilsOpen}

package/src/components/Menu/MenuItem.tsx

@@ -7,7 +7,7 @@ import leftOffset from '@patternfly/react-tokens/dist/esm/c_menu_m_flyout__menu_
 import RhMicronsExternalLinkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-external-link-icon';
 import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon';
 import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
-import RhMicronsCheckmarkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-checkmark-icon';
+import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
 import { Checkbox } from '../Checkbox';
 import { MenuContext, MenuItemContext } from './MenuContext';
 import { MenuItemAction } from './MenuItemAction';
@@ -399,7 +399,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
           )}
           {getIsSelected() && (
             <span className={css(styles.menuItemSelectIcon)}>
-              <RhMicronsCheckmarkIcon />
+              <CheckIcon />
             </span>
           )}
         </span>

package/src/components/MenuToggle/MenuToggle.tsx

@@ -73,8 +73,6 @@ export interface MenuToggleProps
   badge?: BadgeProps | React.ReactNode;
   /** Adds styling which affects the size of the menu toggle */
   size?: 'default' | 'sm';
-  /** Indicates what type of popup will be triggered by the menu toggle. A value of true is the same as a value of "menu".  */
-  'aria-haspopup'?: 'menu' | 'listbox' | boolean;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<MenuToggleElement>;
   /** Value to overwrite the randomly generated data-ouia-component-id. It will always target the toggle button. */
@@ -97,8 +95,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
     isDocked: false,
     isTextExpanded: false,
     size: 'default',
-    ouiaSafe: true,
-    'aria-haspopup': 'menu'
+    ouiaSafe: true
   };
 
   render() {
@@ -124,7 +121,6 @@ class MenuToggleBase extends Component<MenuToggleProps> {
       innerRef,
       onClick,
       'aria-label': ariaLabel,
-      'aria-haspopup': ariaHasPopup,
       ouiaId,
       ouiaSafe,
       size,
@@ -175,7 +171,6 @@ class MenuToggleBase extends Component<MenuToggleProps> {
                   type="button"
                   className={css(styles.menuToggleButton)}
                   aria-expanded={isExpanded}
-                  aria-haspopup={ariaHasPopup}
                   onClick={onClick}
                   aria-label={ariaLabel || 'Menu toggle'}
                   tabIndex={-1}
@@ -236,7 +231,6 @@ class MenuToggleBase extends Component<MenuToggleProps> {
                   className={css(styles.menuToggleButton, children && styles.modifiers.text)}
                   type="button"
                   aria-expanded={isExpanded}
-                  aria-haspopup={ariaHasPopup}
                   aria-label={ariaLabel}
                   disabled={isDisabled}
                   onClick={onClick}
@@ -255,7 +249,6 @@ class MenuToggleBase extends Component<MenuToggleProps> {
               className={css(commonStyles, isCircle && isPlain && styles.modifiers.circle)}
               type="button"
               aria-label={ariaLabel}
-              aria-haspopup={ariaHasPopup}
               aria-expanded={isExpanded}
               ref={innerRef as React.Ref<HTMLButtonElement>}
               disabled={isDisabled}

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

@@ -4,7 +4,6 @@ exports[`Old Snapshot tests - remove when refactoring passes additional classes
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle test-class"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r3:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -45,7 +44,6 @@ exports[`Old Snapshot tests - remove when refactoring renders successfully 1`] =
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r1:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -86,7 +84,6 @@ exports[`Old Snapshot tests - remove when refactoring shows badge 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:rh:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -136,7 +133,6 @@ exports[`Old Snapshot tests - remove when refactoring shows icon 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:rf:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -194,7 +190,6 @@ exports[`Old Snapshot tests - remove when refactoring shows isDisabled 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-disabled"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r7:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -236,7 +231,6 @@ exports[`Old Snapshot tests - remove when refactoring shows isExpanded 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="true"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-expanded"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r5:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -277,7 +271,6 @@ exports[`Old Snapshot tests - remove when refactoring shows isPlain 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-plain"
     data-ouia-component-id="OUIA-Generated-MenuToggle-plain-:rb:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -309,7 +302,6 @@ exports[`Old Snapshot tests - remove when refactoring shows isPrimary 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-primary"
     data-ouia-component-id="OUIA-Generated-MenuToggle-primary-:r9:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -350,7 +342,6 @@ exports[`Old Snapshot tests - remove when refactoring shows plain text 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
-    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
     data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-:rd:"
     data-ouia-component-type="PF6/MenuToggle"

package/src/components/MenuToggle/examples/MenuToggle.md

@@ -8,8 +8,8 @@ propComponents: ['MenuToggle', 'MenuToggleAction', 'MenuToggleCheckbox']
 
 import { Fragment, useState } from 'react';
 import './MenuToggle.css'
+import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-ellipsis-vertical-fill-icon';
-import RhUiAddIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-icon';
 import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.svg';
 import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 
@@ -65,7 +65,7 @@ To create a "settings" menu toggle that will animate on hover and focus, you can
 
 ### Custom icons
 
-To add a recognizable icon to a menu toggle, use the `icon` property. The following example adds an `RhUiAddIcon` to the toggle.
+To add a recognizable icon to a menu toggle, use the `icon` property. The following example adds a `PlusIcon` to the toggle.
 
 For most basic icons, it is recommended to wrap it inside our [icon component](/components/icon).
 

package/src/components/MenuToggle/examples/MenuToggleAvatarText.tsx

@@ -4,13 +4,11 @@ import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.sv
 
 export const MenuToggleAvatarText: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />}>
+    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />}>Ned Username</MenuToggle>{' '}
+    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />} isExpanded>
       Ned Username
     </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />} isExpanded>
-      Ned Username
-    </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />} isDisabled>
+    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />} isDisabled>
       Ned Username
     </MenuToggle>
   </Fragment>

package/src/components/MenuToggle/examples/MenuToggleBadge.tsx

@@ -3,13 +3,7 @@ import { MenuToggle, Badge } from '@patternfly/react-core';
 
 export const MenuToggleBadge: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle aria-haspopup={false} badge={<Badge>4 selected</Badge>}>
-      Count
-    </MenuToggle>
-    <MenuToggle
-      aria-haspopup={false}
-      variant="plainText"
-      badge={<Badge screenReaderText="additional items">4</Badge>}
-    />
+    <MenuToggle badge={<Badge>4 selected</Badge>}>Count</MenuToggle>
+    <MenuToggle variant="plainText" badge={<Badge screenReaderText="additional items">4</Badge>} />
   </Fragment>
 );

package/src/components/MenuToggle/examples/MenuToggleCollapsed.tsx

@@ -1,5 +1,3 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleCollapsed: React.FunctionComponent = () => (
-  <MenuToggle aria-haspopup={false}>Collapsed</MenuToggle>
-);
+export const MenuToggleCollapsed: React.FunctionComponent = () => <MenuToggle>Collapsed</MenuToggle>;

package/src/components/MenuToggle/examples/MenuToggleCustomIcon.tsx

@@ -1,16 +1,16 @@
 import { Fragment } from 'react';
 import { MenuToggle } from '@patternfly/react-core';
-import RhUiAddIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-icon';
+import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 
 export const MenuToggleCustomIcon: React.FC = () => (
   <Fragment>
-    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="primary">
+    <MenuToggle icon={<PlusIcon />} variant="primary">
       Icon
     </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="secondary">
+    <MenuToggle icon={<PlusIcon />} variant="secondary">
       Icon
     </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="secondary" isDisabled>
+    <MenuToggle icon={<PlusIcon />} variant="secondary" isDisabled>
       Icon
     </MenuToggle>
   </Fragment>

package/src/components/MenuToggle/examples/MenuToggleDisabled.tsx

@@ -1,7 +1,3 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleDisabled: React.FunctionComponent = () => (
-  <MenuToggle aria-haspopup={false} isDisabled>
-    Disabled
-  </MenuToggle>
-);
+export const MenuToggleDisabled: React.FunctionComponent = () => <MenuToggle isDisabled>Disabled</MenuToggle>;

package/src/components/MenuToggle/examples/MenuToggleExpanded.tsx

@@ -1,7 +1,3 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleExpanded: React.FunctionComponent = () => (
-  <MenuToggle aria-haspopup={false} isExpanded>
-    Expanded
-  </MenuToggle>
-);
+export const MenuToggleExpanded: React.FunctionComponent = () => <MenuToggle isExpanded>Expanded</MenuToggle>;

package/src/components/MenuToggle/examples/MenuToggleFullHeight.tsx

@@ -2,7 +2,7 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleFullHeight: React.FunctionComponent = () => (
   <div style={{ height: '80px' }}>
-    <MenuToggle aria-haspopup={false} isFullHeight aria-label="Full height menu toggle">
+    <MenuToggle isFullHeight aria-label="Full height menu toggle">
       Full height
     </MenuToggle>
   </div>

package/src/components/MenuToggle/examples/MenuToggleFullWidth.tsx

@@ -1,7 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleFullWidth: React.FunctionComponent = () => (
-  <MenuToggle aria-haspopup={false} isFullWidth aria-label="Full width menu toggle">
+  <MenuToggle isFullWidth aria-label="Full width menu toggle">
     Full width
   </MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuToggleInForm.tsx

@@ -1,7 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleInForm = (): JSX.Element => (
-  <MenuToggle aria-haspopup={false} isInForm aria-label="Menu toggle in a form">
+  <MenuToggle isInForm aria-label="Menu toggle in a form">
     In form
   </MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx

@@ -1,7 +1,5 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuTogglePlaceholder: React.FunctionComponent = () => (
-  <MenuToggle aria-haspopup={false} isPlaceholder>
-    Placeholder text
-  </MenuToggle>
+  <MenuToggle isPlaceholder>Placeholder text</MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx

@@ -4,15 +4,8 @@ import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons
 
 export const MenuTogglePlainCircle: React.FunctionComponent = () => (
   <Fragment>
+    <MenuToggle isCircle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" aria-label="plain circle kebab" />{' '}
     <MenuToggle
-      aria-haspopup={false}
-      isCircle
-      icon={<RhUiEllipsisVerticalFillIcon />}
-      variant="plain"
-      aria-label="plain circle kebab"
-    />{' '}
-    <MenuToggle
-      aria-haspopup={false}
       isCircle
       icon={<RhUiEllipsisVerticalFillIcon />}
       variant="plain"
@@ -20,7 +13,6 @@ export const MenuTogglePlainCircle: React.FunctionComponent = () => (
       aria-label="plain circle expanded kebab"
     />{' '}
     <MenuToggle
-      aria-haspopup={false}
       isCircle
       icon={<RhUiEllipsisVerticalFillIcon />}
       variant="plain"

package/src/components/MenuToggle/examples/MenuTogglePlainIcon.tsx

@@ -4,25 +4,8 @@ import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons
 
 export const MenuTogglePlainIcon: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle
-      aria-haspopup={false}
-      icon={<RhUiEllipsisVerticalFillIcon />}
-      variant="plain"
-      aria-label="plain kebab"
-    />{' '}
-    <MenuToggle
-      aria-haspopup={false}
-      icon={<RhUiEllipsisVerticalFillIcon />}
-      variant="plain"
-      isExpanded
-      aria-label="plain expanded kebab"
-    />{' '}
-    <MenuToggle
-      aria-haspopup={false}
-      icon={<RhUiEllipsisVerticalFillIcon />}
-      variant="plain"
-      isDisabled
-      aria-label="disabled plain kebab"
-    />
+    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" aria-label="plain kebab" />{' '}
+    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" isExpanded aria-label="plain expanded kebab" />{' '}
+    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" isDisabled aria-label="disabled plain kebab" />
   </Fragment>
 );

package/src/components/MenuToggle/examples/MenuTogglePlainTextLabel.tsx

@@ -3,13 +3,13 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuTogglePlainTextLabel: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle aria-haspopup={false} variant="plainText" isDisabled aria-label="Disabled plain menu toggle">
+    <MenuToggle variant="plainText" isDisabled aria-label="Disabled plain menu toggle">
       Disabled
     </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} variant="plainText" aria-label="Plain menu toggle">
+    <MenuToggle variant="plainText" aria-label="Plain menu toggle">
       Custom text
     </MenuToggle>{' '}
-    <MenuToggle aria-haspopup={false} variant="plainText" isExpanded aria-label="Expanded plain menu toggle">
+    <MenuToggle variant="plainText" isExpanded aria-label="Expanded plain menu toggle">
       Custom text (expanded)
     </MenuToggle>
   </Fragment>