Skip to content

Commit 0b2c711

Browse files
danilsomsikovDevtools-frontend LUCI CQ
authored andcommitted
Use cloneCustomElement in the Adorner
To make it work, reverse the dependency between the legacy bundle and the adorner bundle Bug: 407750554 Change-Id: Ib23ab1a0e9a3766e261b2eebec7cfe016b86b767 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7099742 Auto-Submit: Danil Somsikov <[email protected]> Reviewed-by: Philip Pfaffe <[email protected]> Commit-Queue: Danil Somsikov <[email protected]>
1 parent d3cb82c commit 0b2c711

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

front_end/ui/components/adorners/Adorner.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import type * as Platform from '../../../core/platform/platform.js';
77
import {html, render} from '../../../ui/lit/lit.js';
8+
import * as UI from '../../legacy/legacy.js';
89
import * as VisualElements from '../../visual_logging/visual_logging.js';
910

1011
import adornerStyles from './adorner.css.js';
@@ -37,7 +38,7 @@ export class Adorner extends HTMLElement {
3738
}
3839

3940
override cloneNode(deep?: boolean): Node {
40-
const node = super.cloneNode(deep) as Adorner;
41+
const node = UI.UIUtils.cloneCustomElement(this, deep);
4142
node.data = {name: this.name, content: this.#content, jslogContext: this.#jslogContext};
4243
return node;
4344
}

front_end/ui/components/adorners/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ devtools_ui_module("adorners") {
1717

1818
deps = [
1919
"../../../core/platform:bundle",
20+
"../../../ui/legacy:bundle",
2021
"../../../ui/lit:bundle",
2122
"../../../ui/visual_logging:bundle",
2223
"../helpers:bundle",

front_end/ui/legacy/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ devtools_ui_module("ui") {
110110
"../../models/geometry:bundle",
111111
"../../models/text_utils:bundle",
112112
"../../ui/legacy/theme_support:bundle",
113-
"../components/adorners:bundle",
114113
"../components/buttons:bundle",
115114
"../components/helpers:bundle",
116115
"../components/highlighting:bundle",
@@ -137,6 +136,7 @@ devtools_entrypoint("bundle") {
137136
"../../legacy_test_runner/*",
138137
"../../panels/*",
139138
"../../testing/*",
139+
"../components/adorners:*",
140140
"../components/data_grid:*",
141141
"../components/dialogs:*",
142142
"../components/docs/combo_box/*",

front_end/ui/legacy/Toolbar.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import * as Platform from '../../core/platform/platform.js';
1010
import * as Root from '../../core/root/root.js';
1111
import * as Buttons from '../../ui/components/buttons/buttons.js';
1212
import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
13-
import type * as Adorners from '../components/adorners/adorners.js';
1413
import * as IconButton from '../components/icon_button/icon_button.js';
1514

1615
import {type Action, Events as ActionEvents} from './ActionRegistration.js';
@@ -643,7 +642,7 @@ export class ToolbarButton extends ToolbarItem<ToolbarButton.EventTypes, Buttons
643642
this.text = text;
644643
}
645644

646-
setAdorner(adorner: Adorners.Adorner.Adorner): void {
645+
setAdorner(adorner: HTMLElement): void {
647646
if (this.adorner) {
648647
this.adorner.replaceWith(adorner);
649648
} else {
@@ -971,7 +970,7 @@ export class ToolbarMenuButton extends ToolbarItem<ToolbarButton.EventTypes> {
971970
private textElement?: HTMLElement;
972971
private text?: string;
973972
private iconName?: string;
974-
private adorner?: Adorners.Adorner.Adorner;
973+
private adorner?: HTMLElement;
975974
private readonly contextMenuHandler: (arg0: ContextMenu) => void;
976975
private readonly useSoftMenu: boolean;
977976
private readonly keepOpen: boolean;
@@ -1028,7 +1027,7 @@ export class ToolbarMenuButton extends ToolbarItem<ToolbarButton.EventTypes> {
10281027
this.text = text;
10291028
}
10301029

1031-
setAdorner(adorner: Adorners.Adorner.Adorner): void {
1030+
setAdorner(adorner: HTMLElement): void {
10321031
if (this.iconName) {
10331032
return;
10341033
}

0 commit comments

Comments
 (0)