ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fire selection event when re-entered (#14857)

Browse Source
This commit is contained in:
Alan Ren
2021-03-24 16:40:20 -07:00
committed by GitHub
parent f59e9b5695
commit 2b7535f377
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
View File

@@ -42,6 +42,13 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
private _colorTheme: IColorTheme; private _colorTheme: IColorTheme;
private _hasFocus: boolean; private _hasFocus: boolean;
/**
* The flag is set to true when the table gains focus. When a row is selected and the flag is true the row selected event will
* fire regardless whether the row is already selected.
*
*/
private _rowSelectionFocusFlag: boolean = false;
constructor( constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@Inject(forwardRef(() => ElementRef)) el: ElementRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef,
@@ -309,8 +316,9 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
if (!this.enableRowSelection) { if (!this.enableRowSelection) {
return; return;
} }
if (!this.isRowSelected(row)) { if (this._rowSelectionFocusFlag || !this.isRowSelected(row)) {
this._selectedRow = row; this._selectedRow = row;
this._rowSelectionFocusFlag = false;
this._changeRef.detectChanges(); this._changeRef.detectChanges();
this.fireEvent({ this.fireEvent({
@@ -370,6 +378,7 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
onFocusIn() { onFocusIn() {
this._hasFocus = true; this._hasFocus = true;
this._rowSelectionFocusFlag = true;
this._changeRef.detectChanges(); this._changeRef.detectChanges();
} }