Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions lib/components/Tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = React.createClass({
selected: PropTypes.bool,
disabled: PropTypes.bool,
panelId: PropTypes.string,
activeTabClassName: PropTypes.string,
children: PropTypes.oneOfType([
PropTypes.array,
PropTypes.object,
Expand All @@ -49,16 +50,19 @@ module.exports = React.createClass({
},

render() {
const className = cx(
'ReactTabs__Tab',
this.props.className,
{
'ReactTabs__Tab--selected': this.props.selected,
'ReactTabs__Tab--disabled': this.props.disabled
},
this.props.activeTabClassName ? this.props.activeTabClassName : ''
);

return (
<li
className={cx(
'ReactTabs__Tab',
this.props.className,
{
'ReactTabs__Tab--selected': this.props.selected,
'ReactTabs__Tab--disabled': this.props.disabled
}
)}
className={className}
role="tab"
id={this.props.id}
aria-selected={this.props.selected ? 'true' : 'false'}
Expand Down
24 changes: 23 additions & 1 deletion lib/components/TabList.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ module.exports = React.createClass({

propTypes: {
className: PropTypes.string,
activeTabClassName: PropTypes.string,
children: PropTypes.oneOfType([
PropTypes.object,
PropTypes.array
])
},

render() {
const children = this._renderChildren();

return (
<ul
className={cx(
Expand All @@ -21,8 +24,27 @@ module.exports = React.createClass({
)}
role="tablist"
>
{this.props.children}
{children}
</ul>
);
},

_renderChildren() {
let children;
const activeTabClassName = this.props.activeTabClassName;

if (activeTabClassName) {
const childrenProps = {
activeTabClassName: activeTabClassName
};

children = React.Children.map(this.props.children, (child) => {
return React.cloneElement(child, childrenProps);
});
} else {
children = this.props.children;
}

return children;
}
});
13 changes: 13 additions & 0 deletions lib/components/__tests__/Tab-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,17 @@ describe('Tab', function() {

equal(node.className, 'ReactTabs__Tab ReactTabs__Tab--disabled');
});

it('should support being disabled', function() {
const tab = TestUtils.renderIntoDocument(<Tab disabled/>);
const node = findDOMNode(tab);

equal(node.className, 'ReactTabs__Tab ReactTabs__Tab--disabled');
});

it('should have custom className for selected tab', function() {
const tabList = TestUtils.renderIntoDocument(<Tab selected="true" activeTabClassName="active" />);
const node = findDOMNode(tabList);
equal(node.className, 'ReactTabs__Tab ReactTabs__Tab--selected active');
});
});