fix #414

AllenFang · Apr 25, 2016 · e60e607 · e60e607
1 parent 6650629
commit e60e607
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -226,13 +226,14 @@ class BootstrapTable extends Component {
     let sortIndicator = this.props.options.sortIndicator;
     if (typeof this.props.options.sortIndicator === 'undefined') sortIndicator = true;
     return (
-      <div className='react-bs-table-container'>
+      <div className='react-bs-table-container' style={ this.props.containerStyle }>
         { toolBar }
-        <div className='react-bs-table' ref='table' style={ style }
+        <div className='react-bs-table' ref='table' style={ { ...style, ...this.props.tableStyle } }
             onMouseEnter={ this.handleMouseEnter }
             onMouseLeave={ this.handleMouseLeave }>
           <TableHeader
             ref='header'
+            style={ this.props.headerStyle }
             rowSelectType={ this.props.selectRow.mode }
             hideSelectColumn={ this.props.selectRow.hideSelectColumn }
             sortName={ sortInfo ? sortInfo.sortField : undefined }
@@ -247,7 +248,7 @@ class BootstrapTable extends Component {
             { this.props.children }
           </TableHeader>
           <TableBody ref='body'
-            style={ style }
+            style={ { ...style, ...this.props.bodyStyle } }
             data={ this.state.data }
             columns={ columns }
             trClassName={ this.props.trClassName }
@@ -793,6 +794,10 @@ BootstrapTable.propTypes = {
   search: PropTypes.bool,
   columnFilter: PropTypes.bool,
   trClassName: PropTypes.any,
+  tableStyle: PropTypes.object,
+  containerStyle: PropTypes.object,
+  headerStyle: PropTypes.object,
+  bodyStyle: PropTypes.object,
   options: PropTypes.shape({
     clearSearch: PropTypes.bool,
     sortName: PropTypes.string,
@@ -862,6 +867,10 @@ BootstrapTable.defaultProps = {
   multiColumnSearch: false,
   columnFilter: false,
   trClassName: '',
+  tableStyle: undefined,
+  containerStyle: undefined,
+  headerStyle: undefined,
+  bodyStyle: undefined,
   options: {
     clearSearch: false,
     sortName: undefined,

diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -33,7 +33,7 @@ class TableHeader extends Component {
     this._attachClearSortCaretFunc();
 
     return (
-      <div ref='container' className={ containerClasses }>
+      <div ref='container' className={ containerClasses } style={ this.props.style }>
         <table className={ tableClasses }>
           <thead>
             <tr ref='header'>
@@ -82,6 +82,7 @@ class TableHeader extends Component {
   }
 }
 TableHeader.propTypes = {
+  style: PropTypes.object,
   rowSelectType: PropTypes.string,
   onSort: PropTypes.func,
   onSelectAllRow: PropTypes.func,