Skip to content

Commit 871abd8

Browse files
authored
fix(Menu toggle): Passed aria label prop value to typeahead variant (#10084)
* fix(Menu toggle): Passed aria label prop value to typeahead variant * Fix failing build. Add back default so it does not break consumers
1 parent 9bb6a23 commit 871abd8

File tree

7 files changed

+42
-7
lines changed

7 files changed

+42
-7
lines changed

packages/react-core/src/components/MenuToggle/MenuToggle.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
9696
className={css(styles.menuToggleButton)}
9797
aria-expanded={isExpanded}
9898
onClick={onClick}
99-
aria-label="Menu toggle"
99+
aria-label={ariaLabel || 'Menu toggle'}
100100
>
101101
{toggleControls}
102102
</button>

packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const MenuToggleTypeahead: React.FunctionComponent = () => {
1616
};
1717

1818
return (
19-
<MenuToggle variant="typeahead" isFullWidth>
19+
<MenuToggle variant="typeahead" isFullWidth aria-label="Typeahead menu toggle">
2020
<TextInputGroup isPlain>
2121
<TextInputGroupMain
2222
value={inputValue}

packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,14 @@ export const SelectMultiTypeahead: React.FunctionComponent = () => {
137137
};
138138

139139
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
140-
<MenuToggle variant="typeahead" onClick={onToggleClick} innerRef={toggleRef} isExpanded={isOpen} isFullWidth>
140+
<MenuToggle
141+
variant="typeahead"
142+
aria-label="Multi typeahead menu toggle"
143+
onClick={onToggleClick}
144+
innerRef={toggleRef}
145+
isExpanded={isOpen}
146+
isFullWidth
147+
>
141148
<TextInputGroup isPlain>
142149
<TextInputGroupMain
143150
value={inputValue}

packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,14 @@ export const SelectMultiTypeaheadCheckbox: React.FunctionComponent = () => {
140140
}, [selected]);
141141

142142
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
143-
<MenuToggle variant="typeahead" onClick={onToggleClick} innerRef={toggleRef} isExpanded={isOpen} isFullWidth>
143+
<MenuToggle
144+
variant="typeahead"
145+
aria-label="Multi typeahead checkbox menu toggle"
146+
onClick={onToggleClick}
147+
innerRef={toggleRef}
148+
isExpanded={isOpen}
149+
isFullWidth
150+
>
144151
<TextInputGroup isPlain>
145152
<TextInputGroupMain
146153
value={inputValue}

packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,14 @@ export const SelectMultiTypeaheadCreatable: React.FunctionComponent = () => {
147147
};
148148

149149
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
150-
<MenuToggle variant="typeahead" onClick={onToggleClick} innerRef={toggleRef} isExpanded={isOpen} isFullWidth>
150+
<MenuToggle
151+
variant="typeahead"
152+
aria-label="Multi typeahead creatable menu toggle"
153+
onClick={onToggleClick}
154+
innerRef={toggleRef}
155+
isExpanded={isOpen}
156+
isFullWidth
157+
>
151158
<TextInputGroup isPlain>
152159
<TextInputGroupMain
153160
value={inputValue}

packages/react-core/src/components/Select/examples/SelectTypeahead.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,14 @@ export const SelectBasic: React.FunctionComponent = () => {
143143
};
144144

145145
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
146-
<MenuToggle ref={toggleRef} variant="typeahead" onClick={onToggleClick} isExpanded={isOpen} isFullWidth>
146+
<MenuToggle
147+
ref={toggleRef}
148+
variant="typeahead"
149+
aria-label="Typeahead menu toggle"
150+
onClick={onToggleClick}
151+
isExpanded={isOpen}
152+
isFullWidth
153+
>
147154
<TextInputGroup isPlain>
148155
<TextInputGroupMain
149156
value={inputValue}

packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,14 @@ export const SelectTypeaheadCreatable: React.FunctionComponent = () => {
154154
};
155155

156156
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
157-
<MenuToggle ref={toggleRef} variant="typeahead" onClick={onToggleClick} isExpanded={isOpen} isFullWidth>
157+
<MenuToggle
158+
ref={toggleRef}
159+
variant="typeahead"
160+
aria-label="Typeahead creatable menu toggle"
161+
onClick={onToggleClick}
162+
isExpanded={isOpen}
163+
isFullWidth
164+
>
158165
<TextInputGroup isPlain>
159166
<TextInputGroupMain
160167
value={inputValue}

0 commit comments

Comments
 (0)