fix(*): resolve facebook/react#14188 for compat ablout findDOMNode

dengyongqing · Feb 4, 2020 · 8a69d9c · 8a69d9c
1 parent b14cbcd
commit 8a69d9c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/src/overlay/gateway.jsx b/src/overlay/gateway.jsx
@@ -23,7 +23,7 @@ export default class Gateway extends Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        this.containerNode = this.getContainerNode(nextProps);
+        this.containerNode = nextProps ? this.getContainerNode(nextProps) : null;
     }
 
     getContainerNode(props) {
@@ -32,7 +32,7 @@ export default class Gateway extends Component {
     }
 
     getChildNode() {
-        return findDOMNode(this.child);
+        return this.child ? findDOMNode(this.child) : null;
     }
 
     saveChildRef = ref => {

diff --git a/src/overlay/overlay.jsx b/src/overlay/overlay.jsx
@@ -583,6 +583,9 @@ export default class Overlay extends Component {
     }
 
     getContentNode() {
+        if (!this.contentRef) {
+            return null;
+        }
         return findDOMNode(this.contentRef);
     }
 

diff --git a/src/overlay/position.jsx b/src/overlay/position.jsx
@@ -120,13 +120,18 @@ export default class Position extends Component {
     }
 
     getContentNode() {
+        if (!this) {
+            return null;
+        }
         return findDOMNode(this);
     }
 
     getTargetNode() {
         const { target } = this.props;
-
-        return target === position.VIEWPORT
+        if (!target) {
+            return null;
+        }
+        return (target === position.VIEWPORT)
             ? position.VIEWPORT
             : findNode(target, this.props);
     }

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

diff --git a/src/table/lock.jsx b/src/table/lock.jsx
@@ -380,8 +380,16 @@ export default function lock(BaseComponent) {
                         }
                     );
 
-                const node = findDOMNode(this);
-                const width = node.clientWidth;
+                let width = 0;
+                // 捕获findDOMNode异常情况
+                try {
+                    const node = findDOMNode(this);
+                    width = node.clientWidth;
+                } catch (e) {
+                    console.error(error);
+                    width = 0;
+                    throw e;
+                }
 
                 // if the table doesn't exist, there is no need to adjust
                 if (width === 0) {