barStyle

react-component · Aug 22, 2016 · e75c8e8 · e75c8e8
1 parent 40a48a8
commit e75c8e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Nav.jsx b/src/Nav.jsx
@@ -21,6 +21,7 @@ const Nav = React.createClass({
     onKeyDown: PropTypes.func,
     style: PropTypes.object,
     inkBarStyle: PropTypes.object,
+    barStyle: PropTypes.object,
   },
 
   mixins: [InkBarMixin],
@@ -248,7 +249,7 @@ const Nav = React.createClass({
   render() {
     const props = this.props;
     const state = this.state;
-    const { prefixCls, tabBarExtraContent, inkBarStyle, style } = props;
+    const { prefixCls, tabBarExtraContent, inkBarStyle, barStyle } = props;
     const tabs = this.getTabs();
 
     let inkBarNode;
@@ -335,7 +336,7 @@ const Nav = React.createClass({
         tabIndex="0"
         ref="root"
         onKeyDown={props.onKeyDown}
-        style={style}
+        style={barStyle}
       >
         {contents}
       </div>);

diff --git a/src/Tabs.jsx b/src/Tabs.jsx
@@ -33,6 +33,7 @@ const Tabs = React.createClass({
     tabPosition: PropTypes.string,
     navStyle: PropTypes.object,
     inkBarStyle: PropTypes.object,
+    barStyle: PropTypes.object,
   },
 
   getDefaultProps() {
@@ -48,6 +49,7 @@ const Tabs = React.createClass({
       contentStyle: {},
       navStyle: {},
       inkBarStyle: {},
+      barStyle: {},
       onTabClick: noop,
     };
   },
@@ -247,6 +249,7 @@ const Tabs = React.createClass({
         tabPosition={tabPosition}
         style={props.navStyle}
         inkBarStyle={props.inkBarStyle}
+        barStyle={props.barStyle}
         onTabClick={this.onTabClick}
         tabMovingDirection={tabMovingDirection}
         panels={props.children}