Hide legacy DataGrid editCallback

danilsomsikov · Devtools-frontend LUCI CQ · commit 95a792f8dc42 · 2025-02-19T07:26:33.000-08:00
It is hard to use in the combination with creation node, all the existing users have been migrated to the <devtools-data-grid> and new users should also use it. Bug: 394287937 Change-Id: Id529f390725a0df628638c19d5dc826f00785744 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6280748 Reviewed-by: Benedikt Meurer <bmeurer@chromium.org> Commit-Queue: Danil Somsikov <dsv@chromium.org> Auto-Submit: Danil Somsikov <dsv@chromium.org>
diff --git a/front_end/panels/application/BackgroundServiceView.ts b/front_end/panels/application/BackgroundServiceView.ts
@@ -375,7 +375,6 @@ export class BackgroundServiceView extends UI.Widget.VBox {
     const dataGrid = new DataGrid.DataGrid.DataGridImpl({
       displayName: i18nString(UIStrings.backgroundServices),
       columns,
-      editCallback: undefined,
       refreshCallback: undefined,
       deleteCallback: undefined,
     });
diff --git a/front_end/panels/application/IndexedDBViews.ts b/front_end/panels/application/IndexedDBViews.ts
@@ -372,7 +372,6 @@ export class IDBDataView extends UI.View.SimpleView {
       columns,
       deleteCallback: this.deleteButtonClicked.bind(this),
       refreshCallback: this.updateData.bind(this, true),
-      editCallback: undefined,
     });
     dataGrid.setStriped(true);
     dataGrid.addEventListener(DataGrid.DataGrid.Events.SELECTED_NODE, () => {
diff --git a/front_end/panels/application/ServiceWorkerCacheViews.ts b/front_end/panels/application/ServiceWorkerCacheViews.ts
@@ -236,7 +236,6 @@ export class ServiceWorkerCacheView extends UI.View.SimpleView {
       columns,
       deleteCallback: this.deleteButtonClicked.bind(this),
       refreshCallback: this.updateData.bind(this, true),
-      editCallback: undefined,
     });
 
     dataGrid.addEventListener(DataGrid.DataGrid.Events.SORTING_CHANGED, this.sortingChanged, this);
diff --git a/front_end/panels/coverage/CoverageListView.ts b/front_end/panels/coverage/CoverageListView.ts
@@ -181,7 +181,6 @@ export class CoverageListView extends UI.Widget.VBox {
     this.dataGrid = new DataGrid.SortableDataGrid.SortableDataGrid<GridNode>({
       displayName: i18nString(UIStrings.codeCoverage),
       columns,
-      editCallback: undefined,
       refreshCallback: undefined,
       deleteCallback: undefined,
     });
diff --git a/front_end/panels/css_overview/CSSOverviewCompletedView.ts b/front_end/panels/css_overview/CSSOverviewCompletedView.ts
@@ -972,7 +972,6 @@ export class ElementDetailsView extends UI.Widget.Widget {
     this.#elementGrid = new DataGrid.SortableDataGrid.SortableDataGrid({
       displayName: i18nString(UIStrings.cssOverviewElements),
       columns: this.#elementGridColumns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/media/EventDisplayTable.ts b/front_end/panels/media/EventDisplayTable.ts
@@ -118,7 +118,6 @@ export class PlayerEventsView extends UI.Widget.VBox {
       displayName: i18nString(UIStrings.eventDisplay),
       columns: gridColumnDescs,
       deleteCallback: undefined,
-      editCallback: undefined,
       refreshCallback: undefined,
     });
     datagrid.asWidget().contentElement.classList.add('no-border-top-datagrid');
diff --git a/front_end/panels/network/EventSourceMessagesView.ts b/front_end/panels/network/EventSourceMessagesView.ts
@@ -96,7 +96,6 @@ export class EventSourceMessagesView extends UI.Widget.VBox {
     this.dataGrid = new DataGrid.SortableDataGrid.SortableDataGrid({
       displayName: i18nString(UIStrings.eventSource),
       columns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/network/NetworkLogViewColumns.ts b/front_end/panels/network/NetworkLogViewColumns.ts
@@ -272,7 +272,6 @@ export class NetworkLogViewColumns {
     this.dataGridInternal = new DataGrid.SortableDataGrid.SortableDataGrid<NetworkNode>(({
       displayName: (i18nString(UIStrings.networkLog) as string),
       columns: this.columns.map(NetworkLogViewColumns.convertToDataGridDescriptor),
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     }));
diff --git a/front_end/panels/network/ResourceWebSocketFrameView.ts b/front_end/panels/network/ResourceWebSocketFrameView.ts
@@ -190,7 +190,6 @@ export class ResourceWebSocketFrameView extends UI.Widget.VBox {
     this.dataGrid = new DataGrid.SortableDataGrid.SortableDataGrid({
       displayName: i18nString(UIStrings.webSocketFrame),
       columns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/profiler/HeapDetachedElementsDataGrid.ts b/front_end/panels/profiler/HeapDetachedElementsDataGrid.ts
@@ -45,7 +45,6 @@ export class HeapDetachedElementsDataGrid extends DataGrid.DataGrid.DataGridImpl
     super({
       displayName: i18nString(UIStrings.detachedElementsList),
       columns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/profiler/LiveHeapProfileView.ts b/front_end/panels/profiler/LiveHeapProfileView.ts
@@ -153,7 +153,6 @@ export class LiveHeapProfileView extends UI.Widget.VBox {
     const dataGrid = new DataGrid.SortableDataGrid.SortableDataGrid({
       displayName: i18nString(UIStrings.heapProfile),
       columns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/profiler/ProfileView.ts b/front_end/panels/profiler/ProfileView.ts
@@ -193,7 +193,6 @@ export class ProfileView extends UI.View.SimpleView implements UI.SearchableView
     this.dataGrid = new DataGrid.DataGrid.DataGridImpl({
       displayName: i18nString(UIStrings.profiler),
       columns,
-      editCallback: undefined,
       deleteCallback: undefined,
       refreshCallback: undefined,
     });
diff --git a/front_end/panels/timeline/TimelineTreeView.ts b/front_end/panels/timeline/TimelineTreeView.ts
@@ -263,7 +263,6 @@ export class TimelineTreeView extends
       displayName: i18nString(UIStrings.performance),
       columns,
       refreshCallback: undefined,
-      editCallback: undefined,
       deleteCallback: undefined,
     });
     this.dataGrid.addEventListener(DataGrid.DataGrid.Events.SORTING_CHANGED, this.sortingChanged, this);
@@ -1185,7 +1184,6 @@ export class TimelineStackView extends
       displayName: i18nString(UIStrings.timelineStack),
       columns,
       deleteCallback: undefined,
-      editCallback: undefined,
       refreshCallback: undefined,
     });
     this.dataGrid.setResizeMethod(DataGrid.DataGrid.ResizeMethod.LAST);
diff --git a/front_end/ui/legacy/components/data_grid/DataGrid.ts b/front_end/ui/legacy/components/data_grid/DataGrid.ts
@@ -33,6 +33,7 @@ import * as VisualLogging from '../../../visual_logging/visual_logging.js';
 import * as UI from '../../legacy.js';
 
 import dataGridStyles from './dataGrid.css.js';
+import type {DataGridInternalToken} from './DataGridElement.js';
 
 const UIStrings = {
   /**
@@ -131,7 +132,7 @@ const elementToIndexMap = new WeakMap<Element, number>();
 export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTypes<T>> {
   element: HTMLDivElement;
   displayName: string;
-  editCallback:
+  private editCallback:
       ((node: any, columnId: string, valueBeforeEditing: any, newText: any, moveDirection?: string) => void)|undefined;
   deleteCallback: ((arg0: any) => void)|undefined;
   refreshCallback: (() => void)|undefined;
@@ -176,7 +177,7 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
   constructor(dataGridParameters: Parameters) {
     super();
-    const {displayName, columns: columnsArray, editCallback, deleteCallback, refreshCallback} = dataGridParameters;
+    const {displayName, columns: columnsArray, deleteCallback, refreshCallback} = dataGridParameters;
     this.element = document.createElement('div');
     this.element.classList.add('data-grid');
     this.element.tabIndex = 0;
@@ -193,7 +194,6 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     UI.ARIAUtils.markAsApplication(this.element);
     this.displayName = displayName;
 
-    this.editCallback = editCallback;
     this.deleteCallback = deleteCallback;
     this.refreshCallback = refreshCallback;
 
@@ -253,6 +253,14 @@ export class DataGridImpl<T> extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.elementToDataGridNode = new WeakMap();
   }
 
+  setEditCallback(
+      editCallback:
+          ((node: any, columnId: string, valueBeforeEditing: any, newText: any, moveDirection?: string) => void)|
+      undefined,
+      _internalToken: DataGridInternalToken): void {
+    this.editCallback = editCallback;
+  }
+
   private firstSelectableNode(): DataGridNode<T>|null|undefined {
     let firstSelectableNode: (DataGridNode<T>|undefined) = this.rootNodeInternal;
     while (firstSelectableNode && !firstSelectableNode.selectable) {
@@ -2540,7 +2548,6 @@ export class DataGridWidget<T> extends UI.Widget.VBox {
 export interface Parameters {
   displayName: string;
   columns: ColumnDescriptor[];
-  editCallback?: ((node: any, columnId: string, valueBeforeEditing: any, newText: any, moveDirection?: string) => void);
   deleteCallback?: ((arg0: any) => void);
   refreshCallback?: (() => void);
 }
diff --git a/front_end/ui/legacy/components/data_grid/DataGridElement.ts b/front_end/ui/legacy/components/data_grid/DataGridElement.ts
@@ -202,7 +202,7 @@ class DataGridElement extends HTMLElement {
     if (visibleColumns.size) {
       this.#dataGrid.setColumnsVisibility(visibleColumns);
     }
-    this.#dataGrid.editCallback = hasEditableColumn ? this.#editCallback.bind(this) : undefined;
+    this.#dataGrid.setEditCallback(hasEditableColumn ? this.#editCallback.bind(this) : undefined, INTERNAL_TOKEN);
     this.#dataGrid.deleteCallback = hasEditableColumn ? this.#deleteCallback.bind(this) : undefined;
   }
 
@@ -496,3 +496,11 @@ customElements.define('devtools-data-grid', DataGridElement);
 function hasBooleanAttribute(element: Element, name: string): boolean {
   return element.hasAttribute(name) && element.getAttribute(name) !== 'false';
 }
+
+export interface DataGridInternalToken {
+  token: 'DataGridInternalToken';
+}
+
+const INTERNAL_TOKEN: DataGridInternalToken = {
+  token: 'DataGridInternalToken'
+};
