chrome-devtools-frontend 1.0.1587572 → 1.0.1587905

package/front_end/panels/network/NetworkItemView.ts

@@ -8,11 +8,8 @@ import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
-import * as Annotations from '../../models/annotations/annotations.js';
 import type * as NetworkTimeCalculator from '../../models/network_time_calculator/network_time_calculator.js';
-import * as PanelCommon from '../../panels/common/common.js';
 import * as NetworkForward from '../../panels/network/forward/forward.js';
-import * as LegacyWrapper from '../../ui/components/legacy_wrapper/legacy_wrapper.js';
 import {Icon} from '../../ui/kit/kit.js';
 import type * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 import * as UI from '../../ui/legacy/legacy.js';
@@ -22,7 +19,7 @@ import * as NetworkComponents from './components/components.js';
 import {EventSourceMessagesView} from './EventSourceMessagesView.js';
 import {RequestCookiesView} from './RequestCookiesView.js';
 import {RequestDeviceBoundSessionsView} from './RequestDeviceBoundSessionsView.js';
-import * as RequestHeadersView from './RequestHeadersView.js';
+import {RequestHeadersView} from './RequestHeadersView.js';
 import {RequestInitiatorView} from './RequestInitiatorView.js';
 import {RequestPayloadView} from './RequestPayloadView.js';
 import {RequestPreviewView} from './RequestPreviewView.js';
@@ -149,7 +146,7 @@ const requestToPreviewView = new WeakMap<SDK.NetworkRequest.NetworkRequest, Requ
 export class NetworkItemView extends UI.TabbedPane.TabbedPane {
   #request: SDK.NetworkRequest.NetworkRequest;
   readonly #resourceViewTabSetting: Common.Settings.Setting<NetworkForward.UIRequestLocation.UIRequestTabs>;
-  readonly #headersViewComponent: RequestHeadersView.RequestHeadersView|undefined;
+  readonly #headersViewComponent: RequestHeadersView|undefined;
   #payloadView: RequestPayloadView|null = null;
   readonly #responseView: RequestResponseView|undefined;
   #cookiesView: RequestCookiesView|null = null;
@@ -175,11 +172,11 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane {
           i18nString(UIStrings.headers));
     } else {
       this.#firstTab = NetworkForward.UIRequestLocation.UIRequestTabs.HEADERS_COMPONENT;
-      this.#headersViewComponent = new RequestHeadersView.RequestHeadersView(request);
+      this.#headersViewComponent = new RequestHeadersView();
+      this.#headersViewComponent.request = request;
       this.appendTab(
           NetworkForward.UIRequestLocation.UIRequestTabs.HEADERS_COMPONENT, i18nString(UIStrings.headers),
-          LegacyWrapper.LegacyWrapper.legacyWrapper(UI.Widget.VBox, this.#headersViewComponent),
-          i18nString(UIStrings.headers));
+          this.#headersViewComponent, i18nString(UIStrings.headers));
     }
 
     this.#resourceViewTabSetting =
@@ -282,14 +279,6 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane {
       this.#initialTab = undefined;
     }
 
-    if (Annotations.AnnotationRepository.annotationsEnabled()) {
-      PanelCommon.AnnotationManager.instance().initializePlacementForAnnotationType(
-          Annotations.AnnotationType.NETWORK_REQUEST_SUBPANEL_HEADERS, this.resolveInitialState.bind(this),
-          this.element);
-
-      void PanelCommon.AnnotationManager.instance().resolveAnnotationsOfType(
-          Annotations.AnnotationType.NETWORK_REQUEST_SUBPANEL_HEADERS);
-    }
   }
 
   override willHide(): void {
@@ -378,34 +367,6 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane {
     }
   }
 
-  async resolveInitialState(
-      parentElement: Element, reveal: boolean, lookupId: string,
-      anchor?: SDK.DOMModel.DOMNode|SDK.NetworkRequest.NetworkRequest): Promise<{x: number, y: number}|null> {
-    const request = anchor as SDK.NetworkRequest.NetworkRequest;
-    if ((request && request !== this.request()) || (lookupId !== this.request().requestId())) {
-      return null;
-    }
-
-    if (!this.#headersViewComponent) {
-      return null;
-    }
-    await this.#headersViewComponent.render();
-
-    const element = this.#headersViewComponent.getHeaderElementById('request-url');
-    if (!element) {
-      return null;
-    }
-
-    const targetRect = element.getBoundingClientRect();
-    const parentRect = parentElement.getBoundingClientRect();
-    // Adjust the anchor position slightly.
-    const adjustX = 15;
-    const adjustY = -19;
-    const relativeX = targetRect.x - parentRect.x + adjustX;
-    const relativeY = targetRect.y - parentRect.y + adjustY;
-    return {x: relativeX, y: relativeY};
-  }
-
   private tabSelected(event: Common.EventTarget.EventTargetEvent<UI.TabbedPane.EventData>): void {
     if (!event.data.isUserGesture) {
       return;
@@ -427,7 +388,7 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane {
     this.#headersViewComponent?.revealHeader(section, header);
   }
 
-  getHeadersViewComponent(): RequestHeadersView.RequestHeadersView|undefined {
+  getHeadersViewComponent(): RequestHeadersView|undefined {
     return this.#headersViewComponent;
   }
 }