Skip to content

Commit 32341f0

Browse files
authored
Fix/[ACS-9224] Revert fixed critical accessibility issues in datatable.component (#10694)
* [ci:force] * Revert "[ACS-9224] Fixed critical accessibility issues in datatable.component (#10679)" This reverts commit 58fa965.
1 parent cc9eca6 commit 32341f0

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed

lib/core/src/lib/datatable/components/datatable/datatable.component.html

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
</div>
2929

3030
<!-- Columns -->
31-
<th *ngIf="multiselect" class="adf-datatable-cell-header adf-datatable-checkbox" role="columnheader">
31+
<div *ngIf="multiselect" class="adf-datatable-cell-header adf-datatable-checkbox">
3232
<mat-checkbox [indeterminate]="isSelectAllIndeterminate"
3333
[checked]="isSelectAllChecked"
3434
(change)="onSelectAllClick($event)"
3535
class="adf-checkbox-sr-only"
3636
[aria-label]="'ADF-DATATABLE.ACCESSIBILITY.SELECT_ALL' | translate">
3737
{{ 'ADF-DATATABLE.ACCESSIBILITY.SELECT_ALL' | translate }}
3838
</mat-checkbox>
39-
</th>
39+
</div>
4040

4141
<ng-container
4242
*ngFor="
@@ -54,7 +54,7 @@
5454
'adf-datatable__header--sorted-asc': isColumnSorted(col, 'asc'),
5555
'adf-datatable__header--sorted-desc': isColumnSorted(col, 'desc')}"
5656
[ngStyle]="(col.width) && !lastColumn && {'flex': getFlexValue(col)}"
57-
[attr.aria-label]="(col.title ? (col.title | translate) : '') + (col.subtitle ? ' ' + col.subtitle : '')"
57+
[attr.aria-label]="(col.title | translate) + (col.subtitle ? ' ' + col.subtitle : '')"
5858
(click)="onColumnHeaderClick(col, $event)"
5959
(keyup.enter)="onColumnHeaderClick(col, $event)"
6060
role="columnheader"
@@ -156,27 +156,24 @@
156156
[class.adf-datatable-actions-menu-provided]="showProvidedActions"
157157
>
158158
<ng-container *ngIf="mainActionTemplate">
159-
<td role="gridcell">
160-
<button
161-
data-automation-id="adf-datatable-main-menu-button"
162-
title="{{ 'ADF-DATATABLE.CONTENT-ACTIONS.SELECT_COLUMNS' | translate }}"
163-
[attr.aria-label]="'ADF-DATATABLE.CONTENT-ACTIONS.SELECT_COLUMNS' | translate"
164-
mat-icon-button
165-
#mainMenuTrigger="matMenuTrigger"
166-
(click)="onMainMenuOpen()"
167-
[matMenuTriggerFor]="mainMenu">
168-
<mat-icon>view_week_outline</mat-icon>
169-
</button>
170-
<mat-menu #mainMenu (closed)="onMainMenuClosed()">
171-
<div #mainMenuTemplate role="presentation" (keydown.tab)="$event.stopPropagation()">
172-
<ng-container
173-
[ngTemplateOutlet]="mainActionTemplate"
174-
[ngTemplateOutletContext]="{
175-
$implicit: mainMenuTrigger
176-
}" />
177-
</div>
178-
</mat-menu>
179-
</td>
159+
<button
160+
data-automation-id="adf-datatable-main-menu-button"
161+
title="{{ 'ADF-DATATABLE.CONTENT-ACTIONS.SELECT_COLUMNS' | translate }}"
162+
mat-icon-button
163+
#mainMenuTrigger="matMenuTrigger"
164+
(click)="onMainMenuOpen()"
165+
[matMenuTriggerFor]="mainMenu">
166+
<mat-icon>view_week_outline</mat-icon>
167+
</button>
168+
<mat-menu #mainMenu (closed)="onMainMenuClosed()">
169+
<div #mainMenuTemplate role="presentation" (keydown.tab)="$event.stopPropagation()">
170+
<ng-container
171+
[ngTemplateOutlet]="mainActionTemplate"
172+
[ngTemplateOutletContext]="{
173+
$implicit: mainMenuTrigger
174+
}" />
175+
</div>
176+
</mat-menu>
180177
<span class="adf-sr-only">{{ 'ADF-DATATABLE.ACCESSIBILITY.ACTIONS' | translate }}</span>
181178
</ng-container>
182179
</div>
@@ -240,12 +237,12 @@
240237
</mat-menu>
241238
</div>
242239

243-
<td *ngIf="multiselect"
240+
<label *ngIf="multiselect"
244241
(keydown.enter)="onEnterKeyPressed(row, $any($event))"
245242
(click)="onCheckboxLabelClick(row, $event)"
246-
role="gridcell"
243+
[for]="'select-file-' + idx"
247244
class="adf-datatable-cell adf-datatable-checkbox adf-datatable-checkbox-single"
248-
tabindex="-1">
245+
tabindex="0">
249246
<mat-checkbox
250247
[id]="'select-file-' + idx"
251248
[disabled]="!row?.isSelectable"
@@ -260,7 +257,7 @@
260257
class="adf-checkbox-sr-only">
261258
{{ 'ADF-DATATABLE.ACCESSIBILITY.SELECT_FILE' | translate }}
262259
</mat-checkbox>
263-
</td>
260+
</label>
264261

265262
<div
266263
*ngFor="let col of getVisibleColumns(); let lastColumn = last;"

0 commit comments

Comments
 (0)