Skip to content

Revert fix: useSelect trigger label (#4949) and fix example story #5036

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
LFDanLu merged 2 commits into from
Sep 6, 2023
Merged

Revert fix: useSelect trigger label (#4949) and fix example story #5036

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
d714889
Fix id provided to story
LFDanLu Sep 6, 2023
5d41dae
Revert "fix: useSelect trigger label (#4949)"
LFDanLu Sep 6, 2023
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
6 changes: 2 additions & 4 deletions packages/@react-aria/select/src/useSelect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,10 @@ export function useSelect<T>(props: AriaSelectOptions<T>, state: SelectState<T>,
isDisabled,
onKeyDown: chain(triggerProps.onKeyDown, onKeyDown, props.onKeyDown),
onKeyUp: props.onKeyUp,
'aria-label': `, ${props['aria-label'] ?? ''}`,
'aria-labelledby': [
valueId,
!(props['aria-labelledby'] && props['aria-label']) && triggerProps.id,
!(props['aria-labelledby'] || props['aria-label']) && labelProps.id,
props['aria-labelledby']
triggerProps['aria-labelledby'],
triggerProps['aria-label'] && !triggerProps['aria-labelledby'] ? triggerProps.id : null
].filter(Boolean).join(' '),
onFocus(e: FocusEvent) {
if (state.isFocused) {
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/picker/stories/Picker.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ export const LabelledBy: LabelledByStory = {
},
render: (args) => (
<>
<div id="test label">Test label</div>
<Picker {...args} aria-labelledby={args['aria-labelledby'] ? 'test label' : null} items={flatOptions}>
<div id="test">Test label</div>
<Picker {...args} aria-labelledby={args['aria-labelledby'] ? 'test' : null} items={flatOptions}>
{(item: any) => <Item>{item.name}</Item>}
</Picker>
</>
Expand Down
12 changes: 6 additions & 6 deletions packages/@react-spectrum/picker/test/Picker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ describe('Picker', function () {
let value = getByText('Select an option…');
expect(label).toHaveAttribute('id');
expect(value).toHaveAttribute('id');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${picker.id} ${label.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${label.id}`);

triggerPress(picker);
act(() => jest.runAllTimers());
Expand All @@ -833,7 +833,7 @@ describe('Picker', function () {
let value = getByText('Select an option…');
expect(picker).toHaveAttribute('id');
expect(value).toHaveAttribute('id');
expect(picker).toHaveAttribute('aria-label', ', Test');
expect(picker).toHaveAttribute('aria-label', 'Test');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${picker.id}`);

triggerPress(picker);
Expand All @@ -859,7 +859,7 @@ describe('Picker', function () {
let value = getByText('Select an option…');
expect(picker).toHaveAttribute('id');
expect(value).toHaveAttribute('id');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${picker.id} foo`);
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} foo`);

triggerPress(picker);
act(() => jest.runAllTimers());
Expand All @@ -884,8 +884,8 @@ describe('Picker', function () {
let value = getByText('Select an option…');
expect(picker).toHaveAttribute('id');
expect(value).toHaveAttribute('id');
expect(picker).toHaveAttribute('aria-label', ', Test');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} foo`);
expect(picker).toHaveAttribute('aria-label', 'Test');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${picker.id} foo`);

triggerPress(picker);
act(() => jest.runAllTimers());
Expand Down Expand Up @@ -918,7 +918,7 @@ describe('Picker', function () {
let value = getByText('Select an option…');
expect(label).toHaveAttribute('id');
expect(value).toHaveAttribute('id');
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${picker.id} ${label.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${value.id} ${label.id}`);

triggerPress(picker);
act(() => jest.runAllTimers());
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/searchwithin/test/SearchWithin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ describe('SearchWithin labeling', function () {

expect(group).not.toHaveAttribute('aria-labelledby');
expect(searchfield).toHaveAttribute('aria-labelledby', `${hiddenLabel.id} ${picker.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${picker.id} ${hiddenLabel.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${hiddenLabel.id}`);
});

it('label = foo', function () {
Expand All @@ -203,7 +203,7 @@ describe('SearchWithin labeling', function () {

expect(group).toHaveAttribute('aria-labelledby', label.id);
expect(searchfield).toHaveAttribute('aria-labelledby', `${label.id} ${hiddenLabel.id} ${picker.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${picker.id} ${label.id} ${hiddenLabel.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${label.id} ${hiddenLabel.id}`);

expect(label).toHaveAttribute('for', searchfield.id);
});
Expand All @@ -220,7 +220,7 @@ describe('SearchWithin labeling', function () {

expect(group).not.toHaveAttribute('aria-labelledby');
expect(searchfield).toHaveAttribute('aria-labelledby', `${group.id} ${hiddenLabel.id} ${picker.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${picker.id} ${group.id} ${hiddenLabel.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${group.id} ${hiddenLabel.id}`);
});

it('aria-labelledby = {id}', function () {
Expand Down Expand Up @@ -251,6 +251,6 @@ describe('SearchWithin labeling', function () {
expect(group).toHaveAttribute('aria-labelledby', 'id-foo-label');
expect(searchfield).toHaveAttribute('aria-labelledby', `id-foo-label ${hiddenLabel.id} ${picker.id}`);
expect(searchfield).toHaveAttribute('id', 'id-searchfield');
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} ${picker.id} id-foo-label ${hiddenLabel.id}`);
expect(picker).toHaveAttribute('aria-labelledby', `${picker.childNodes[0].id} id-foo-label ${hiddenLabel.id}`);
});
});
4 changes: 2 additions & 2 deletions packages/@react-spectrum/tabs/test/Tabs.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ describe('Tabs', function () {

let picker = getByRole('button');
let pickerLabel = within(picker).getByText('Tab 1');
expect(picker).toHaveAttribute('aria-label', ', Test Tabs');
expect(picker).toHaveAttribute('aria-labelledby', `${pickerLabel.id} external label`);
expect(picker).toHaveAttribute('aria-label', 'Test Tabs');
expect(picker).toHaveAttribute('aria-labelledby', `${pickerLabel.id} ${picker.id} external label`);

triggerPress(picker);
act(() => jest.runAllTimers());
Expand Down
7 changes: 4 additions & 3 deletions packages/react-aria-components/test/Select.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let TestSelect = (props) => (

describe('Select', () => {
it('provides slots', () => {
let {getByRole, getByText} = render(<TestSelect />);
let {getByRole} = render(<TestSelect />);

let button = getByRole('button');
expect(button).toHaveTextContent('Select an item');
Expand All @@ -45,8 +45,9 @@ describe('Select', () => {
expect(select).toHaveAttribute('data-foo', 'bar');

expect(button).toHaveAttribute('aria-labelledby');
let label = getByText('Favorite Animal');
let label = document.getElementById(button.getAttribute('aria-labelledby').split(' ')[1]);
expect(label).toHaveAttribute('class', 'react-aria-Label');
expect(label).toHaveTextContent('Favorite Animal');

let valueOrPlaceholder = document.getElementById(button.getAttribute('aria-labelledby').split(' ')[0]);
expect(valueOrPlaceholder).toHaveAttribute('class', 'react-aria-SelectValue');
Expand Down Expand Up @@ -79,7 +80,7 @@ describe('Select', () => {

let button = getByRole('button');
expect(button.closest('.react-aria-Select')).toHaveAttribute('slot', 'test');
expect(button).toHaveAttribute('aria-label', ', test');
expect(button).toHaveAttribute('aria-label', 'test');
});

it('supports items with render props', () => {
Expand Down