Merge cec05f6 into 78fbd1a

react-component · Feb 15, 2017 · 261848f · 261848f
2 parents 78fbd1a + cec05f6
commit 261848f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Table.jsx b/src/Table.jsx
@@ -587,6 +587,12 @@ const Table = React.createClass({
   },
 
   syncFixedTableRowHeight() {
+    const tableRect = this.tableNode.getBoundingClientRect();
+    // If tableNode's height less than 0, suppose it is hidden and don't recalculate rowHeight.
+    // see: https://github.com/ant-design/ant-design/issues/4836
+    if (tableRect.height !== undefined && tableRect.height <= 0) {
+      return;
+    }
     const { prefixCls } = this.props;
     const headRows = this.refs.headTable ?
             this.refs.headTable.querySelectorAll('thead') :