Merge pull request alibaba-fusion#1553 from youluna/enhance-robotness

chore(*): add try catch to enhance robotness
cherry037 · Feb 5, 2020 · a8a95e2 · a8a95e2
2 parents 20d2212 + d28fd47
commit a8a95e2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/src/overlay/gateway.jsx b/src/overlay/gateway.jsx
@@ -32,7 +32,11 @@ export default class Gateway extends Component {
     }
 
     getChildNode() {
-        return findDOMNode(this.child);
+        try {
+            return findDOMNode(this.child);
+        } catch (err) {
+            return null;
+        }
     }
 
     saveChildRef = ref => {

diff --git a/src/overlay/overlay.jsx b/src/overlay/overlay.jsx
@@ -583,7 +583,11 @@ export default class Overlay extends Component {
     }
 
     getContentNode() {
-        return findDOMNode(this.contentRef);
+        try {
+            return findDOMNode(this.contentRef);
+        } catch (err) {
+            return null;
+        }
     }
 
     getWrapperNode() {

diff --git a/src/overlay/position.jsx b/src/overlay/position.jsx
@@ -120,7 +120,11 @@ export default class Position extends Component {
     }
 
     getContentNode() {
-        return findDOMNode(this);
+        try {
+            return findDOMNode(this);
+        } catch (err) {
+            return null;
+        }
     }
 
     getTargetNode() {

diff --git a/src/overlay/utils/find-node.js b/src/overlay/utils/find-node.js
@@ -10,7 +10,11 @@ export default function findNode(target, param) {
     }
 
     if (typeof target === 'function') {
-        target = target(param);
+        try {
+            target = target(param);
+        } catch (err) {
+            target = null;
+        }
     }
 
     if (!target) {

diff --git a/src/table/lock.jsx b/src/table/lock.jsx
@@ -380,8 +380,15 @@ export default function lock(BaseComponent) {
                         }
                     );
 
-                const node = findDOMNode(this);
-                const width = node.clientWidth;
+                let node, width;
+
+                try {
+                    node = findDOMNode(this);
+                    width = node.clientWidth;
+                } catch (err) {
+                    node = null;
+                    width = 0;
+                }
 
                 // if the table doesn't exist, there is no need to adjust
                 if (width === 0) {