fix(Table): can't find unmounted component

alibaba-fusion · Dec 19, 2018 · f004b52 · f004b52
1 parent 73ffca3
commit f004b52
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/src/table/lock.jsx b/src/table/lock.jsx
@@ -426,7 +426,14 @@ export default function lock(BaseComponent) {
 
         getWrapperNode(type) {
             type = type ? type.charAt(0).toUpperCase() + type.substr(1) : '';
-            return findDOMNode(this.refs[`lock${type}`]);
+            try {
+                // in case of finding an unmounted component due to cached data
+                // need to clear refs of table when dataSource Changed
+                // use try catch for temporary
+                return findDOMNode(this.refs[`lock${type}`]);
+            } catch (error) {
+                return null;
+            }
         }
 
         getFirstNormalCellNode(index) {
@@ -443,19 +450,43 @@ export default function lock(BaseComponent) {
         getRowNode(index, type) {
             type = type ? type.charAt(0).toUpperCase() + type.substr(1) : '';
             const table = this[`table${type}Inc`];
-            return findDOMNode(table.getRowRef(index));
+
+            try {
+                // in case of finding an unmounted component due to cached data
+                // need to clear refs of table when dataSource Changed
+                // use try catch for temporary
+                return findDOMNode(table.getRowRef(index));
+            } catch (error) {
+                return null;
+            }
         }
 
         getHeaderCellNode(index, i, type) {
             type = type ? type.charAt(0).toUpperCase() + type.substr(1) : '';
             const table = this[`table${type}Inc`];
-            return findDOMNode(table.getHeaderCellRef(index, i));
+
+            try {
+                // in case of finding an unmounted component due to cached data
+                // need to clear refs of table when dataSource Changed
+                // use try catch for temporary
+                return findDOMNode(table.getHeaderCellRef(index, i));
+            } catch (error) {
+                return null;
+            }
         }
 
         getCellNode(index, i, type) {
             type = type ? type.charAt(0).toUpperCase() + type.substr(1) : '';
             const table = this[`table${type}Inc`];
-            return findDOMNode(table.getCellRef(index, i));
+
+            try {
+                // in case of finding an unmounted component due to cached data
+                // need to clear refs of table when dataSource Changed
+                // use try catch for temporary
+                return findDOMNode(table.getCellRef(index, i));
+            } catch (error) {
+                return null;
+            }
         }
 
         render() {

diff --git a/src/table/virtual.jsx b/src/table/virtual.jsx
@@ -103,7 +103,7 @@ export default function virtual(BaseComponent) {
             if (this.state.rowHeight && 'rowHeight' in nextProps) {
                 const row = this.getRowNode();
                 const rowClientHeight = row && row.clientHeight;
-                if (rowClientHeight !== this.state.rowHeight) {
+                if (rowClientHeight && rowClientHeight !== this.state.rowHeight) {
                     this.setState({
                         rowHeight: rowClientHeight
                     });
@@ -240,7 +240,14 @@ export default function virtual(BaseComponent) {
         }
 
         getRowNode() {
-            return findDOMNode(this.tableInc.getRowRef(0));
+            try {
+                // in case of finding an unmounted component due to cached data
+                // need to clear refs of this.tableInc when dataSource Changed
+                // use try catch for temporary
+                return findDOMNode(this.tableInc.getRowRef(0));
+            } catch (error) {
+                return null;
+            }
         }
 
         render() {