Fix getFiberName not considering displayName

facebook · Aug 29, 2019 · 2c6088e · 2c6088e
1 parent ada00bf
commit 2c6088e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js
@@ -121,8 +121,7 @@ const getFiberLabel = (
 
 const getFiberName = (fiber: Fiber): string | null => {
   if (fiber.tag === SimpleMemoComponent) {
-    const innerName = getComponentName(fiber.type);
-    return `Memo${innerName !== null ? `(${innerName})` : ''}`;
+    return getComponentName(fiber.elementType);
   }
 
   return getComponentName(fiber.type);

diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.internal.js
@@ -573,9 +573,14 @@ describe('ReactDebugFiberPerf', () => {
     const MemoFoo = React.memo(function Foo() {
       return <div />;
     });
+    const MemoBar = React.memo(function Bar() {
+      return <span />;
+    });
+    MemoBar.displayName = 'NamedBar';
     ReactNoop.render(
       <Parent>
         <MemoFoo />
+        <MemoBar />
       </Parent>,
     );
     expect(Scheduler).toFlushWithoutYielding();

diff --git a/...s/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap b/...s/react-reconciler/src/__tests__/__snapshots__/ReactIncrementalPerf-test.internal.js.snap
@@ -380,6 +380,7 @@ exports[`ReactDebugFiberPerf supports memo 1`] = `
 "⚛ (React Tree Reconciliation: Completed Root)
   ⚛ Parent [mount]
     ⚛ Memo(Foo) [mount]
+    ⚛ NamedBar [mount]
 
 ⚛ (Committing Changes)
   ⚛ (Committing Snapshot Effects: 0 Total)