Skip to content

Commit dbb0385

Browse files
committed
[added] react-bootstrap#1320 allow NavItem class to be set
1 parent 6b7bf4e commit dbb0385

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/Tabs.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ const Tabs = React.createClass({
8888
React.PropTypes.number,
8989
React.PropTypes.object
9090
]),
91+
className: React.PropTypes.string,
9192
/**
9293
* Render without clearfix if horizontally positioned
9394
*/
@@ -271,7 +272,7 @@ const Tabs = React.createClass({
271272
return null;
272273
}
273274

274-
let { eventKey, title, disabled, onKeyDown, tabIndex = 0 } = child.props;
275+
let { eventKey, title, disabled, onKeyDown, tabClassName, tabIndex = 0 } = child.props;
275276
let isActive = this.getActiveKey() === eventKey;
276277

277278
return (
@@ -282,7 +283,8 @@ const Tabs = React.createClass({
282283
onKeyDown={createChainedFunction(this.handleKeyDown, onKeyDown)}
283284
eventKey={eventKey}
284285
tabIndex={isActive ? tabIndex : -1}
285-
disabled={disabled }>
286+
disabled={disabled }
287+
className={tabClassName}>
286288
{title}
287289
</NavItem>
288290
);

test/TabsSpec.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,15 @@ describe('Tabs', () => {
8484
let instance = ReactTestUtils.renderIntoDocument(
8585
<Tabs activeKey={1}>
8686
<Tab title="Tab 1" className="custom" id="pane0id" eventKey={1}>Tab 1 content</Tab>
87-
<Tab title="Tab 2" eventKey={2}>Tab 2 content</Tab>
87+
<Tab title="Tab 2" tabClassName="tcustom" eventKey={2}>Tab 2 content</Tab>
8888
</Tabs>
8989
);
9090

9191
let panes = ReactTestUtils.scryRenderedComponentsWithType(instance, Tab);
92+
let navs = ReactTestUtils.scryRenderedComponentsWithType(instance, NavItem);
9293

9394
assert.ok(React.findDOMNode(panes[0]).className.match(/\bcustom\b/));
95+
assert.ok(React.findDOMNode(navs[1]).className.match(/\btcustom\b/));
9496
assert.equal(React.findDOMNode(panes[0]).id, 'pane0id');
9597
});
9698

0 commit comments

Comments
 (0)