Skip to content

[WNMGDS-3315] Fixed aria-invalid property previously assigned to Dropdown Button #3516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2025
Merged

[WNMGDS-3315] Fixed aria-invalid property previously assigned to Dropdown Button #3516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e538d26
Apply `aria-invalid` property to element with `listbox` role
kim-cmsds Apr 3, 2025
393b5e0
updates unit and browser tests
kim-cmsds Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions packages/design-system/src/components/Dropdown/Dropdown.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,19 @@ describe('Dropdown', () => {
);

const button = getButton();
expect(button).toHaveAttribute('aria-invalid', 'true');
expect(button).toHaveAttribute('aria-describedby', errorId);
expect(button).toHaveClass('ds-c-field--error');

userEvent.click(button);

const listbox = screen.getByRole('listbox');
expect(listbox).toHaveAttribute('aria-invalid', 'true');

const error = container.querySelector(`#${errorId}`);
expect(error).toMatchSnapshot();
});

it('supports bottom placed error', () => {
it('supports bottom placed error', async () => {
const errorId = 'my-error';
const { container } = makeDropdown(
{
Expand All @@ -154,10 +158,14 @@ describe('Dropdown', () => {
);

const button = getButton();
expect(button).toHaveAttribute('aria-invalid', 'true');
expect(button).toHaveAttribute('aria-describedby', errorId);
expect(button).toHaveClass('ds-c-field--error');

userEvent.click(button);

const listbox = screen.getByRole('listbox');
expect(listbox).toHaveAttribute('aria-invalid', 'true');

const dropdown = container.querySelector('.ds-c-dropdown');
const error = container.querySelector(`#${errorId}`);
expect(dropdown.lastChild).toEqual(error);
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/Dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ export const Dropdown: React.FC<DropdownProps> = (props: DropdownProps) => {
ref: mergeRefs([triggerRef, inputRef, useAutofocus<HTMLButtonElement>(props.autoFocus)]),
'aria-controls': menuId,
'aria-labelledby': `${buttonContentId} ${labelProps.id}`,
'aria-invalid': invalid,
'aria-describedby': describeField({ ...props, hintId, errorId }),
// TODO: Someday we may want to add this `combobox` role back to the button, but right
// now desktop VoiceOver has an issue. It seems to interpret the selected value in the
Expand Down Expand Up @@ -319,6 +318,7 @@ export const Dropdown: React.FC<DropdownProps> = (props: DropdownProps) => {
{state.isOpen && (
<DropdownMenu
{...useSelectProps.menuProps}
ariaInvalid={invalid}
componentClass="ds-c-dropdown"
labelId={labelProps.id}
menuId={menuId}
Expand Down
3 changes: 3 additions & 0 deletions packages/design-system/src/components/Dropdown/DropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { DropdownSize } from './Dropdown';
import classNames from 'classnames';

interface DropdownMenuProps<T> extends AriaListBoxOptions<T> {
ariaInvalid?: React.AriaAttributes['aria-invalid'];
children?: React.ReactNode;
componentClass: string;
heading?: React.ReactNode;
Expand All @@ -22,6 +23,7 @@ interface DropdownMenuProps<T> extends AriaListBoxOptions<T> {
}

export function DropdownMenu<T>({
ariaInvalid,
children,
componentClass,
heading,
Expand Down Expand Up @@ -93,6 +95,7 @@ export function DropdownMenu<T>({
<ul
{...listBoxProps}
id={menuId}
aria-invalid={ariaInvalid}
aria-labelledby={classNames(labelId, heading && headingId)}
className={`${componentClass}__menu`}
ref={listBoxRef}
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

exports[`Dropdown accepts optgroup children 1`] = `
<ul
aria-invalid="false"
aria-labelledby="static-id__label"
class="ds-c-dropdown__menu"
id="static-id__menu"
Expand Down Expand Up @@ -190,7 +191,6 @@ exports[`Dropdown dropdown matches snapshot 1`] = `
aria-controls="static-id__menu"
aria-expanded="false"
aria-haspopup="listbox"
aria-invalid="false"
aria-labelledby="static-id__button-content static-id__label"
class="ds-c-dropdown__button ds-c-field"
id="static-id"
Expand Down
2 changes: 0 additions & 2 deletions ...-system/src/components/web-components/ds-dropdown/__snapshots__/ds-dropdown.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ exports[`Dropdown renders a dropdown 1`] = `
aria-disabled="false"
aria-expanded="false"
aria-haspopup="listbox"
aria-invalid="false"
aria-labelledby="dropdown--1__button-content dropdown--1__label"
class="ds-c-dropdown__button ds-c-field"
id="dropdown--1"
Expand Down Expand Up @@ -151,7 +150,6 @@ exports[`Dropdown renders a dropdown using html options 1`] = `
aria-disabled="false"
aria-expanded="false"
aria-haspopup="listbox"
aria-invalid="false"
aria-labelledby="dropdown--5__button-content dropdown--5__label"
class="ds-c-dropdown__button ds-c-field"
id="dropdown--5"
Expand Down