Skip to content

Commit 883da59

Browse files
joaomorenojoaomoreno
committed
remove deprecated function calls
related to microsoft#103454
1 parent efc7cb3 commit 883da59

23 files changed

Lines changed: 228 additions & 235 deletions

File tree

‎src/vs/base/browser/ui/actionbar/actionViewItems.ts‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import * as nls from 'vs/nls';
99
import { Disposable } from 'vs/base/common/lifecycle';
1010
import { SelectBox, ISelectOptionItem, ISelectBoxOptions } from 'vs/base/browser/ui/selectBox/selectBox';
1111
import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, Separator, IActionViewItem } from 'vs/base/common/actions';
12-
import * as DOM from 'vs/base/browser/dom';
1312
import * as types from 'vs/base/common/types';
14-
import { EventType, Gesture } from 'vs/base/browser/touch';
13+
import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
1514
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
1615
import { DataTransfers } from 'vs/base/browser/dnd';
1716
import { isFirefox } from 'vs/base/browser/browser';
17+
import { $, addClasses, addDisposableListener, append, EventHelper, EventLike, EventType, removeClasses, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
1818

1919
export interface IBaseActionViewItemOptions {
2020
draggable?: boolean;
@@ -107,19 +107,19 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
107107

108108
if (isFirefox) {
109109
// Firefox: requires to set a text data transfer to get going
110-
this._register(DOM.addDisposableListener(container, DOM.EventType.DRAG_START, e => e.dataTransfer?.setData(DataTransfers.TEXT, this._action.label)));
110+
this._register(addDisposableListener(container, EventType.DRAG_START, e => e.dataTransfer?.setData(DataTransfers.TEXT, this._action.label)));
111111
}
112112
}
113113

114-
this._register(DOM.addDisposableListener(element, EventType.Tap, e => this.onClick(e)));
114+
this._register(addDisposableListener(element, TouchEventType.Tap, e => this.onClick(e)));
115115

116-
this._register(DOM.addDisposableListener(element, DOM.EventType.MOUSE_DOWN, e => {
116+
this._register(addDisposableListener(element, EventType.MOUSE_DOWN, e => {
117117
if (!enableDragging) {
118-
DOM.EventHelper.stop(e, true); // do not run when dragging is on because that would disable it
118+
EventHelper.stop(e, true); // do not run when dragging is on because that would disable it
119119
}
120120

121121
if (this._action.enabled && e.button === 0) {
122-
DOM.addClass(element, 'active');
122+
element.classList.add('active');
123123
}
124124
}));
125125

@@ -128,36 +128,36 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
128128
// main mouse button. This is for scenarios where e.g. some interaction forces
129129
// the Ctrl+key to be pressed and hold but the user still wants to interact
130130
// with the actions (for example quick access in quick navigation mode).
131-
this._register(DOM.addDisposableListener(element, DOM.EventType.CONTEXT_MENU, e => {
131+
this._register(addDisposableListener(element, EventType.CONTEXT_MENU, e => {
132132
if (e.button === 0 && e.ctrlKey === true) {
133133
this.onClick(e);
134134
}
135135
}));
136136
}
137137

138-
this._register(DOM.addDisposableListener(element, DOM.EventType.CLICK, e => {
139-
DOM.EventHelper.stop(e, true);
138+
this._register(addDisposableListener(element, EventType.CLICK, e => {
139+
EventHelper.stop(e, true);
140140

141141
// menus do not use the click event
142142
if (!(this.options && this.options.isMenu)) {
143143
platform.setImmediate(() => this.onClick(e));
144144
}
145145
}));
146146

147-
this._register(DOM.addDisposableListener(element, DOM.EventType.DBLCLICK, e => {
148-
DOM.EventHelper.stop(e, true);
147+
this._register(addDisposableListener(element, EventType.DBLCLICK, e => {
148+
EventHelper.stop(e, true);
149149
}));
150150

151-
[DOM.EventType.MOUSE_UP, DOM.EventType.MOUSE_OUT].forEach(event => {
152-
this._register(DOM.addDisposableListener(element, event, e => {
153-
DOM.EventHelper.stop(e);
154-
DOM.removeClass(element, 'active');
151+
[EventType.MOUSE_UP, EventType.MOUSE_OUT].forEach(event => {
152+
this._register(addDisposableListener(element, event, e => {
153+
EventHelper.stop(e);
154+
element.classList.remove('active');
155155
}));
156156
});
157157
}
158158

159-
onClick(event: DOM.EventLike): void {
160-
DOM.EventHelper.stop(event, true);
159+
onClick(event: EventLike): void {
160+
EventHelper.stop(event, true);
161161

162162
const context = types.isUndefinedOrNull(this._context) ? this.options?.useEventAsContext ? event : undefined : this._context;
163163
this.actionRunner.run(this._action, context);
@@ -166,14 +166,14 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
166166
focus(): void {
167167
if (this.element) {
168168
this.element.focus();
169-
DOM.addClass(this.element, 'focused');
169+
this.element.classList.add('focused');
170170
}
171171
}
172172

173173
blur(): void {
174174
if (this.element) {
175175
this.element.blur();
176-
DOM.removeClass(this.element, 'focused');
176+
this.element.classList.remove('focused');
177177
}
178178
}
179179

@@ -199,7 +199,7 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
199199

200200
dispose(): void {
201201
if (this.element) {
202-
DOM.removeNode(this.element);
202+
this.element.remove();
203203
this.element = undefined;
204204
}
205205

@@ -233,7 +233,7 @@ export class ActionViewItem extends BaseActionViewItem {
233233
super.render(container);
234234

235235
if (this.element) {
236-
this.label = DOM.append(this.element, DOM.$('a.action-label'));
236+
this.label = append(this.element, $('a.action-label'));
237237
}
238238

239239
if (this.label) {
@@ -249,7 +249,7 @@ export class ActionViewItem extends BaseActionViewItem {
249249
}
250250

251251
if (this.options.label && this.options.keybinding && this.element) {
252-
DOM.append(this.element, DOM.$('span.keybinding')).textContent = this.options.keybinding;
252+
append(this.element, $('span.keybinding')).textContent = this.options.keybinding;
253253
}
254254

255255
this.updateClass();
@@ -294,23 +294,23 @@ export class ActionViewItem extends BaseActionViewItem {
294294

295295
updateClass(): void {
296296
if (this.cssClass && this.label) {
297-
DOM.removeClasses(this.label, this.cssClass);
297+
removeClasses(this.label, this.cssClass);
298298
}
299299

300300
if (this.options.icon) {
301301
this.cssClass = this.getAction().class;
302302

303303
if (this.label) {
304-
DOM.addClass(this.label, 'codicon');
304+
this.label.classList.add('codicon');
305305
if (this.cssClass) {
306-
DOM.addClasses(this.label, this.cssClass);
306+
addClasses(this.label, this.cssClass);
307307
}
308308
}
309309

310310
this.updateEnabled();
311311
} else {
312312
if (this.label) {
313-
DOM.removeClass(this.label, 'codicon');
313+
this.label.classList.remove('codicon');
314314
}
315315
}
316316
}
@@ -319,32 +319,32 @@ export class ActionViewItem extends BaseActionViewItem {
319319
if (this.getAction().enabled) {
320320
if (this.label) {
321321
this.label.removeAttribute('aria-disabled');
322-
DOM.removeClass(this.label, 'disabled');
322+
this.label.classList.remove('disabled');
323323
this.label.tabIndex = 0;
324324
}
325325

326326
if (this.element) {
327-
DOM.removeClass(this.element, 'disabled');
327+
this.element.classList.remove('disabled');
328328
}
329329
} else {
330330
if (this.label) {
331331
this.label.setAttribute('aria-disabled', 'true');
332-
DOM.addClass(this.label, 'disabled');
333-
DOM.removeTabIndexAndUpdateFocus(this.label);
332+
this.label.classList.add('disabled');
333+
removeTabIndexAndUpdateFocus(this.label);
334334
}
335335

336336
if (this.element) {
337-
DOM.addClass(this.element, 'disabled');
337+
this.element.classList.add('disabled');
338338
}
339339
}
340340
}
341341

342342
updateChecked(): void {
343343
if (this.label) {
344344
if (this.getAction().checked) {
345-
DOM.addClass(this.label, 'checked');
345+
this.label.classList.add('checked');
346346
} else {
347-
DOM.removeClass(this.label, 'checked');
347+
this.label.classList.remove('checked');
348348
}
349349
}
350350
}

‎src/vs/base/browser/ui/actionbar/actionbar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ export class ActionBar extends Disposable implements IActionRunner {
475475

476476
this._actionIds = [];
477477

478-
DOM.removeNode(this.getContainer());
478+
this.getContainer().remove();
479479

480480
super.dispose();
481481
}

‎src/vs/base/browser/ui/button/button.ts‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./button';
7-
import * as DOM from 'vs/base/browser/dom';
87
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
98
import { KeyCode } from 'vs/base/common/keyCodes';
109
import { Color } from 'vs/base/common/color';
1110
import { mixin } from 'vs/base/common/objects';
1211
import { Event as BaseEvent, Emitter } from 'vs/base/common/event';
1312
import { Disposable } from 'vs/base/common/lifecycle';
14-
import { Gesture, EventType } from 'vs/base/browser/touch';
13+
import { Gesture, EventType as TouchEventType } from 'vs/base/browser/touch';
1514
import { renderCodicons } from 'vs/base/browser/codicons';
15+
import { addDisposableListener, IFocusTracker, EventType, EventHelper, trackFocus, reset, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
1616

1717
export interface IButtonOptions extends IButtonStyles {
1818
readonly title?: boolean | string;
@@ -52,7 +52,7 @@ export class Button extends Disposable {
5252
private _onDidClick = this._register(new Emitter<Event>());
5353
get onDidClick(): BaseEvent<Event> { return this._onDidClick.event; }
5454

55-
private focusTracker: DOM.IFocusTracker;
55+
private focusTracker: IFocusTracker;
5656

5757
constructor(container: HTMLElement, options?: IButtonOptions) {
5858
super();
@@ -71,26 +71,26 @@ export class Button extends Disposable {
7171
this.buttonBorder = this.options.buttonBorder;
7272

7373
this._element = document.createElement('a');
74-
DOM.addClass(this._element, 'monaco-button');
74+
this._element.classList.add('monaco-button');
7575
this._element.tabIndex = 0;
7676
this._element.setAttribute('role', 'button');
7777

7878
container.appendChild(this._element);
7979

8080
this._register(Gesture.addTarget(this._element));
8181

82-
[DOM.EventType.CLICK, EventType.Tap].forEach(eventType => {
83-
this._register(DOM.addDisposableListener(this._element, eventType, e => {
82+
[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
83+
this._register(addDisposableListener(this._element, eventType, e => {
8484
if (!this.enabled) {
85-
DOM.EventHelper.stop(e);
85+
EventHelper.stop(e);
8686
return;
8787
}
8888

8989
this._onDidClick.fire(e);
9090
}));
9191
});
9292

93-
this._register(DOM.addDisposableListener(this._element, DOM.EventType.KEY_DOWN, e => {
93+
this._register(addDisposableListener(this._element, EventType.KEY_DOWN, e => {
9494
const event = new StandardKeyboardEvent(e);
9595
let eventHandled = false;
9696
if (this.enabled && (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
@@ -102,22 +102,22 @@ export class Button extends Disposable {
102102
}
103103

104104
if (eventHandled) {
105-
DOM.EventHelper.stop(event, true);
105+
EventHelper.stop(event, true);
106106
}
107107
}));
108108

109-
this._register(DOM.addDisposableListener(this._element, DOM.EventType.MOUSE_OVER, e => {
110-
if (!DOM.hasClass(this._element, 'disabled')) {
109+
this._register(addDisposableListener(this._element, EventType.MOUSE_OVER, e => {
110+
if (!this._element.classList.contains('disabled')) {
111111
this.setHoverBackground();
112112
}
113113
}));
114114

115-
this._register(DOM.addDisposableListener(this._element, DOM.EventType.MOUSE_OUT, e => {
115+
this._register(addDisposableListener(this._element, EventType.MOUSE_OUT, e => {
116116
this.applyStyles(); // restore standard styles
117117
}));
118118

119119
// Also set hover background when button is focused for feedback
120-
this.focusTracker = this._register(DOM.trackFocus(this._element));
120+
this.focusTracker = this._register(trackFocus(this._element));
121121
this._register(this.focusTracker.onDidFocus(() => this.setHoverBackground()));
122122
this._register(this.focusTracker.onDidBlur(() => this.applyStyles())); // restore standard styles
123123

@@ -175,11 +175,9 @@ export class Button extends Disposable {
175175
}
176176

177177
set label(value: string) {
178-
if (!DOM.hasClass(this._element, 'monaco-text-button')) {
179-
DOM.addClass(this._element, 'monaco-text-button');
180-
}
178+
this._element.classList.add('monaco-text-button');
181179
if (this.options.supportCodicons) {
182-
DOM.reset(this._element, ...renderCodicons(value));
180+
reset(this._element, ...renderCodicons(value));
183181
} else {
184182
this._element.textContent = value;
185183
}
@@ -191,23 +189,23 @@ export class Button extends Disposable {
191189
}
192190

193191
set icon(iconClassName: string) {
194-
DOM.addClass(this._element, iconClassName);
192+
this._element.classList.add(iconClassName);
195193
}
196194

197195
set enabled(value: boolean) {
198196
if (value) {
199-
DOM.removeClass(this._element, 'disabled');
197+
this._element.classList.remove('disabled');
200198
this._element.setAttribute('aria-disabled', String(false));
201199
this._element.tabIndex = 0;
202200
} else {
203-
DOM.addClass(this._element, 'disabled');
201+
this._element.classList.add('disabled');
204202
this._element.setAttribute('aria-disabled', String(true));
205-
DOM.removeTabIndexAndUpdateFocus(this._element);
203+
removeTabIndexAndUpdateFocus(this._element);
206204
}
207205
}
208206

209207
get enabled() {
210-
return !DOM.hasClass(this._element, 'disabled');
208+
return !this._element.classList.contains('disabled');
211209
}
212210

213211
focus(): void {
@@ -235,7 +233,7 @@ export class ButtonGroup extends Disposable {
235233

236234
// Implement keyboard access in buttons if there are multiple
237235
if (count > 1) {
238-
this._register(DOM.addDisposableListener(button.element, DOM.EventType.KEY_DOWN, e => {
236+
this._register(addDisposableListener(button.element, EventType.KEY_DOWN, e => {
239237
const event = new StandardKeyboardEvent(e);
240238
let eventHandled = true;
241239

@@ -251,7 +249,7 @@ export class ButtonGroup extends Disposable {
251249

252250
if (eventHandled && typeof buttonIndexToFocus === 'number') {
253251
this._buttons[buttonIndexToFocus].focus();
254-
DOM.EventHelper.stop(e, true);
252+
EventHelper.stop(e, true);
255253
}
256254

257255
}));

‎src/vs/base/browser/ui/contextview/contextview.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export class ContextView extends Disposable {
139139
if (this.shadowRoot) {
140140
this.shadowRoot.removeChild(this.view);
141141
this.shadowRoot = null;
142-
DOM.removeNode(this.shadowRootHostElement!);
142+
this.shadowRootHostElement?.remove();
143143
this.shadowRootHostElement = null;
144144
} else {
145145
this.container.removeChild(this.view);

0 commit comments

Comments
 (0)