From 9819e97f7b920696d8eef67d26ef7f6adbd5e2d5 Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Mon, 6 Apr 2020 19:38:40 -0700 Subject: [PATCH] fix accessibility issues (#9824) * fix accessibility issues * fix no active cell * more fixes --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 6 +++--- remote/yarn.lock | 6 +++--- src/sql/base/browser/ui/table/table.ts | 2 +- src/sql/workbench/contrib/query/browser/gridPanel.ts | 9 +++++++++ yarn.lock | 6 +++--- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 8611b3538c..e32ad49b2d 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "rxjs": "5.4.0", "sanitize-html": "^1.19.1", "semver-umd": "^5.5.5", - "slickgrid": "github:anthonydresser/SlickGrid#2.3.32", + "slickgrid": "github:anthonydresser/SlickGrid#2.3.33", "spdlog": "^0.11.1", "sudo-prompt": "9.1.1", "v8-inspect-profiler": "^0.0.20", diff --git a/remote/package.json b/remote/package.json index 25220035ee..1d81b26309 100644 --- a/remote/package.json +++ b/remote/package.json @@ -32,7 +32,7 @@ "rxjs": "5.4.0", "sanitize-html": "^1.19.1", "semver-umd": "^5.5.5", - "slickgrid": "github:anthonydresser/SlickGrid#2.3.32", + "slickgrid": "github:anthonydresser/SlickGrid#2.3.33", "spdlog": "^0.11.1", "vscode-nsfw": "1.2.8", "vscode-proxy-agent": "^0.5.2", diff --git a/remote/web/package.json b/remote/web/package.json index 5088494369..62cd0c6e26 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -21,7 +21,7 @@ "rxjs": "5.4.0", "sanitize-html": "^1.19.1", "semver-umd": "^5.5.5", - "slickgrid": "github:anthonydresser/SlickGrid#2.3.32", + "slickgrid": "github:anthonydresser/SlickGrid#2.3.33", "vscode-textmate": "4.4.0", "xterm": "4.5.0-beta.4", "xterm-addon-search": "0.5.0", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 04e62d7f98..f20d87ae48 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -307,9 +307,9 @@ semver-umd@^5.5.5: resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.5.tgz#a2e4280d0e92a2b27695c18811f0e939e144d86f" integrity sha512-8rUq0nnTzlexpAdYmm8UDYsLkBn0MnBkfrGWPmyDBDDzv71dPOH07szOOaLj/5hO3BYmumYwS+wp3C60zLzh5g== -"slickgrid@github:anthonydresser/SlickGrid#2.3.32": - version "2.3.32" - resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/3909801b6c5de2b92147eeb474e8082df95b7098" +"slickgrid@github:anthonydresser/SlickGrid#2.3.33": + version "2.3.33" + resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/7555f28a55a6663469b716dcd288bb35179a8ffd" source-map@^0.6.1: version "0.6.1" diff --git a/remote/yarn.lock b/remote/yarn.lock index 761cdd74b3..8dee1187bf 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -610,9 +610,9 @@ semver@^5.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -"slickgrid@github:anthonydresser/SlickGrid#2.3.32": - version "2.3.32" - resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/3909801b6c5de2b92147eeb474e8082df95b7098" +"slickgrid@github:anthonydresser/SlickGrid#2.3.33": + version "2.3.33" + resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/7555f28a55a6663469b716dcd288bb35179a8ffd" smart-buffer@4.0.2: version "4.0.2" diff --git a/src/sql/base/browser/ui/table/table.ts b/src/sql/base/browser/ui/table/table.ts index 7bf74b9cce..9ec5095480 100644 --- a/src/sql/base/browser/ui/table/table.ts +++ b/src/sql/base/browser/ui/table/table.ts @@ -234,7 +234,7 @@ export class Table extends Widget implements IDisposa this._grid.setActiveCell(0, 1); } - get activeCell(): Slick.Cell { + get activeCell(): Slick.Cell | null { return this._grid.getActiveCell(); } diff --git a/src/sql/workbench/contrib/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts index 8914fe98bf..5b3772b0c2 100644 --- a/src/sql/workbench/contrib/query/browser/gridPanel.ts +++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts @@ -108,6 +108,7 @@ export class GridPanel extends Disposable { public focus(): void { // will need to add logic to save the focused grid and focus that + this.tables[0].focus(); } public set queryRunner(runner: QueryRunner) { @@ -352,6 +353,14 @@ export abstract class GridTableBase extends Disposable implements IView { return ((this.resultSet.rowCount) * this.rowHeight) + HEADER_HEIGHT + ESTIMATED_SCROLL_BAR_HEIGHT; } + public focus(): void { + if (!this.table.activeCell) { + this.table.setActiveCell(0, 1); + this.selectionModel.setSelectedRanges([new Slick.Range(0, 1)]); + } + this.table.focus(); + } + constructor( state: GridTableState, protected _resultSet: azdata.ResultSetSummary, diff --git a/yarn.lock b/yarn.lock index 0475aed715..73535d466d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8564,9 +8564,9 @@ slice-ansi@^2.0.0, slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -"slickgrid@github:anthonydresser/SlickGrid#2.3.32": - version "2.3.32" - resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/3909801b6c5de2b92147eeb474e8082df95b7098" +"slickgrid@github:anthonydresser/SlickGrid#2.3.33": + version "2.3.33" + resolved "https://codeload.github.com/anthonydresser/SlickGrid/tar.gz/7555f28a55a6663469b716dcd288bb35179a8ffd" smart-buffer@4.0.2: version "4.0.2"