chrome-devtools-frontend 1.0.1380117 → 1.0.1386602

package/front_end/panels/timeline/components/insights/InteractionToNextPaint.ts

@@ -11,8 +11,7 @@ import * as Trace from '../../../../models/trace/trace.js';
 import * as LitHtml from '../../../../ui/lit-html/lit-html.js';
 import type * as Overlays from '../../overlays/overlays.js';
 
-import {BaseInsightComponent, shouldRenderForCategory} from './Helpers.js';
-import {Category} from './types.js';
+import {BaseInsightComponent} from './BaseInsightComponent.js';
 
 const {html} = LitHtml;
 
@@ -46,7 +45,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export class InteractionToNextPaint extends BaseInsightComponent<INPInsightModel> {
   static override readonly litTagName = LitHtml.literal`devtools-performance-inp`;
-  override insightCategory: Category = Category.INP;
   override internalName: string = 'inp';
 
   override createOverlays(): Overlays.Overlays.TimelineOverlay[] {
@@ -96,64 +94,43 @@ export class InteractionToNextPaint extends BaseInsightComponent<INPInsightModel
     ];
   }
 
-  #render(event: Trace.Types.Events.SyntheticInteractionPair): LitHtml.LitTemplate {
-    if (!this.model) {
-      return LitHtml.nothing;
-    }
-
+  #renderContent(event: Trace.Types.Events.SyntheticInteractionPair): LitHtml.LitTemplate {
     const time = (us: Trace.Types.Timing.MicroSeconds): string =>
         i18n.TimeUtilities.millisToString(Platform.Timing.microSecondsToMilliSeconds(us));
 
     // clang-format off
     return html`
-        <div class="insights">
-            <devtools-performance-sidebar-insight .data=${{
-            title: this.model.title,
-            description: this.model.description,
-            internalName: this.internalName,
-            expanded: this.isActive(),
-            }}
-            @insighttoggleclick=${this.onSidebarClick}>
-                <div slot="insight-content" class="insight-section">
-                  ${html`<devtools-performance-table
-                    .data=${{
-                      insight: this,
-                      headers: [i18nString(UIStrings.phase), i18nString(UIStrings.duration)],
-                      rows: [
-                        {
-                          values: [i18nString(UIStrings.inputDelay), time(event.inputDelay)],
-                          overlays: this.#createOverlaysForPhase(event, 0),
-                        },
-                        {
-                          values: [i18nString(UIStrings.processingDuration), time(event.mainThreadHandling)],
-                          overlays: this.#createOverlaysForPhase(event, 1),
-                        },
-                        {
-                          values: [i18nString(UIStrings.presentationDelay), time(event.presentationDelay)],
-                          overlays: this.#createOverlaysForPhase(event, 2),
-                        },
-                      ],
-                    }}>
-                  </devtools-performance-table>`}
-                </div>
-            </devtools-performance-sidebar-insight>
-        </div>`;
-            // clang-format on
-  }
-
-  override getRelatedEvents(): Trace.Types.Events.Event[] {
-    return this.model?.relatedEvents ?? [];
+      <div class="insight-section">
+        ${html`<devtools-performance-table
+          .data=${{
+            insight: this,
+            headers: [i18nString(UIStrings.phase), i18nString(UIStrings.duration)],
+            rows: [
+              {
+                values: [i18nString(UIStrings.inputDelay), time(event.inputDelay)],
+                overlays: this.#createOverlaysForPhase(event, 0),
+              },
+              {
+                values: [i18nString(UIStrings.processingDuration), time(event.mainThreadHandling)],
+                overlays: this.#createOverlaysForPhase(event, 1),
+              },
+              {
+                values: [i18nString(UIStrings.presentationDelay), time(event.presentationDelay)],
+                overlays: this.#createOverlaysForPhase(event, 2),
+              },
+            ],
+          }}>
+        </devtools-performance-table>`}
+      </div>`;
+    // clang-format on
   }
 
   override render(): void {
-    const event = this.model?.longestInteractionEvent;
-
-    const matchesCategory = shouldRenderForCategory({
-      activeCategory: this.data.activeCategory,
-      insightCategory: this.insightCategory,
-    });
-    const output = event && matchesCategory ? this.#render(event) : LitHtml.nothing;
-    LitHtml.render(output, this.shadow, {host: this});
+    if (!this.model?.longestInteractionEvent) {
+      return;
+    }
+
+    this.renderWithContent(this.#renderContent(this.model.longestInteractionEvent));
   }
 }
 

package/front_end/panels/timeline/components/insights/LCPDiscovery.ts

@@ -10,10 +10,8 @@ import * as Trace from '../../../../models/trace/trace.js';
 import * as LitHtml from '../../../../ui/lit-html/lit-html.js';
 import type * as Overlays from '../../overlays/overlays.js';
 
-import {eventRef} from './EventRef.js';
-import {BaseInsightComponent, shouldRenderForCategory} from './Helpers.js';
-import type * as SidebarInsight from './SidebarInsight.js';
-import {Category} from './types.js';
+import {BaseInsightComponent} from './BaseInsightComponent.js';
+import {imageRef} from './EventRef.js';
 
 const {html} = LitHtml;
 
@@ -59,11 +57,7 @@ interface LCPImageDiscoveryData {
   estimatedSavings: Trace.Types.Timing.MilliSeconds|null;
 }
 
-function getImageData(model: LCPDiscoveryInsightModel|null): LCPImageDiscoveryData|null {
-  if (!model) {
-    return null;
-  }
-
+function getImageData(model: LCPDiscoveryInsightModel): LCPImageDiscoveryData|null {
   if (model.lcpRequest === undefined) {
     return null;
   }
@@ -99,7 +93,6 @@ function getImageData(model: LCPDiscoveryInsightModel|null): LCPImageDiscoveryDa
 
 export class LCPDiscovery extends BaseInsightComponent<LCPDiscoveryInsightModel> {
   static override readonly litTagName = LitHtml.literal`devtools-performance-lcp-discovery`;
-  override insightCategory: Category = Category.LCP;
   override internalName: string = 'lcp-discovery';
 
   #adviceIcon(didFail: boolean, label: string): LitHtml.TemplateResult {
@@ -124,6 +117,10 @@ export class LCPDiscovery extends BaseInsightComponent<LCPDiscoveryInsightModel>
   }
 
   override createOverlays(): Overlays.Overlays.TimelineOverlay[] {
+    if (!this.model) {
+      return [];
+    }
+
     const imageResults = getImageData(this.model);
     if (!imageResults || !imageResults.discoveryDelay) {
       return [];
@@ -160,87 +157,51 @@ export class LCPDiscovery extends BaseInsightComponent<LCPDiscoveryInsightModel>
     ];
   }
 
-  #handleBadImage(event: Event): void {
-    const img = event.target as HTMLImageElement;
-    img.style.display = 'none';
-  }
+  override getEstimatedSavingsTime(): Trace.Types.Timing.MilliSeconds|null {
+    if (!this.model) {
+      return null;
+    }
 
-  #renderImage(imageData: LCPImageDiscoveryData): LitHtml.TemplateResult {
-    // clang-format off
-    return html`
-      <div class="lcp-element">
-        ${imageData.request.args.data.mimeType.includes('image') ?
-          html`
-        <img
-          class="element-img"
-          src=${imageData.request.args.data.url}
-          @error=${this.#handleBadImage}
-           />`: LitHtml.nothing}
-        <span class="element-img-details">
-          ${eventRef(imageData.request)}
-          <span class="element-img-details-size">${i18n.ByteUtilities.bytesToString(imageData.request.args.data.decodedBodyLength ?? 0)}</span>
-        </span>
-      </div>`;
-    // clang-format on
+    return getImageData(this.model)?.estimatedSavings ?? null;
   }
 
-  #renderDiscovery(imageData: LCPImageDiscoveryData): LitHtml.LitTemplate {
+  #renderContent(imageData: LCPImageDiscoveryData): LitHtml.LitTemplate {
     if (!this.model) {
       return LitHtml.nothing;
     }
 
     // clang-format off
     return html`
-        <div class="insights">
-          <devtools-performance-sidebar-insight .data=${{
-            title: this.model.title,
-            description: this.model.description,
-            internalName: this.internalName,
-            expanded: this.isActive(),
-            estimatedSavingsTime: imageData.estimatedSavings,
-          } as SidebarInsight.InsightDetails}
-          @insighttoggleclick=${this.onSidebarClick}>
-            <div slot="insight-content" class="insight-section">
-              <div class="insight-results">
-                <ul class="insight-icon-results">
-                  <li class="insight-entry">
-                    ${this.#adviceIcon(imageData.shouldIncreasePriorityHint, i18nString(UIStrings.fetchPriorityApplied))}
-                    <span>${i18nString(UIStrings.fetchPriorityApplied)}</span>
-                  </li>
-                  <li class="insight-entry">
-                    ${this.#adviceIcon(imageData.shouldPreloadImage, i18nString(UIStrings.requestDiscoverable))}
-                    <span>${i18nString(UIStrings.requestDiscoverable)}</span>
-                  </li>
-                  <li class="insight-entry">
-                    ${this.#adviceIcon(imageData.shouldRemoveLazyLoading, i18nString(UIStrings.lazyLoadNotApplied))}
-                    <span>${i18nString(UIStrings.lazyLoadNotApplied)}</span>
-                  </li>
-                </ul>
-              </div>
-              ${this.#renderImage(imageData)}
-            </div>
-          </devtools-performance-sidebar-insight>
+      <div class="insight-section">
+        <div class="insight-results">
+          <ul class="insight-icon-results">
+            <li class="insight-entry">
+              ${this.#adviceIcon(imageData.shouldIncreasePriorityHint, i18nString(UIStrings.fetchPriorityApplied))}
+              <span>${i18nString(UIStrings.fetchPriorityApplied)}</span>
+            </li>
+            <li class="insight-entry">
+              ${this.#adviceIcon(imageData.shouldPreloadImage, i18nString(UIStrings.requestDiscoverable))}
+              <span>${i18nString(UIStrings.requestDiscoverable)}</span>
+            </li>
+            <li class="insight-entry">
+              ${this.#adviceIcon(imageData.shouldRemoveLazyLoading, i18nString(UIStrings.lazyLoadNotApplied))}
+              <span>${i18nString(UIStrings.lazyLoadNotApplied)}</span>
+            </li>
+          </ul>
+        </div>
+        ${imageRef(imageData.request)}
       </div>`;
     // clang-format on
   }
 
-  override getRelatedEvents(): Trace.Types.Events.Event[] {
-    if (!this.model?.lcpEvent || !this.model?.lcpRequest) {
-      return [];
+  override render(): void {
+    if (!this.model) {
+      return;
     }
 
-    // TODO: add entire request initiator chain?
-    return [this.model.lcpEvent, this.model.lcpRequest];
-  }
-
-  override render(): void {
     const imageResults = getImageData(this.model);
-    const matchesCategory = shouldRenderForCategory({
-      activeCategory: this.data.activeCategory,
-      insightCategory: this.insightCategory,
-    });
-    const output = imageResults && matchesCategory ? this.#renderDiscovery(imageResults) : LitHtml.nothing;
-    LitHtml.render(output, this.shadow, {host: this});
+    const output = imageResults ? this.#renderContent(imageResults) : LitHtml.nothing;
+    this.renderWithContent(output);
   }
 }
 

package/front_end/panels/timeline/components/insights/LCPPhases.ts

@@ -10,10 +10,8 @@ import * as Trace from '../../../../models/trace/trace.js';
 import * as LitHtml from '../../../../ui/lit-html/lit-html.js';
 import type * as Overlays from '../../overlays/overlays.js';
 
-import {BaseInsightComponent, shouldRenderForCategory} from './Helpers.js';
-import type * as SidebarInsight from './SidebarInsight.js';
+import {BaseInsightComponent} from './BaseInsightComponent.js';
 import type {TableData} from './Table.js';
-import {Category} from './types.js';
 
 const {html} = LitHtml;
 
@@ -54,7 +52,6 @@ interface PhaseData {
 
 export class LCPPhases extends BaseInsightComponent<LCPPhasesInsightModel> {
   static override readonly litTagName = LitHtml.literal`devtools-performance-lcp-by-phases`;
-  override insightCategory: Category = Category.LCP;
   override internalName: string = 'lcp-by-phase';
   #overlay: Overlays.Overlays.TimespanBreakdown|null = null;
 
@@ -189,7 +186,7 @@ export class LCPPhases extends BaseInsightComponent<LCPPhasesInsightModel> {
     return overlays;
   }
 
-  #renderLCPPhases(phaseData: PhaseData[]): LitHtml.LitTemplate {
+  #renderContent(phaseData: PhaseData[]): LitHtml.LitTemplate {
     if (!this.model) {
       return LitHtml.nothing;
     }
@@ -207,56 +204,25 @@ export class LCPPhases extends BaseInsightComponent<LCPPhasesInsightModel> {
 
     // clang-format off
     return html`
-    <div class="insights">
-      <devtools-performance-sidebar-insight .data=${{
-            title: this.model.title,
-            description: this.model.description,
-            internalName: this.internalName,
-            expanded: this.isActive(),
-        } as SidebarInsight.InsightDetails}
-        @insighttoggleclick=${this.onSidebarClick}
-      >
-        <div slot="insight-content" class="insight-section">
-          ${html`<devtools-performance-table
-            .data=${{
-              insight: this,
-              headers: [i18nString(UIStrings.phase), i18nString(UIStrings.percentLCP)],
-              rows,
-            } as TableData}>
-          </devtools-performance-table>`}
-        </div>
-      </devtools-performance-sidebar-insight>
-    </div>`;
+      <div class="insight-section">
+        ${html`<devtools-performance-table
+          .data=${{
+            insight: this,
+            headers: [i18nString(UIStrings.phase), i18nString(UIStrings.percentLCP)],
+            rows,
+          } as TableData}>
+        </devtools-performance-table>`}
+      </div>`;
     // clang-format on
   }
 
-  #hasDataToRender(phaseData: PhaseData[]): boolean {
-    return phaseData ? phaseData.length > 0 : false;
-  }
-
-  override getRelatedEvents(): Trace.Types.Events.Event[] {
-    const insight = this.model;
-    if (!insight?.lcpEvent) {
-      return [];
-    }
-
-    const relatedEvents: Trace.Types.Events.Event[] = [insight.lcpEvent];
-    if (insight.lcpRequest) {
-      relatedEvents.push(insight.lcpRequest);
+  override render(): void {
+    if (!this.model) {
+      return;
     }
 
-    return relatedEvents;
-  }
-
-  override render(): void {
     const phaseData = this.#getPhaseData();
-    const matchesCategory = shouldRenderForCategory({
-      activeCategory: this.data.activeCategory,
-      insightCategory: this.insightCategory,
-    });
-    const shouldRender = matchesCategory && this.#hasDataToRender(phaseData);
-    const output = shouldRender ? this.#renderLCPPhases(phaseData) : LitHtml.nothing;
-    LitHtml.render(output, this.shadow, {host: this});
+    this.renderWithContent(this.#renderContent(phaseData));
   }
 }
 

package/front_end/panels/timeline/components/insights/RenderBlocking.ts

@@ -11,9 +11,8 @@ import type * as Trace from '../../../../models/trace/trace.js';
 import * as LitHtml from '../../../../ui/lit-html/lit-html.js';
 import type * as Overlays from '../../overlays/overlays.js';
 
+import {BaseInsightComponent} from './BaseInsightComponent.js';
 import {eventRef} from './EventRef.js';
-import {BaseInsightComponent, shouldRenderForCategory} from './Helpers.js';
-import {Category} from './types.js';
 
 const {html} = LitHtml;
 
@@ -33,7 +32,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export class RenderBlocking extends BaseInsightComponent<RenderBlockingInsightModel> {
   static override readonly litTagName = LitHtml.literal`devtools-performance-render-blocking-requests`;
-  override insightCategory: Category = Category.LCP;
   override internalName: string = 'render-blocking-requests';
 
   override createOverlays(): Overlays.Overlays.TimelineOverlay[] {
@@ -52,59 +50,44 @@ export class RenderBlocking extends BaseInsightComponent<RenderBlockingInsightMo
     };
   }
 
-  #renderRenderBlocking(insightResult: Trace.Insights.Types.InsightModels['RenderBlocking']): LitHtml.LitTemplate {
+  override getEstimatedSavingsTime(): Trace.Types.Timing.MilliSeconds|null {
+    return this.model?.metricSavings?.FCP ?? null;
+  }
+
+  #renderContent(): LitHtml.LitTemplate {
     if (!this.model) {
       return LitHtml.nothing;
     }
 
-    const estimatedSavings = insightResult.metricSavings?.FCP;
     const MAX_REQUESTS = 3;
-    const topRequests = insightResult.renderBlockingRequests.slice(0, MAX_REQUESTS);
+    const topRequests = this.model.renderBlockingRequests.slice(0, MAX_REQUESTS);
 
     // clang-format off
     return html`
-        <div class="insights">
-          <devtools-performance-sidebar-insight .data=${{
-            title: this.model.title,
-            description: this.model.description,
-            internalName: this.internalName,
-            expanded: this.isActive(),
-            estimatedSavingsTime: estimatedSavings,
-          }}
-          @insighttoggleclick=${this.onSidebarClick} >
-            <div slot="insight-content" class="insight-section">
-              ${html`<devtools-performance-table
-                .data=${{
-                  insight: this,
-                  headers: [i18nString(UIStrings.renderBlockingRequest), i18nString(UIStrings.duration)],
-                  rows: topRequests.map(request => ({
-                    values: [
-                      eventRef(request),
-                      i18n.TimeUtilities.millisToString(Platform.Timing.microSecondsToMilliSeconds(request.dur)),
-                    ],
-                    overlays: [this.#createOverlayForRequest(request)],
-                  })),
-                }}>
-              </devtools-performance-table>`}
-            </div>
-          </devtools-performance-sidebar-insight>
+      <div class="insight-section">
+        ${html`<devtools-performance-table
+          .data=${{
+            insight: this,
+            headers: [i18nString(UIStrings.renderBlockingRequest), i18nString(UIStrings.duration)],
+            rows: topRequests.map(request => ({
+              values: [
+                eventRef(request),
+                i18n.TimeUtilities.millisToString(Platform.Timing.microSecondsToMilliSeconds(request.dur)),
+              ],
+              overlays: [this.#createOverlayForRequest(request)],
+            })),
+          }}>
+        </devtools-performance-table>`}
       </div>`;
-            // clang-format on
-  }
-
-  override getRelatedEvents(): Trace.Types.Events.Event[] {
-    return this.model?.relatedEvents ?? [];
+    // clang-format on
   }
 
   override render(): void {
-    const model = this.model;
-    const hasBlockingRequests = model?.renderBlockingRequests && model.renderBlockingRequests.length > 0;
-    const matchesCategory = shouldRenderForCategory({
-      activeCategory: this.data.activeCategory,
-      insightCategory: this.insightCategory,
-    });
-    const output = hasBlockingRequests && matchesCategory ? this.#renderRenderBlocking(model) : LitHtml.nothing;
-    LitHtml.render(output, this.shadow, {host: this});
+    if (!this.model) {
+      return;
+    }
+
+    this.renderWithContent(this.#renderContent());
   }
 }