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

added WIP fix to new row revert (#24422) (#24433)

Browse Source
This commit is contained in:
Alex Ma
2023-09-14 14:56:52 -07:00
committed by GitHub
parent 85f5b13db6
commit 41077b47d3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts
View File

@@ -82,9 +82,12 @@ export class EditDataGridPanel extends GridParentComponent {
// Prevent the cell submission function from being called multiple times. // Prevent the cell submission function from being called multiple times.
private cellSubmitInProgress: boolean; private cellSubmitInProgress: boolean;
// Prevent the tab focus from doing any damage to the table while its being reverted. // Prevent the tab focus from doing any damage to the table while a cell is being reverted.
private cellRevertInProgress: boolean; private cellRevertInProgress: boolean;
// Prevent the tab focus from doing any damage to the table while a row is being reverted.
private rowRevertInProgress: boolean
// Manually submit the cell after edit end if it's the null row. // Manually submit the cell after edit end if it's the null row.
private isInNullRow: boolean; private isInNullRow: boolean;
@@ -343,7 +346,7 @@ export class EditDataGridPanel extends GridParentComponent {
// definition for the column (ie, the selection was reset) // definition for the column (ie, the selection was reset)
// Also skip when cell updates are happening as we don't want to affect other cells while this is going on. // Also skip when cell updates are happening as we don't want to affect other cells while this is going on.
// (focus should shift back to current cell if it is set) // (focus should shift back to current cell if it is set)
if (row === undefined || column === undefined || this.cellSubmitInProgress || this.cellRevertInProgress) { if (row === undefined || column === undefined || this.cellSubmitInProgress || this.cellRevertInProgress || this.rowRevertInProgress) {
return; return;
} }
@@ -626,6 +629,7 @@ export class EditDataGridPanel extends GridParentComponent {
// Private Helper Functions //////////////////////////////////////////////////////////////////////////// // Private Helper Functions ////////////////////////////////////////////////////////////////////////////
private async revertCurrentRow(): Promise<void> { private async revertCurrentRow(): Promise<void> {
this.rowRevertInProgress = true;
let currentNewRowIndex = this.dataSet.totalRows - 2; let currentNewRowIndex = this.dataSet.totalRows - 2;
if (this.newRowVisible && this.currentCell.row === currentNewRowIndex) { if (this.newRowVisible && this.currentCell.row === currentNewRowIndex) {
// revert our last new row // revert our last new row
@@ -664,6 +668,7 @@ export class EditDataGridPanel extends GridParentComponent {
} }
} }
} }
this.rowRevertInProgress = false;
} }
private async revertCurrentCell(): Promise<void> { private async revertCurrentCell(): Promise<void> {