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

Fix for auto resize column headers, (#10909)

Browse Source 
* Fixed scroll to top

* removed brackets

* Don't trigger the cellSelectionModel when className is the resizable handler

* Added message for header listener

Co-authored-by: Amir Omidi <amomidi@microsoft.com>
This commit is contained in:
Alex Ma
2020-06-17 15:22:05 -07:00
committed by GitHub
parent 77ba5a36aa
commit 95107f1f61
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/base/browser/ui/table/plugins/cellSelectionModel.plugin.ts
View File

@@ -15,6 +15,10 @@ const defaults: ICellSelectionModelOptions = {
selectActiveCell: true selectActiveCell: true
}; };
interface EventTargetWithClassName extends EventTarget {
className: string | undefined;
}
export class CellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slick.Range>> { export class CellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slick.Range>> {
private grid!: Slick.Grid<T>; private grid!: Slick.Grid<T>;
private selector: ICellRangeSelector<T>; private selector: ICellRangeSelector<T>;
@@ -110,6 +114,9 @@ export class CellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slic
} }
private handleHeaderClick(e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>) { private handleHeaderClick(e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>) {
if ((e.target as EventTargetWithClassName).className === 'slick-resizable-handle') {
return;
}
if (!isUndefinedOrNull(args.column)) { if (!isUndefinedOrNull(args.column)) {
let columnIndex = this.grid.getColumnIndex(args.column.id!); let columnIndex = this.grid.getColumnIndex(args.column.id!);
if (this.grid.canCellBeSelected(0, columnIndex)) { if (this.grid.canCellBeSelected(0, columnIndex)) {

7
src/sql/workbench/contrib/query/browser/gridPanel.ts
View File

@@ -482,6 +482,8 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
this.table.registerPlugin(new AdditionalKeyBindings()); this.table.registerPlugin(new AdditionalKeyBindings());
this._register(this.table.onContextMenu(this.contextMenu, this)); this._register(this.table.onContextMenu(this.contextMenu, this));
this._register(this.table.onClick(this.onTableClick, this)); this._register(this.table.onClick(this.onTableClick, this));
//This listener is used for correcting auto-scroling when clicking on the header for reszing.
this._register(this.table.onHeaderClick(this.onHeaderClick, this));
if (this.styles) { if (this.styles) {
this.table.style(this.styles); this.table.style(this.styles);
@@ -580,6 +582,11 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
this._state = val; this._state = val;
} }
private onHeaderClick(event: ITableMouseEvent) {
//header clicks must be accounted for as they force the table to scroll to the top;
this.scrolled = false;
}
private onTableClick(event: ITableMouseEvent) { private onTableClick(event: ITableMouseEvent) {
// account for not having the number column // account for not having the number column
let column = this.resultSet.columnInfo[event.cell.cell - 1]; let column = this.resultSet.columnInfo[event.cell.cell - 1];