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(Tabs): add ARIA attributes #4970

Merged
merged 8 commits into from
Jan 16, 2020
Merged

fix(Tabs): add ARIA attributes #4970

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26fcb3b
fix(Tabs): add ARIA attributes
asudoh Jan 8, 2020
faa0a6e
fix(Tabs): use anchor instead of li to add attributes
asudoh Jan 15, 2020
cb4cfe3
Merge branch 'master' into tab-aria
asudoh Jan 15, 2020
e409f9d
Update packages/react/src/components/Tabs/Tabs.js
asudoh Jan 15, 2020
c313ba7
fix(Tabs): fix new DAP errors
asudoh Jan 16, 2020
b6645b8
Merge branch 'master' into tab-aria
joshblack Jan 16, 2020
24284a1
Merge branch 'master' into tab-aria
asudoh Jan 16, 2020
7d0fbf7
Merge branch 'master' into tab-aria
asudoh Jan 16, 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
8 changes: 8 additions & 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 @@ -15,6 +15,11 @@ const { prefix } = settings;

export default class Tab extends React.Component {
static propTypes = {
/**
* The element ID for the top-level element.
*/
id: PropTypes.string,

/**
* Specify an optional className to be added to your Tab
*/
Expand Down Expand Up @@ -104,6 +109,7 @@ export default class Tab extends React.Component {

render() {
const {
id,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we auto-generate this id if they don't supply one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed that auto-generation is desirable, but couldn't see a way for <TabContent> generation code to get such auto-generated ID.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely understand, this is where some of our context experiments have taken us to help coordinate registering these ids.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right that we need some improvements in this area, I expect other approaches like render-props take into account for that.

className,
handleTabClick,
handleTabKeyDown,
Expand All @@ -126,12 +132,14 @@ export default class Tab extends React.Component {
});

const anchorProps = {
id,
className: `${prefix}--tabs__nav-link`,
href,
role: 'tab',
tabIndex: !disabled ? tabIndex : -1,
['aria-selected']: selected,
['aria-disabled']: disabled,
['aria-controls']: id && `${id}__panel`,
ref: e => {
this.tabAnchor = e;
},
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/TabContent/TabContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const TabContent = props => {
});
return (
<div
role="tabpanel"
joshblack marked this conversation as resolved.
Show resolved Hide resolved
{...other}
className={tabContentClasses}
selected={selected}
Expand Down
26 changes: 18 additions & 8 deletions packages/react/src/components/Tabs/Tabs-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ const TabContentRenderedOnlyWhenSelected = ({
className,
...other
}) =>
!selected ? null : (
!selected ? (
<div {...other} ciassName="bx--visually-hidden" />
) : (
<div
{...other}
className={classNames(className, `${prefix}--tab-content`)}
Expand All @@ -72,22 +74,26 @@ storiesOf('Tabs', module)
'Default',
() => (
<Tabs {...props.tabs()}>
<Tab {...props.tab()} label="Tab label 1">
<Tab id="tab-1" {...props.tab()} label="Tab label 1">
<div className="some-content">Content for first tab goes here.</div>
</Tab>
<Tab {...props.tab()} label="Tab label 2">
<Tab id="tab-2" {...props.tab()} label="Tab label 2">
<div className="some-content">Content for second tab goes here.</div>
</Tab>
<Tab {...props.tab()} label="Tab label 3" disabled>
<Tab id="tab-3" {...props.tab()} label="Tab label 3" disabled>
<div className="some-content">Content for third tab goes here.</div>
</Tab>
<Tab
id="tab-4"
{...props.tab()}
label="Tab label 4"
renderContent={TabContentRenderedOnlyWhenSelected}>
<div className="some-content">Content for fourth tab goes here.</div>
</Tab>
<Tab {...props.tab()} label={<CustomLabel text="Custom Label" />}>
<Tab
id="tab-5"
{...props.tab()}
label={<CustomLabel text="Custom Label" />}>
<div className="some-content">Content for fifth tab goes here.</div>
</Tab>
</Tabs>
Expand All @@ -105,19 +111,23 @@ storiesOf('Tabs', module)
'Container',
() => (
<Tabs type="container" {...props.tabs()}>
<Tab {...props.tab()} label="Tab label 1">
<Tab id="tab-1" {...props.tab()} label="Tab label 1">
<div className="some-content">Content for first tab goes here.</div>
</Tab>
<Tab {...props.tab()} label="Tab label 2">
<Tab id="tab-2" {...props.tab()} label="Tab label 2">
<div className="some-content">Content for second tab goes here.</div>
</Tab>
<Tab
id="tab-3"
{...props.tab()}
label="Tab label 3"
renderContent={TabContentRenderedOnlyWhenSelected}>
<div className="some-content">Content for third tab goes here.</div>
</Tab>
<Tab {...props.tab()} label={<CustomLabel text="Custom Label" />}>
<Tab
id="tab-4"
{...props.tab()}
label={<CustomLabel text="Custom Label" />}>
<div className="some-content">Content for fourth tab goes here.</div>
</Tab>
</Tabs>
Expand Down
11 changes: 9 additions & 2 deletions packages/react/src/components/Tabs/Tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,21 @@ export default class Tabs extends React.Component {
});

const tabContentWithProps = React.Children.map(tabsWithProps, tab => {
const { children, selected, renderContent: TabContent } = tab.props;
const {
id: tabId,
children,
selected,
renderContent: TabContent,
} = tab.props;

return (
<TabContent
id={tabId && `${tabId}__panel`}
className={tabContentClassName}
aria-hidden={!selected}
hidden={!selected}
selected={selected}>
selected={selected}
aria-labelledby={tabId}>
{children}
</TabContent>
);
Expand Down