Skip to content

Commit 24b60d4

Browse files
Kateryna ProkopenkoDevtools-frontend LUCI CQ
authored andcommitted
Use IconButton.Icon.create for icons of default color and size
Bug: 390340514 Change-Id: I1d73a6ee2bd6f432576300747238e77a45b9f390 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6179478 Commit-Queue: Kim-Anh Tran <[email protected]> Reviewed-by: Kim-Anh Tran <[email protected]> Auto-Submit: Kateryna Prokopenko <[email protected]>
1 parent 34eea54 commit 24b60d4

File tree

8 files changed

+19
-75
lines changed

8 files changed

+19
-75
lines changed

front_end/panels/elements/ElementsTreeElement.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,8 +2159,7 @@ export class ElementsTreeElement extends UI.TreeOutline.TreeElement {
21592159
}
21602160

21612161
adornSlot({name}: {name: string}, context: OpeningTagContext): Adorners.Adorner.Adorner {
2162-
const linkIcon = new IconButton.Icon.Icon();
2163-
linkIcon.name = 'select-element';
2162+
const linkIcon = IconButton.Icon.create('select-element');
21642163
const slotText = document.createElement('span');
21652164
slotText.textContent = name;
21662165
const adornerContent = document.createElement('span');
@@ -2185,8 +2184,7 @@ export class ElementsTreeElement extends UI.TreeOutline.TreeElement {
21852184
adornerContent.textContent = name;
21862185
adornerContent.classList.add('adorner-with-icon');
21872186

2188-
const linkIcon = new IconButton.Icon.Icon();
2189-
linkIcon.name = 'select-element';
2187+
const linkIcon = IconButton.Icon.create('select-element');
21902188
adornerContent.append(linkIcon);
21912189

21922190
const adorner = new Adorners.Adorner.Adorner();

front_end/panels/elements/ElementsTreeOutline.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,8 +1789,7 @@ export class ShortcutTreeElement extends UI.TreeOutline.TreeElement {
17891789
ElementsComponents.AdornerManager.RegisteredAdorners.REVEAL);
17901790
const name = config.name;
17911791
const adornerContent = document.createElement('span');
1792-
const linkIcon = new IconButton.Icon.Icon();
1793-
linkIcon.name = 'select-element';
1792+
const linkIcon = IconButton.Icon.create('select-element');
17941793
const slotText = document.createElement('span');
17951794
slotText.textContent = name;
17961795
adornerContent.append(linkIcon);

front_end/panels/elements/TopLayerContainer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ export class TopLayerContainer extends UI.TreeOutline.TreeElement {
9595
ElementsComponents.AdornerManager.RegisteredAdorners.TOP_LAYER);
9696
const adornerContent = document.createElement('span');
9797
adornerContent.classList.add('adorner-with-icon');
98-
const linkIcon = new IconButton.Icon.Icon();
99-
linkIcon.name = 'select-element';
98+
const linkIcon = IconButton.Icon.create('select-element');
10099
const adornerText = document.createElement('span');
101100
adornerText.textContent = `top-layer (${topLayerElementIndex})`;
102101
adornerContent.append(linkIcon);

front_end/panels/screencast/ScreencastView.ts

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -675,26 +675,17 @@ export class ScreencastView extends UI.Widget.VBox implements SDK.OverlayModel.H
675675
this.navigationBar = this.element.createChild('div', 'screencast-navigation');
676676

677677
this.navigationBack = this.navigationBar.createChild('button', 'navigation');
678-
{
679-
const icon = this.navigationBack.appendChild(new IconButton.Icon.Icon());
680-
icon.data = {color: 'var(--icon-default)', iconName: 'arrow-back'};
681-
}
678+
this.navigationBack.appendChild(IconButton.Icon.create('arrow-back'));
682679
this.navigationBack.disabled = true;
683680
UI.ARIAUtils.setLabel(this.navigationBack, i18nString(UIStrings.back));
684681

685682
this.navigationForward = this.navigationBar.createChild('button', 'navigation');
686-
{
687-
const icon = this.navigationForward.appendChild(new IconButton.Icon.Icon());
688-
icon.data = {color: 'var(--icon-default)', iconName: 'arrow-forward'};
689-
}
683+
this.navigationForward.appendChild(IconButton.Icon.create('arrow-forward'));
690684
this.navigationForward.disabled = true;
691685
UI.ARIAUtils.setLabel(this.navigationForward, i18nString(UIStrings.forward));
692686

693687
this.navigationReload = this.navigationBar.createChild('button', 'navigation');
694-
{
695-
const icon = this.navigationReload.appendChild(new IconButton.Icon.Icon());
696-
icon.data = {color: 'var(--icon-default)', iconName: 'refresh'};
697-
}
688+
this.navigationReload.appendChild(IconButton.Icon.create('refresh'));
698689
UI.ARIAUtils.setLabel(this.navigationReload, i18nString(UIStrings.reload));
699690

700691
this.navigationUrl = this.navigationBar.appendChild(UI.UIUtils.createInput());
@@ -710,10 +701,7 @@ export class ScreencastView extends UI.Widget.VBox implements SDK.OverlayModel.H
710701
UI.ARIAUtils.setLabel(this.mouseInputToggle, i18nString(UIStrings.mouseInput));
711702

712703
this.touchInputToggle = this.navigationBar.createChild('button');
713-
{
714-
this.touchInputToggleIcon = this.touchInputToggle.appendChild(new IconButton.Icon.Icon());
715-
this.touchInputToggleIcon.data = {color: 'var(--icon-default)', iconName: 'touch-app'};
716-
}
704+
this.touchInputToggleIcon = this.touchInputToggle.appendChild(IconButton.Icon.create('touch-app'));
717705
UI.ARIAUtils.setLabel(this.touchInputToggle, i18nString(UIStrings.touchInput));
718706

719707
this.navigationProgressBar = new ProgressTracker(

front_end/panels/sources/BreakpointEditDialog.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ export class BreakpointEditDialog extends UI.Widget.Widget {
177177
}));
178178
editorWrapper.appendChild(this.editor);
179179

180-
const closeIcon = new IconButton.Icon.Icon();
181-
closeIcon.name = 'cross';
180+
const closeIcon = IconButton.Icon.create('cross');
182181
closeIcon.title = i18nString(UIStrings.closeDialog);
183182
closeIcon.setAttribute('jslog', `${VisualLogging.close().track({click: true})}`);
184183
closeIcon.onclick = () => this.finishEditing(true, this.editor.state.doc.toString());
@@ -193,9 +192,7 @@ export class BreakpointEditDialog extends UI.Widget.Widget {
193192
const link = UI.Fragment.html`<x-link class="link devtools-link" tabindex="0" href="https://goo.gle/devtools-loc"
194193
jslog="${VisualLogging.link('learn-more')}">${
195194
i18nString(UIStrings.learnMoreOnBreakpointTypes)}</x-link>` as UI.XLink.XLink;
196-
const linkIcon = new IconButton.Icon.Icon();
197-
linkIcon.name = 'open-externally';
198-
linkIcon.classList.add('link-icon');
195+
const linkIcon = IconButton.Icon.create('open-externally', 'link-icon');
199196
link.prepend(linkIcon);
200197
linkWrapper.appendChild(link);
201198

front_end/ui/components/docs/icon_component/basic.ts

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ const iconName1 = document.createElement('td');
1414
iconName1.textContent = 'select-element';
1515
row1.appendChild(iconName1);
1616

17-
const icon = new IconButton.Icon.Icon();
18-
const name = 'select-element';
19-
icon.data = {
20-
iconName: name,
21-
color: 'rgb(110, 110, 110)',
22-
width: '20px',
23-
};
17+
const icon = IconButton.Icon.create('select-element');
2418
const icon1 = document.createElement('td');
2519
icon1.appendChild(icon);
2620
row1.appendChild(icon1);
@@ -37,14 +31,8 @@ const iconName2 = document.createElement('td');
3731
iconName2.textContent = 'issue-exclamation-filled';
3832
row2.appendChild(iconName2);
3933

40-
const otherIcon = new IconButton.Icon.Icon();
41-
const otherPath = 'issue-exclamation-filled';
42-
otherIcon.data = {
43-
iconPath: otherPath,
44-
width: '20px',
45-
height: '20px',
46-
color: 'var(--icon-link)',
47-
};
34+
const otherIcon = IconButton.Icon.create('issue-exclamation-filled');
35+
otherIcon.style.color = 'var(--icon-link)';
4836
const icon2 = document.createElement('td');
4937
icon2.appendChild(otherIcon);
5038
row2.appendChild(icon2);
@@ -56,9 +44,7 @@ const iconName3 = document.createElement('td');
5644
iconName3.textContent = 'select-element';
5745
row3.appendChild(iconName3);
5846

59-
const otherIcon2 = new IconButton.Icon.Icon();
60-
otherIcon2.classList.add('custom-color');
61-
otherIcon2.name = 'select-element';
47+
const otherIcon2 = IconButton.Icon.create('select-element', 'custom-color');
6248
const icon3 = document.createElement('td');
6349
icon3.appendChild(otherIcon2);
6450
row3.appendChild(icon3);
@@ -70,14 +56,7 @@ iconTable?.appendChild(row3);
7056
const span1 = document.createElement('span');
7157
span1.textContent = 'Some text';
7258
div.appendChild(span1);
73-
const otherIcon3 = new IconButton.Icon.Icon();
74-
otherIcon3.classList.add('custom-color');
75-
otherIcon3.data = {
76-
iconName: 'select-element',
77-
width: '20px',
78-
height: '20px',
79-
color: 'var(--icon-default)',
80-
};
59+
const otherIcon3 = IconButton.Icon.create('select-element', 'custom-color');
8160
div.appendChild(otherIcon3);
8261
const span2 = document.createElement('span');
8362
span2.textContent = 'with a large icon';
@@ -90,14 +69,9 @@ iconTable?.appendChild(row3);
9069
const span1 = document.createElement('span');
9170
span1.textContent = 'Some text';
9271
div.appendChild(span1);
93-
const otherIcon3 = new IconButton.Icon.Icon();
94-
otherIcon3.classList.add('custom-color');
95-
otherIcon3.data = {
96-
iconName: 'select-element',
97-
width: '14px',
98-
height: '14px',
99-
color: 'var(--icon-default)',
100-
};
72+
const otherIcon3 = IconButton.Icon.create('select-element', 'custom-color');
73+
otherIcon3.style.width = '14px';
74+
otherIcon3.style.height = '14px';
10175
div.appendChild(otherIcon3);
10276
const span2 = document.createElement('span');
10377
span2.textContent = 'with a small icon';

front_end/ui/components/icon_button/Icon.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ export type IconData = IconWithName|{
3535
* const icon = IconButton.Icon.create('bin');
3636
* const iconWithClassName = IconButton.Icon.create('bin', 'delete-icon');
3737
*
38-
* // Instantiate programmatically via the constructor:
39-
* const icon = new IconButton.Icon.Icon();
40-
* icon.name = 'bin';
41-
* container.appendChild(icon);
42-
*
4338
* // Use within a template:
4439
* LitHtml.html`
4540
* <devtools-icon name="bin">

front_end/ui/legacy/components/perf_ui/OverviewGrid.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,7 @@ export class Window extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
237237

238238
enableCreateBreadcrumbsButton(): HTMLElement {
239239
this.curtainsRange = this.createBreadcrumbButton.createChild('div');
240-
this.breadcrumbZoomIcon = new IconButton.Icon.Icon();
241-
this.breadcrumbZoomIcon.data = {
242-
iconName: 'zoom-in',
243-
color: 'var(--icon-default)',
244-
width: '20px',
245-
height: '20px',
246-
};
240+
this.breadcrumbZoomIcon = IconButton.Icon.create('zoom-in');
247241
this.createBreadcrumbButton.appendChild(this.breadcrumbZoomIcon);
248242
this.createBreadcrumbButton.addEventListener('click', () => {
249243
this.#createBreadcrumb();

0 commit comments

Comments
 (0)