Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vscode-mssql bugs fixes for table #17225

Merged
merged 4 commits into from
Feb 4, 2022
Merged

Vscode-mssql bugs fixes for table #17225

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6878296
fixed wrong names for aria label
smartguest Jan 28, 2022
9839343
partially fixed tab order
smartguest Jan 28, 2022
86164ea
removed tabindex="-1"
smartguest Jan 31, 2022
7a28032
fixed tab indexes
smartguest Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/views/htmlcontent/src/js/components/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ export interface IGridDataSet {
// tslint:disable:max-line-length
const template = `
<div class="fullsize vertBox">
<div *ngIf="dataSets.length > 0" role="button" id="resultspane" tabIndex="0" class="boxRow header collapsible"
<div *ngIf="dataSets.length > 0" role="button" id="resultspane" tabIndex="1" class="boxRow header collapsible"
[class.collapsed]="!resultActive"
(click)="toggleResultsPane()"
(keydown)="handleResultsKeydown($event)"
[attr.aria-label]="Constants.resultPaneLabel"
[attr.aria-expanded]="!resultActive">
[attr.aria-expanded]="resultActive">
<span> {{Constants.resultPaneLabel}} </span>
<span class="shortCut"> {{resultShortcut}} </span>
</div>
<div id="results" tabIndex="0" *ngIf="renderedDataSets.length > 0" class="results vertBox scrollable"
<div id="results" *ngIf="renderedDataSets.length > 0" class="results vertBox scrollable"
(onScroll)="onScroll($event)"
[scrollEnabled]="scrollEnabled"
[class.hidden]="!resultActive">
<div class="boxRow content horzBox slickgrid" *ngFor="let dataSet of renderedDataSets; let i = index"
[style.max-height]="renderedDataSets.length > 1 ? dataSet.maxHeight + 'px' : 'inherit'"
[style.min-height]="renderedDataSets.length > 1 ? dataSet.minHeight + 'px' : 'inherit'"
[style.font-size]="resultsFontSize + 'px'">
<slick-grid tabindex="0" #slickgrid id="slickgrid_{{i}}" [columnDefinitions]="dataSet.columnDefinitions"
<slick-grid tabindex="2" #slickgrid id="slickgrid_{{i}}" [columnDefinitions]="dataSet.columnDefinitions"
[ngClass]="i === activeGrid ? 'active' : ''"
[dataRows]="dataSet.dataRows"
(contextMenu)="openContextMenu($event, dataSet.batchId, dataSet.resultId, i)"
Expand All @@ -73,7 +73,7 @@ const template = `
</slick-grid>
<span class="boxCol content vertBox">
<div class="boxRow content maxHeight" *ngFor="let icon of dataIcons">
<div *ngIf="icon.showCondition()" class="gridIcon">
<div *ngIf="icon.showCondition()" class="gridIcon" tabindex="3">
<a class="icon" href="#" role="button"
(click)="icon.functionality(dataSet.batchId, dataSet.resultId, i)"
[title]="icon.hoverText()" [ngClass]="icon.icon()">
Expand All @@ -85,18 +85,18 @@ const template = `
</div>
<context-menu #contextmenu (clickEvent)="handleContextClick($event)"></context-menu>
<msg-context-menu #messagescontextmenu (clickEvent)="handleMessagesContextClick($event)"></msg-context-menu>
<div id="messagepane" role="button" tabIndex="1" class="boxRow header collapsible"
<div id="messagepane" role="button" tabIndex="4" class="boxRow header collapsible"
[class.collapsed]="!messageActive"
[attr.aria-label]="Constants.messagePaneLabel"
[attr.aria-expanded]="!messageActive"
[attr.aria-expanded]="messageActive"
(click)="toggleMessagesPane()"
(keydown)="handleMessagesKeydown($event)"
style="position: relative">
<div id="messageResizeHandle" class="resizableHandle"></div>
<span> {{Constants.messagePaneLabel}} </span>
<span class="shortCut"> {{messageShortcut}} </span>
</div>
<div id="messages" class="scrollable messages" [class.hidden]="!messageActive"
<div id="messages" class="scrollable messages" tabindex="5" [class.hidden]="!messageActive"
(contextmenu)="openMessagesContextMenu($event)"
(mousedown)="onMouseDown($event)">
<br>
Expand Down