Fix findByType broken for SimpleMemoComponent

facebook · Dec 24, 2019 · 151c2c2 · 151c2c2
1 parent f887d1a
commit 151c2c2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js
@@ -321,8 +321,7 @@ describe('ReactHooksInspectionIntegration', () => {
     }
     let Foo = React.memo(InnerFoo);
     let renderer = ReactTestRenderer.create(<Foo />);
-    // TODO: Test renderer findByType is broken for memo. Have to search for the inner.
-    let childFiber = renderer.root.findByType(InnerFoo)._currentFiber();
+    let childFiber = renderer.root.findByType(Foo)._currentFiber();
     let tree = ReactDebugTools.inspectHooksOfFiber(childFiber);
     expect(tree).toEqual([
       {

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -304,6 +304,10 @@ class ReactTestInstance {
   }
 
   get type() {
+    if (this._fiber.tag === SimpleMemoComponent) {
+      return this._fiber.elementType;
+    }
+
     return this._fiber.type;
   }
 

diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js b/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.internal.js
@@ -1022,4 +1022,30 @@ describe('ReactTestRenderer', () => {
     expect(Scheduler).toFlushWithoutYielding();
     ReactTestRenderer.create(<App />);
   });
+
+  it('supports SimpleMemoComponent with findByType', () => {
+    const App = () => null;
+    const SimpleMemoApp = React.memo(App);
+
+    const renderer = ReactTestRenderer.create(<SimpleMemoApp />);
+
+    const child = renderer.root.findByType(SimpleMemoApp);
+
+    expect(child.type).toBe(SimpleMemoApp);
+  });
+
+  it('supports MemoComponent with findByType', () => {
+    class App extends React.Component {
+      render() {
+        return null;
+      }
+    }
+    const MemoApp = React.memo(App);
+
+    const renderer = ReactTestRenderer.create(<MemoApp />);
+
+    const child = renderer.root.findByType(MemoApp);
+
+    expect(child.type).toBe(MemoApp);
+  });
 });