waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3227 from marvinthepa/3225_onSelectionChange_on_clear

Browse Source 
Store old selection when firing onSelectionChange
This commit is contained in:
Daniel Imms
2021-01-22 08:37:36 -08:00
committed by GitHub
parent a1dc85ee57 554b4a8224
commit 4da5d557a5
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/services/SelectionService.ts
+16 -13
View File
@@ -685,23 +685,22 @@ export class SelectionService extends Disposable implements ISelectionService {
}
}
} else {
this._fireIfSelectionChanged();
this._fireEventIfSelectionChanged();
}
}
private _fireIfSelectionChanged(): void {
// Fire if there is no selection
const hasSelection = this.hasSelection;
private _fireEventIfSelectionChanged(): void {
const start = this._model.finalSelectionStart;
const end = this._model.finalSelectionEnd;
const hasSelection = !!start && !!end && (start[0] !== end[0] || start[1] !== end[1]);
if (!hasSelection) {
if (this._oldHasSelection) {
this._onSelectionChange.fire();
this._fireOnSelectionChange(start, end, hasSelection);
}
return;
}
const start = this._model.finalSelectionStart;
const end = this._model.finalSelectionEnd;
// Sanity check, these should not be undefined as there is a selection
if (!start || !end) {
return;
@@ -711,13 +710,17 @@ export class SelectionService extends Disposable implements ISelectionService {
start[0] !== this._oldSelectionStart[0] || start[1] !== this._oldSelectionStart[1] ||
end[0] !== this._oldSelectionEnd[0] || end[1] !== this._oldSelectionEnd[1])) {
this._oldSelectionStart = start;
this._oldSelectionEnd = end;
this._oldHasSelection = hasSelection;
this._onSelectionChange.fire();
this._fireOnSelectionChange(start, end, hasSelection);
}
}
private _fireOnSelectionChange(start: [number, number] | undefined, end: [number, number] | undefined, hasSelection: boolean): void {
this._oldSelectionStart = start;
this._oldSelectionEnd = end;
this._oldHasSelection = hasSelection;
this._onSelectionChange.fire();
}
private _onBufferActivate(e: {activeBuffer: IBuffer, inactiveBuffer: IBuffer}): void {
this.clearSelection();
// Only adjust the selection on trim, shiftElements is rarely used (only in
@@ -762,7 +765,7 @@ export class SelectionService extends Disposable implements ISelectionService {
public rightClickSelect(ev: MouseEvent): void {
if (!this._isClickInSelection(ev)) {
this._selectWordAtCursor(ev);
this._fireIfSelectionChanged();
this._fireEventIfSelectionChanged();
}
}