Skip to content
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

Jump to bottom

fix: Dropdown Menu accessibility issues within shadow dom #3045

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Dropdown Menu accessibility issues within shadow dom #3045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/core/primitive/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { composeEventHandlers } from './primitive';
export { composeEventHandlers, activeElement } from './primitive';
8 changes: 6 additions & 2 deletions packages/core/primitive/src/primitive.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ function composeEventHandlers<E>(
return function handleEvent(event: E) {
originalEventHandler?.(event);

if (checkForDefaultPrevented === false || !((event as unknown) as Event).defaultPrevented) {
if (checkForDefaultPrevented === false || !(event as unknown as Event).defaultPrevented) {
return ourEventHandler?.(event);
}
};
}

export { composeEventHandlers };
function activeElement() {
return document.activeElement?.shadowRoot?.activeElement ?? document.activeElement;
}

export { composeEventHandlers, activeElement };
53 changes: 27 additions & 26 deletions packages/react/accordion/src/Accordion.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import { axe } from 'jest-axe';
import { render, fireEvent, RenderResult } from '@testing-library/react';
import * as Accordion from '@radix-ui/react-accordion';
import { activeElement } from '@radix-ui/primitive';

const ITEMS = ['One', 'Two', 'Three'];

Expand All @@ -27,14 +28,14 @@ describe('given a single Accordion', () => {

describe('on `ArrowDown`', () => {
it('should move focus to the next trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowDown' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowDown' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});

it('should move focus to the first item if at the end', () => {
const trigger = rendered.getByText('Trigger Three');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowDown' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowDown' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});
Expand All @@ -43,28 +44,28 @@ describe('given a single Accordion', () => {
it('should move focus to the previous trigger', () => {
const trigger = rendered.getByText('Trigger Three');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowUp' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowUp' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});

it('should move focus to the last item if at the beginning', () => {
const trigger = rendered.getByText('Trigger One');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowUp' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowUp' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});

describe('on `Home`', () => {
it('should move focus to the first trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
fireEvent.keyDown(activeElement()!, { key: 'Home' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `End`', () => {
it('should move focus to the last trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'End' });
fireEvent.keyDown(activeElement()!, { key: 'End' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});
Expand Down Expand Up @@ -145,28 +146,28 @@ describe('given a single Accordion', () => {

describe('on `ArrowUp`', () => {
it('should do nothing', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowUp' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowUp' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `ArrowDown`', () => {
it('should do nothing', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowDown' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowDown' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `ArrowRight`', () => {
it('should move focus to the next trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowRight' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowRight' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});

it('should move focus to the first item if at the end', () => {
const trigger = rendered.getByText('Trigger Three');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowRight' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowRight' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});
Expand All @@ -175,28 +176,28 @@ describe('given a single Accordion', () => {
it('should move focus to the previous trigger', () => {
const trigger = rendered.getByText('Trigger Three');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowLeft' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowLeft' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});

it('should move focus to the last item if at the beginning', () => {
const trigger = rendered.getByText('Trigger One');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowLeft' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowLeft' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});

describe('on `Home`', () => {
it('should move focus to the first trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
fireEvent.keyDown(activeElement()!, { key: 'Home' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `End`', () => {
it('should move focus to the last trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'End' });
fireEvent.keyDown(activeElement()!, { key: 'End' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});
Expand Down Expand Up @@ -224,14 +225,14 @@ describe('given a single Accordion', () => {

describe('on `ArrowUp`', () => {
it('should do nothing', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowUp' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowUp' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `ArrowDown`', () => {
it('should do nothing', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowDown' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowDown' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});
Expand All @@ -240,40 +241,40 @@ describe('given a single Accordion', () => {
it('should move focus to the previous trigger', () => {
const trigger = rendered.getByText('Trigger Two');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowRight' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowRight' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});

it('should move focus to the last item if at the beginning', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowRight' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowRight' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});

describe('on `ArrowLeft`', () => {
it('should move focus to the next trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowLeft' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowLeft' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});

it('should move focus to the first item if at the end', () => {
const trigger = rendered.getByText('Trigger Three');
trigger.focus();
fireEvent.keyDown(document.activeElement!, { key: 'ArrowLeft' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowLeft' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `Home`', () => {
it('should move focus to the first trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
fireEvent.keyDown(activeElement()!, { key: 'Home' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `End`', () => {
it('should move focus to the last trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'End' });
fireEvent.keyDown(activeElement()!, { key: 'End' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});
Expand Down Expand Up @@ -302,28 +303,28 @@ describe('given a multiple Accordion', () => {

describe('on `ArrowDown`', () => {
it('should move focus to the next trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowDown' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowDown' });
expect(rendered.getByText('Trigger Two')).toHaveFocus();
});
});

describe('on `ArrowUp`', () => {
it('should move focus to the previous trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'ArrowUp' });
fireEvent.keyDown(activeElement()!, { key: 'ArrowUp' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});

describe('on `Home`', () => {
it('should move focus to the first trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'Home' });
fireEvent.keyDown(activeElement()!, { key: 'Home' });
expect(rendered.getByText('Trigger One')).toHaveFocus();
});
});

describe('on `End`', () => {
it('should move focus to the last trigger', () => {
fireEvent.keyDown(document.activeElement!, { key: 'End' });
fireEvent.keyDown(activeElement()!, { key: 'End' });
expect(rendered.getByText('Trigger Three')).toHaveFocus();
});
});
Expand Down
3 changes: 2 additions & 1 deletion packages/react/dialog/src/Dialog.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import { axe } from 'jest-axe';
import { render, fireEvent, RenderResult, cleanup } from '@testing-library/react';
import * as Dialog from '@radix-ui/react-dialog';
import { activeElement } from '@radix-ui/primitive';

const OPEN_TEXT = 'Open';
const CLOSE_TEXT = 'Close';
Expand Down Expand Up @@ -126,7 +127,7 @@ describe('given a default Dialog', () => {

describe('when pressing escape', () => {
beforeEach(() => {
fireEvent.keyDown(document.activeElement!, { key: 'Escape' });
fireEvent.keyDown(activeElement()!, { key: 'Escape' });
});

it('should close the content', () => {
Expand Down
Loading