fixed #216: findDOMNode might fail with react-test-renderer

mobxjs · Mar 10, 2017 · e2942f2 · e2942f2
1 parent 8310cd1
commit e2942f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # MobX-React Changelog
 
+### 4.1.3
+
+* Fixed `ReactDOM.findDOMNode` exception when using react-test-runner, #216
+
 ### 4.1.2
 
 * Exceptions caught during render are now rethrown with proper stack, fixes #206

diff --git a/src/observer.js b/src/observer.js
@@ -18,8 +18,16 @@ export const componentByNodeRegistery = typeof WeakMap !== "undefined" ? new Wea
 export const renderReporter = new EventEmitter();
 
 function findDOMNode(component) {
-  if (ReactDOM)
-    return ReactDOM.findDOMNode(component);
+  if (ReactDOM) {
+    try {
+      return ReactDOM.findDOMNode(component);
+    } catch (e) {
+      // findDOMNode will throw in react-test-renderer, see:
+      // See https://github.com/mobxjs/mobx-react/issues/216
+      // Is there a better heuristic?
+      return null;
+    }
+  }
   return null;
 }