Skip to content

Commit

Permalink
Merge pull request #887 from patrykkopycinski/tabs-docs
Browse files Browse the repository at this point in the history
[docs] Add missing Tabs tabItemContainerStyle prop docs
  • Loading branch information
Hai Nguyen committed Jun 19, 2015
2 parents 1781ace + d28f89e commit ae99e0a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions docs/src/app/components/pages/components/tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ class TabsPage extends React.Component {
header: 'optional',
desc: 'Override the inline-styles of the Tabs\' root element.'
},
{
name: 'tabItemContainerStyle',
type: 'object',
header: 'optional',
desc: 'Override the inline-styles of the tabs container.'
},
{
name: 'tabWidth',
type: 'number',
Expand Down
7 changes: 4 additions & 3 deletions src/tabs/tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ var Tabs = React.createClass({
propTypes: {
initialSelectedIndex: React.PropTypes.number,
onActive: React.PropTypes.func,
tabWidth: React.PropTypes.number
tabWidth: React.PropTypes.number,
tabItemContainerStyle: React.PropTypes.object
},

getInitialState: function(){
Expand Down Expand Up @@ -79,7 +80,7 @@ var Tabs = React.createClass({
render: function(){
var styles = this.getStyles();

var tabContent = []
var tabContent = [];
var width = this.state.fixedWidth ?
100 / this.props.children.length +'%' :
this.props.tabWidth + 'px';
Expand Down Expand Up @@ -145,4 +146,4 @@ var Tabs = React.createClass({

});

module.exports = Tabs;
module.exports = Tabs;

0 comments on commit ae99e0a

Please sign in to comment.