Skip to content

Commit 9152e92

Browse files
committed
Group by environment name so that we can assign the color
1 parent 6ef4ceb commit 9152e92

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

packages/react-devtools-shared/src/devtools/views/Components/InspectedElementSuspendedBy.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ type GroupProps = {
348348
inspectedElement: InspectedElement,
349349
store: Store,
350350
name: string,
351+
environment: null | string,
351352
suspendedBy: Array<{
352353
index: number,
353354
value: SerializedAsyncInfo,
@@ -362,6 +363,7 @@ function SuspendedByGroup({
362363
inspectedElement,
363364
store,
364365
name,
366+
environment,
365367
suspendedBy,
366368
minTime,
367369
maxTime,
@@ -416,7 +418,9 @@ function SuspendedByGroup({
416418
{isOpen ? null : (
417419
<div
418420
className={
419-
styles.TimeBarContainer + ' ' + getClassNameForEnvironment(null)
421+
styles.TimeBarContainer +
422+
' ' +
423+
getClassNameForEnvironment(environment)
420424
}>
421425
<div
422426
className={
@@ -512,17 +516,21 @@ export default function InspectedElementSuspendedBy({
512516
const groups = [];
513517
let currentGroup = null;
514518
let currentGroupName = null;
519+
let currentGroupEnv = null;
515520
for (let i = 0; i < sortedSuspendedBy.length; i++) {
516521
const entry = sortedSuspendedBy[i];
517522
const name = entry.value.awaited.name;
523+
const env = entry.value.awaited.env;
518524
if (
519525
currentGroupName !== name ||
526+
currentGroupEnv !== env ||
520527
!name ||
521528
name === 'Promise' ||
522529
currentGroup === null
523530
) {
524531
// Create a new group.
525532
currentGroupName = name;
533+
currentGroupEnv = env;
526534
currentGroup = [];
527535
groups.push(currentGroup);
528536
}
@@ -601,6 +609,7 @@ export default function InspectedElementSuspendedBy({
601609
<SuspendedByGroup
602610
key={entries[0].index}
603611
name={entries[0].value.awaited.name}
612+
environment={entries[0].value.awaited.env}
604613
suspendedBy={entries}
605614
bridge={bridge}
606615
element={element}

0 commit comments

Comments
 (0)