Fix a regression related to isReactComponent prototype check (faceboo…

…k#13608)
jetoneza · Jan 23, 2019 · 3bbaf1f · 3bbaf1f
1 parent 738fb5f
commit 3bbaf1f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -1762,4 +1762,18 @@ describe('ReactCompositeComponent', () => {
       {withoutStack: true},
     );
   });
+
+  // Regression test for accidental breaking change
+  // https://github.com/facebook/react/issues/13580
+  it('should support classes shadowing isReactComponent', () => {
+    class Shadow extends React.Component {
+      isReactComponent() {}
+      render() {
+        return <div />;
+      }
+    }
+    const container = document.createElement('div');
+    ReactDOM.render(<Shadow />, container);
+    expect(container.firstChild.tagName).toBe('DIV');
+  });
 });
diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js
@@ -284,12 +284,7 @@ const createFiber = function(
 
 function shouldConstruct(Component: Function) {
   const prototype = Component.prototype;
-  return (
-    typeof prototype === 'object' &&
-    prototype !== null &&
-    typeof prototype.isReactComponent === 'object' &&
-    prototype.isReactComponent !== null
-  );
+  return !!(prototype && prototype.isReactComponent);
 }
 
 export function resolveLazyComponentTag(