From fc0719567bfd0348a6ef46c7656dae37b08c73dd Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 3 Aug 2021 11:21:42 -0400
Subject: [PATCH] Fixed goofy short-circuit bug

---
 .../src/content-views/ComponentMeasuresView.js             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/react-devtools-scheduling-profiler/src/content-views/ComponentMeasuresView.js b/packages/react-devtools-scheduling-profiler/src/content-views/ComponentMeasuresView.js
index 73165d9a38801..4d9ecfa5d17ee 100644
--- a/packages/react-devtools-scheduling-profiler/src/content-views/ComponentMeasuresView.js
+++ b/packages/react-devtools-scheduling-profiler/src/content-views/ComponentMeasuresView.js
@@ -71,12 +71,12 @@ export class ComponentMeasuresView extends View {
   _drawSingleReactComponentMeasure(
     context: CanvasRenderingContext2D,
     rect: Rect,
-    event: ReactComponentMeasure,
+    componentMeasure: ReactComponentMeasure,
     scaleFactor: number,
     showHoverHighlight: boolean,
   ): boolean {
     const {frame} = this;
-    const {componentName, duration, timestamp, warning} = event;
+    const {componentName, duration, timestamp, warning} = componentMeasure;
 
     const xStart = timestampToPosition(timestamp, scaleFactor, frame);
     const xStop = timestampToPosition(timestamp + duration, scaleFactor, frame);
@@ -146,14 +146,13 @@ export class ComponentMeasuresView extends View {
     let didDrawMeasure = false;
     componentMeasures.forEach(componentMeasure => {
       didDrawMeasure =
-        didDrawMeasure ||
         this._drawSingleReactComponentMeasure(
           context,
           visibleArea,
           componentMeasure,
           scaleFactor,
           componentMeasure === _hoveredComponentMeasure,
-        );
+        ) || didDrawMeasure;
     });
 
     if (!didDrawMeasure) {