fix #192

AllenFang · Dec 27, 2015 · 159b8f3 · 159b8f3
1 parent fe2ec20
commit 159b8f3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/css/react-bootstrap-table-all.css b/css/react-bootstrap-table-all.css
@@ -7,7 +7,7 @@
 }
 
 .react-bs-container .table-header{
-  height: 37.5px;
+  height: 42px;
   border: hidden;
   overflow: hidden;
   border-bottom: 1px solid #dddddd;

diff --git a/css/react-bootstrap-table.css b/css/react-bootstrap-table.css
@@ -6,7 +6,7 @@
 }
 
 .react-bs-container .table-header{
-  height: 37.5px;
+  height: 42px;
   border: hidden;
   overflow: hidden;
   border-bottom: 1px solid #dddddd;

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -21,11 +21,11 @@ class TableBody extends React.Component{
   }
 
   componentDidMount(){
-    this.hardFixHeaderWidth();
+    this.adjustBody();
   }
 
   componentDidUpdate(){
-    this.hardFixHeaderWidth();
+    this.adjustBody();
   }
 
   render(){
@@ -133,7 +133,7 @@ class TableBody extends React.Component{
 
     return(
       <div ref="container" className={containerClasses} style={{height: height}}>
-        <table className={tableClasses}>
+        <table ref="body" className={tableClasses}>
           {tableHeader}
           <tbody>
             {tableRows}
@@ -256,6 +256,13 @@ class TableBody extends React.Component{
     return headerDomProps;
   }
 
+  adjustBody() {
+    this.hardFixHeaderWidth();
+    if(this.props.condensed) {
+      this.refs.body.style.marginTop = "-36px";
+    }
+  }
+
   hardFixHeaderWidth(){
     var headers = this.refs.header.childNodes[0].childNodes;
     for(let i=0;i<headers.length;i++){

diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -112,6 +112,9 @@ class TableHeader extends React.Component{
       this.props.children =
         React.cloneElement(this.props.children, {width: headerProps[0].width+"px"});
     }
+    if(this.props.condensed) {
+      this.refs.container.style.height = "36px";
+    }
     this.forceUpdate();
     if(isVerticalScrollBar)
       this.refs.container.style.marginRight = Util.getScrollBarWidth() + "px";