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

[TreeItem] correct single-select aria-selected #20102

Merged
merged 3 commits into from
Mar 22, 2020
Merged

[TreeItem] correct single-select aria-selected #20102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb90f44
[TreeItem] correct single-select aria-selected
tonyhallett Mar 13, 2020
052613d
Merge remote-tracking branch 'upstream/master' into pr/tonyhallett/20102
eps1lon Mar 21, 2020
7a735fe
Ignore disableSelected
eps1lon Mar 21, 2020
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
10 changes: 9 additions & 1 deletion packages/material-ui-lab/src/TreeItem/TreeItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,14 @@ const TreeItem = React.forwardRef(function TreeItem(props, ref) {
}
}, [focused]);

let ariaSelected;
if (multiSelect) {
ariaSelected = selected;
} else if (selected) {
// single-selection trees unset aria-selected
ariaSelected = true;
}

return (
<li
className={clsx(classes.root, className, {
Expand All @@ -375,7 +383,7 @@ const TreeItem = React.forwardRef(function TreeItem(props, ref) {
onKeyDown={handleKeyDown}
onFocus={handleFocus}
aria-expanded={expandable ? expanded : null}
aria-selected={!selectionDisabled && isSelected ? isSelected(nodeId) : undefined}
aria-selected={ariaSelected}
ref={handleRef}
tabIndex={tabbable ? 0 : -1}
{...other}
Expand Down
71 changes: 47 additions & 24 deletions packages/material-ui-lab/src/TreeItem/TreeItem.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,34 +209,57 @@ describe('<TreeItem />', () => {
});

describe('aria-selected', () => {
it('should have the attribute `aria-selected=false` if not selected', () => {
const { getByTestId } = render(
<TreeView>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);
describe('single-select', () => {
it('should not have the attribute `aria-selected` if not selected', () => {
eps1lon marked this conversation as resolved.
Show resolved Hide resolved
const { getByTestId } = render(
<TreeView>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);

expect(getByTestId('test')).to.have.attribute('aria-selected', 'false');
});
expect(getByTestId('test')).to.not.have.attribute('aria-selected');
});

it('should have the attribute `aria-selected=true` if selected', () => {
const { getByTestId } = render(
<TreeView defaultSelected={'test'}>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);
it('should have the attribute `aria-selected=true` if selected', () => {
const { getByTestId } = render(
<TreeView defaultSelected={'test'}>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);

expect(getByTestId('test')).to.have.attribute('aria-selected', 'true');
expect(getByTestId('test')).to.have.attribute('aria-selected', 'true');
});
});

it('should not have the attribute `aria-selected` if disableSelection is true', () => {
const { getByTestId } = render(
<TreeView disableSelection>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);
describe('multi-select', () => {
it('should have the attribute `aria-selected=false` if not selected', () => {
const { getByTestId } = render(
<TreeView multiSelect>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);

expect(getByTestId('test')).to.have.attribute('aria-selected', 'false');
});
it('should have the attribute `aria-selected=true` if selected', () => {
const { getByTestId } = render(
<TreeView multiSelect defaultSelected={'test'}>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);

expect(getByTestId('test')).to.have.attribute('aria-selected', 'true');
});

it('should have the attribute `aria-selected` if disableSelection is true', () => {
const { getByTestId } = render(
<TreeView multiSelect disableSelection>
<TreeItem nodeId="test" label="test" data-testid="test" />
</TreeView>,
);

expect(getByTestId('test')).to.not.have.attribute('aria-selected');
expect(getByTestId('test')).to.have.attribute('aria-selected', 'false');
});
});
});

Expand Down Expand Up @@ -695,7 +718,7 @@ describe('<TreeItem />', () => {
);

getByTestId('one').focus();
expect(getByTestId('one')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('one')).to.not.have.attribute('aria-selected');
fireEvent.keyDown(document.activeElement, { key: ' ' });
expect(getByTestId('one')).to.have.attribute('aria-selected', 'true');
});
Expand All @@ -709,7 +732,7 @@ describe('<TreeItem />', () => {
</TreeView>,
);

expect(getByTestId('one')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('one')).to.not.have.attribute('aria-selected');
fireEvent.click(getByText('one'));
expect(getByTestId('one')).to.have.attribute('aria-selected', 'true');
});
Expand Down
8 changes: 4 additions & 4 deletions packages/material-ui-lab/src/TreeView/TreeView.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ describe('<TreeView />', () => {

const { getByTestId, getByText } = render(<MyComponent />);

expect(getByTestId('one')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('two')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('one')).to.not.have.attribute('aria-selected');
expect(getByTestId('two')).to.not.have.attribute('aria-selected');
fireEvent.click(getByText('one'));
expect(getByTestId('one')).to.have.attribute('aria-selected', 'true');
expect(getByTestId('two')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('two')).to.not.have.attribute('aria-selected');
fireEvent.click(getByText('two'));
expect(getByTestId('one')).to.have.attribute('aria-selected', 'false');
expect(getByTestId('one')).to.not.have.attribute('aria-selected');
expect(getByTestId('two')).to.have.attribute('aria-selected', 'true');
});

Expand Down