From 122aebb485483b5f0f401ca7f1210a4708b476e6 Mon Sep 17 00:00:00 2001
From: NULL <axel.d4mage@gmail.com>
Date: Thu, 9 Jul 2026 13:43:52 -0400
Subject: [PATCH] feat(MenuToggle): add aria-haspopup prop

Adds the aria-haspopup prop to MenuToggle with a default value of 'menu'. Updates all Select implementations across examples and demos to explicitly pass aria-haspopup="listbox" to properly reflect their semantic role, addressing issue #11792 (PF-1704).
---
 .../src/components/Form/examples/FormState.tsx           | 2 +-
 .../LoginPage/examples/LoginPageLanguageSelect.tsx       | 2 +-
 .../react-core/src/components/MenuToggle/MenuToggle.tsx  | 9 ++++++++-
 .../__tests__/__snapshots__/MenuToggle.test.tsx.snap     | 9 +++++++++
 .../src/components/Select/examples/SelectBasic.tsx       | 2 +-
 .../src/components/Select/examples/SelectCheckbox.tsx    | 2 +-
 .../src/components/Select/examples/SelectFooter.tsx      | 2 +-
 .../src/components/Select/examples/SelectGrouped.tsx     | 2 +-
 .../components/Select/examples/SelectMultiTypeahead.tsx  | 2 +-
 .../Select/examples/SelectMultiTypeaheadCheckbox.tsx     | 2 +-
 .../Select/examples/SelectMultiTypeaheadCreatable.tsx    | 2 +-
 .../Select/examples/SelectOptionVariations.tsx           | 2 +-
 .../src/components/Select/examples/SelectTypeahead.tsx   | 2 +-
 .../Select/examples/SelectTypeaheadCreatable.tsx         | 2 +-
 .../src/components/Select/examples/SelectValidated.tsx   | 2 +-
 .../src/components/Select/examples/SelectViewMore.tsx    | 2 +-
 .../examples/ToolbarComponentManagedToggleGroups.tsx     | 4 ++--
 .../examples/ToolbarConsumerManagedToggleGroups.tsx      | 4 ++--
 .../Toolbar/examples/ToolbarCustomLabelGroupContent.tsx  | 4 ++--
 .../src/components/Toolbar/examples/ToolbarGroups.tsx    | 6 +++---
 .../src/components/Toolbar/examples/ToolbarStacked.tsx   | 4 ++--
 .../components/Toolbar/examples/ToolbarWithFilters.tsx   | 4 ++--
 .../src/components/Tooltip/examples/TooltipOptions.tsx   | 4 ++--
 23 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/packages/react-core/src/components/Form/examples/FormState.tsx b/packages/react-core/src/components/Form/examples/FormState.tsx
index 2431e47990d..1b5ab4be089 100644
--- a/packages/react-core/src/components/Form/examples/FormState.tsx
+++ b/packages/react-core/src/components/Form/examples/FormState.tsx
@@ -62,7 +62,7 @@ export const FormState = () => {
             selected={getValue('select-id')}
             isOpen={isSelectOpen}
             toggle={(toggleRef) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={(isOpen) => setIsSelectOpen(isOpen)}
                 isExpanded={isSelectOpen}
diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
index 12abe7a9448..b32dc7b343b 100644
--- a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
+++ b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
@@ -81,7 +81,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
     <Select
       aria-label="Select Language"
       toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-        <MenuToggle
+        <MenuToggle aria-haspopup="listbox"
           ref={toggleRef}
           onClick={() => setIsHeaderUtilsOpen(!isHeaderUtilsOpen)}
           isExpanded={isHeaderUtilsOpen}
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index a754e51f7a7..34543a6e840 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -73,6 +73,8 @@ export interface MenuToggleProps
   badge?: BadgeProps | React.ReactNode;
   /** Adds styling which affects the size of the menu toggle */
   size?: 'default' | 'sm';
+  /** Default value of aria-haspopup */
+  'aria-haspopup'?: 'menu' | 'listbox' | 'dialog' | 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. */
@@ -95,7 +97,8 @@ class MenuToggleBase extends Component<MenuToggleProps> {
     isDocked: false,
     isTextExpanded: false,
     size: 'default',
-    ouiaSafe: true
+    ouiaSafe: true,
+    'aria-haspopup': 'menu'
   };
 
   render() {
@@ -121,6 +124,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
       innerRef,
       onClick,
       'aria-label': ariaLabel,
+      'aria-haspopup': ariaHasPopup,
       ouiaId,
       ouiaSafe,
       size,
@@ -171,6 +175,7 @@ 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}
@@ -231,6 +236,7 @@ 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}
@@ -249,6 +255,7 @@ 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}
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
index daab926d974..80c8e87e218 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
+++ b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
@@ -4,6 +4,7 @@ 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"
@@ -44,6 +45,7 @@ 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"
@@ -84,6 +86,7 @@ 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"
@@ -133,6 +136,7 @@ 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"
@@ -190,6 +194,7 @@ 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"
@@ -231,6 +236,7 @@ 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"
@@ -271,6 +277,7 @@ 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"
@@ -302,6 +309,7 @@ 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"
@@ -342,6 +350,7 @@ 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"
diff --git a/packages/react-core/src/components/Select/examples/SelectBasic.tsx b/packages/react-core/src/components/Select/examples/SelectBasic.tsx
index 948c1c9a264..c034cabac79 100644
--- a/packages/react-core/src/components/Select/examples/SelectBasic.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectBasic.tsx
@@ -19,7 +19,7 @@ export const SelectBasic: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
index 2a1d582d83c..e57a931e0cd 100644
--- a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
@@ -21,7 +21,7 @@ export const SelectCheckbox: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectFooter.tsx b/packages/react-core/src/components/Select/examples/SelectFooter.tsx
index fa61dfd213a..a89678b7e27 100644
--- a/packages/react-core/src/components/Select/examples/SelectFooter.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectFooter.tsx
@@ -10,7 +10,7 @@ export const SelectFooter: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectGrouped.tsx b/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
index 4a592822d78..4a052b9a4e4 100644
--- a/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
@@ -26,7 +26,7 @@ export const SelectGrouped: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
index b79f206381e..00e8b862921 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
@@ -187,7 +187,7 @@ export const SelectMultiTypeahead: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       variant="typeahead"
       aria-label="Multi typeahead menu toggle"
       onClick={onToggleClick}
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
index 14c504a3733..242feefcacc 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
@@ -195,7 +195,7 @@ export const SelectMultiTypeaheadCheckbox: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       variant="typeahead"
       aria-label="Multi typeahead checkbox menu toggle"
       onClick={onToggleClick}
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
index 87326ffe9c3..fb1e727d54f 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
@@ -200,7 +200,7 @@ export const SelectMultiTypeaheadCreatable: React.FunctionComponent = () => {
   const getChildren = (value: string) => initialSelectOptions.find((option) => option.value === value)?.children;
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       variant="typeahead"
       aria-label="Multi typeahead creatable menu toggle"
       onClick={onToggleClick}
diff --git a/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx b/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
index e25d7f23e13..d47ac137612 100644
--- a/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
@@ -19,7 +19,7 @@ export const SelectOptionVariations: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx b/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
index 47a0a3f4ddb..3ce38ff59c7 100644
--- a/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
@@ -198,7 +198,7 @@ export const SelectTypeahead: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       variant="typeahead"
       aria-label="Typeahead menu toggle"
diff --git a/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx b/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
index 6a04a25aebe..ff67f2f332c 100644
--- a/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
@@ -205,7 +205,7 @@ export const SelectTypeaheadCreatable: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       variant="typeahead"
       aria-label="Typeahead creatable menu toggle"
diff --git a/packages/react-core/src/components/Select/examples/SelectValidated.tsx b/packages/react-core/src/components/Select/examples/SelectValidated.tsx
index 68dfa2db495..abc080b0c49 100644
--- a/packages/react-core/src/components/Select/examples/SelectValidated.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectValidated.tsx
@@ -29,7 +29,7 @@ export const SelectValidated: React.FunctionComponent = () => {
   };
 
   const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Select/examples/SelectViewMore.tsx b/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
index b72a241f3ac..bff16551903 100644
--- a/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
@@ -100,7 +100,7 @@ export const SelectViewMore: React.FunctionComponent = () => {
   };
 
   const toggle = (
-    <MenuToggle
+    <MenuToggle aria-haspopup="listbox"
       ref={toggleRef}
       onClick={onToggleClick}
       isExpanded={isOpen}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
index 88f2b01bc5e..9e9b1b64d36 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
@@ -62,7 +62,7 @@ export const ToolbarComponentManagedToggleGroup: React.FunctionComponent = () =>
         <ToolbarItem>
           <Select
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => onStatusToggle()}
                 isExpanded={statusIsExpanded}
@@ -92,7 +92,7 @@ export const ToolbarComponentManagedToggleGroup: React.FunctionComponent = () =>
         <ToolbarItem>
           <Select
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => onRiskToggle()}
                 isExpanded={riskIsExpanded}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
index 2c46597a326..6e102994a67 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
@@ -67,7 +67,7 @@ export const ToolbarConsumerManagedToggleGroup: React.FunctionComponent = () =>
         <ToolbarItem>
           <Select
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => onStatusToggle()}
                 isExpanded={statusIsExpanded}
@@ -97,7 +97,7 @@ export const ToolbarConsumerManagedToggleGroup: React.FunctionComponent = () =>
         <ToolbarItem>
           <Select
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => onRiskToggle()}
                 isExpanded={riskIsExpanded}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
index a572d1ff62f..275b68d5e05 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
@@ -109,7 +109,7 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
             aria-label="Status"
             role="menu"
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => setStatusIsExpanded(!statusIsExpanded)}
                 isExpanded={statusIsExpanded}
@@ -141,7 +141,7 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
             aria-label="Risk"
             role="menu"
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => setRiskIsExpanded(!riskIsExpanded)}
                 isExpanded={riskIsExpanded}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
index 358a6766e63..00d5f3487c4 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
@@ -61,7 +61,7 @@ export const ToolbarGroups: React.FunctionComponent = () => {
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-            <MenuToggle
+            <MenuToggle aria-haspopup="listbox"
               ref={toggleRef}
               onClick={() => onToggle('first')}
               isExpanded={firstIsExpanded}
@@ -91,7 +91,7 @@ export const ToolbarGroups: React.FunctionComponent = () => {
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-            <MenuToggle
+            <MenuToggle aria-haspopup="listbox"
               ref={toggleRef}
               onClick={() => onToggle('second')}
               isExpanded={secondIsExpanded}
@@ -121,7 +121,7 @@ export const ToolbarGroups: React.FunctionComponent = () => {
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-            <MenuToggle
+            <MenuToggle aria-haspopup="listbox"
               ref={toggleRef}
               onClick={() => onToggle('third')}
               isExpanded={thirdIsExpanded}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
index 1d917f43baf..6a770a039fe 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
@@ -135,7 +135,7 @@ export const ToolbarStacked: React.FunctionComponent = () => {
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-            <MenuToggle
+            <MenuToggle aria-haspopup="listbox"
               ref={toggleRef}
               onClick={() => onResourceToggle()}
               isExpanded={resourceIsExpanded}
@@ -169,7 +169,7 @@ export const ToolbarStacked: React.FunctionComponent = () => {
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-            <MenuToggle
+            <MenuToggle aria-haspopup="listbox"
               ref={toggleRef}
               onClick={() => onStatusToggle()}
               isExpanded={statusIsExpanded}
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
index 1bf48886d70..b98acdf2001 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
@@ -146,7 +146,7 @@ export const ToolbarWithFilters: React.FunctionComponent = () => {
             aria-label="Status"
             role="menu"
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={onStatusToggle}
                 isExpanded={isStatusExpanded}
@@ -177,7 +177,7 @@ export const ToolbarWithFilters: React.FunctionComponent = () => {
             aria-label="Risk"
             role="menu"
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={onRiskToggle}
                 isExpanded={isRiskExpanded}
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
index d5294588cb4..49b55e9aa86 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
@@ -108,7 +108,7 @@ export const TooltipOptions: React.FunctionComponent = () => {
           position (will flip if enableFlip is true). The 'auto' position requires enableFlip to be set to true.
           <Select
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => setPositionSelectOpen(!positionSelectOpen)}
                 isExpanded={positionSelectOpen}
@@ -191,7 +191,7 @@ export const TooltipOptions: React.FunctionComponent = () => {
             isOpen={flipSelectOpen}
             selected={flipBehavior}
             toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-              <MenuToggle
+              <MenuToggle aria-haspopup="listbox"
                 ref={toggleRef}
                 onClick={() => setFlipSelectOpen(!flipSelectOpen)}
                 isExpanded={flipSelectOpen}