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

fix(tab): add aria-disabled depending on disabled prop #4698

Merged
merged 15 commits into from
Nov 18, 2019
Merged

fix(tab): add aria-disabled depending on disabled prop #4698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ea185bc
fix(tab): adds aria-disabled and test for new attribute
abbeyhrt Nov 15, 2019
85dbfcf
chore(tab): check in master
abbeyhrt Nov 15, 2019
049bc58
chore(tab): check in generated files
abbeyhrt Nov 15, 2019
9aa76d6
Update packages/react/src/components/Tab/Tab-test.js
abbeyhrt Nov 15, 2019
7efad35
Update packages/react/src/components/Tab/Tab-test.js
abbeyhrt Nov 15, 2019
7fc8d0c
chore(tab): revert changes
abbeyhrt Nov 15, 2019
702cd38
chore(tab): move aria-disabled to anchor tag and update test location
abbeyhrt Nov 15, 2019
ba06182
test(tab): update aria-disabled test
abbeyhrt Nov 15, 2019
3c34440
Merge branch 'master' into tabs-dap
abbeyhrt Nov 15, 2019
6516c85
chore: fix typo
abbeyhrt Nov 15, 2019
51c5f40
Merge branch 'tabs-dap' of https://github.com/abbeyhrt/my-carbon-fork…
abbeyhrt Nov 15, 2019
3b8091f
Merge branch 'master' into tabs-dap
abbeyhrt Nov 18, 2019
f40fb73
Merge branch 'master' of https://github.com/carbon-design-system/carb…
abbeyhrt Nov 18, 2019
0a37490
test(tabs): remove false check in test for aria-disabled
abbeyhrt Nov 18, 2019
79ca5e2
Merge branch 'tabs-dap' of https://github.com/abbeyhrt/my-carbon-fork…
abbeyhrt Nov 18, 2019
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: 10 additions & 0 deletions packages/react/src/components/Tab/Tab-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ describe('Tab', () => {
);
});

it('has aria-disabled that matches disabled', () => {
joshblack marked this conversation as resolved.
Show resolved Hide resolved
const getDisabledRegion = () => wrapper.find('[aria-disabled]');

expect(getDisabledRegion().length).toEqual(0);

wrapper.setProps({ disabled: true });
expect(getDisabledRegion().prop('aria-disabled')).toEqual(true);
});

it(`adds [className="${prefix}--tabs__nav-item--selected"] when selected prop is true`, () => {
wrapper.setProps({ selected: true });
expect(wrapper.hasClass(`${prefix}--tabs__nav-item--selected`)).toBe(
Expand Down Expand Up @@ -110,6 +119,7 @@ describe('Tab', () => {
});
});
});

describe('custom render label', () => {
const wrapper = mount(
<Tab
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Tab/Tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export default class Tab extends React.Component {
role: 'tab',
tabIndex: !disabled ? tabIndex : -1,
['aria-selected']: selected,
['aria-disabled']: disabled,
ref: e => {
this.tabAnchor = e;
},
Expand Down