Skip to content

Commit ba9f2e0

Browse files
authored
Merge pull request #4364 from Tyriar/dom_remove
Replace dom helper with HTMLElement.remove()
2 parents 91946dc + b3fb8db commit ba9f2e0

File tree

6 files changed

+8
-59
lines changed

6 files changed

+8
-59
lines changed

addons/xterm-addon-canvas/src/BaseRenderLayer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* @license MIT
44
*/
55

6-
import { removeElementFromParent } from 'browser/Dom';
76
import { acquireTextureAtlas } from 'browser/renderer/shared/CharAtlasCache';
87
import { TEXT_BASELINE } from 'browser/renderer/shared/Constants';
98
import { tryDrawCustomChar } from 'browser/renderer/shared/CustomGlyphs';
@@ -74,7 +73,7 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer
7473
}));
7574

7675
this.register(toDisposable(() => {
77-
removeElementFromParent(this._canvas);
76+
this._canvas.remove();
7877
this._charAtlas?.dispose();
7978
}));
8079
}

src/browser/AccessibilityManager.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { addDisposableDomListener } from 'browser/Lifecycle';
1212
import { Disposable, toDisposable } from 'common/Lifecycle';
1313
import { ScreenDprMonitor } from 'browser/ScreenDprMonitor';
1414
import { IRenderService } from 'browser/services/Services';
15-
import { removeElementFromParent } from 'browser/Dom';
1615

1716
const MAX_ROWS_TO_READ = 20;
1817

@@ -105,7 +104,7 @@ export class AccessibilityManager extends Disposable {
105104
// media query that drives the ScreenDprMonitor isn't supported
106105
this.register(addDisposableDomListener(window, 'resize', () => this._refreshRowsDimensions()));
107106
this.register(toDisposable(() => {
108-
removeElementFromParent(this._accessibilityTreeRoot);
107+
this._accessibilityTreeRoot.remove();
109108
this._rowElements.length = 0;
110109
}));
111110
}
@@ -240,7 +239,7 @@ export class AccessibilityManager extends Disposable {
240239

241240
// Only detach/attach on mac as otherwise messages can go unaccounced
242241
if (isMac) {
243-
removeElementFromParent(this._liveRegion);
242+
this._liveRegion.remove();
244243
}
245244
}
246245

src/browser/Dom.test.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/browser/Dom.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/browser/renderer/dom/DomRenderer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* @license MIT
44
*/
55

6-
import { removeElementFromParent } from 'browser/Dom';
76
import { BOLD_CLASS, CURSOR_BLINK_CLASS, CURSOR_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory, ITALIC_CLASS } from 'browser/renderer/dom/DomRendererRowFactory';
87
import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants';
98
import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
@@ -87,7 +86,10 @@ export class DomRenderer extends Disposable implements IRenderer {
8786

8887
// Outside influences such as React unmounts may manipulate the DOM before our disposal.
8988
// https://github.com/xtermjs/xterm.js/issues/2960
90-
removeElementFromParent(this._rowContainer, this._selectionContainer, this._themeStyleElement, this._dimensionsStyleElement);
89+
this._rowContainer.remove();
90+
this._selectionContainer.remove();
91+
this._themeStyleElement.remove();
92+
this._dimensionsStyleElement.remove();
9193
}));
9294
}
9395

typings/xterm.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ declare module 'xterm' {
11791179
* @param range The buffer range of the link.
11801180
*/
11811181
leave?(event: MouseEvent, text: string, range: IBufferRange): void;
1182-
1182+
11831183
/**
11841184
* Whether to receive non-HTTP URLs from LinkProvider. When false, any usage of non-HTTP URLs
11851185
* will be ignored. Enabling this option without proper protection in `activate` function

0 commit comments

Comments
 (0)