Skip to content

chore(*): Add aria-describedby reference to error message element as … #12051

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

Merged
merged 9 commits into from
Sep 19, 2022
Merged

chore(*): Add aria-describedby reference to error message element as … #12051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4f1285
chore(*): Add aria-describedby reference to error message element as …
Sep 8, 2022
fb13fb8
chore(*): Test with removing aria-describeby that points to the heade…
Sep 8, 2022
5d8b669
chore(*): Update so that describeby includes both header ref and arro…
Sep 9, 2022
a1cbecf
Merge branch '14.1.x' into mkirova/improve-validator-aria
kdinev Sep 14, 2022
3d84cab
Merge branch '14.1.x' into mkirova/improve-validator-aria
dkamburov Sep 16, 2022
c79b36d
Merge branch '14.1.x' into mkirova/improve-validator-aria
dkamburov Sep 16, 2022
a0c6515
Merge branch '14.1.x' into mkirova/improve-validator-aria
dkamburov Sep 16, 2022
e13a1e3
Merge branch '14.1.x' into mkirova/improve-validator-aria
dkamburov Sep 19, 2022
2ff3d3b
Merge branch '14.1.x' into mkirova/improve-validator-aria
ChronosSF Sep 19, 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
15 changes: 10 additions & 5 deletions projects/igniteui-angular/src/lib/grids/cell.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
<igx-input-group displayDensity="compact" >
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[formControl]="formControl"
(compositionstart)="grid.crudService.isInCompositionMode = true"
Expand All @@ -86,7 +87,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down Expand Up @@ -131,7 +133,8 @@
<igx-input-group [formGroup]="formGroup">
<input
type="text"
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[formControl]="formControl"
igxInput
[igxDateTimeEditor]="column.defaultDateTimeFormat"
Expand All @@ -144,7 +147,8 @@
<igx-prefix *ngIf="grid.currencyPositionLeft">{{ currencyCodeSymbol }}</igx-prefix>
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand All @@ -157,7 +161,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down
10 changes: 7 additions & 3 deletions projects/igniteui-angular/src/lib/grids/cell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,14 +469,18 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy, CellT
public get readonly(): boolean {
return !this.editable;
}

/** @hidden @internal */
@HostBinding('attr.aria-describedby')
public get describeBy() {
return this.grid.id + '_' + this.column.field;
public get ariaDescribeBy() {
let describeBy = (this.gridID + '_' + this.column.field).replace('.', '_');
if (this.isInvalid) {
describeBy += ' ' + this.ariaErrorMessage;
}
return describeBy;
}

/** @hidden @internal */
@HostBinding('attr.aria-errormessage')
public get ariaErrorMessage() {
return this.grid.id + '_' + this.column.field + '_' + this.intRow.index + '_error';
}
Expand Down
15 changes: 10 additions & 5 deletions projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
<igx-input-group displayDensity="compact" >
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[formControl]="formControl"
(compositionstart)="grid.crudService.isInCompositionMode = true"
Expand All @@ -67,7 +68,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down Expand Up @@ -112,7 +114,8 @@
<igx-input-group [formGroup]="formGroup">
<input
type="text"
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[formControl]="formControl"
igxInput
[igxDateTimeEditor]="column.defaultDateTimeFormat"
Expand All @@ -125,7 +128,8 @@
<igx-prefix *ngIf="grid.currencyPositionLeft">{{ currencyCodeSymbol }}</igx-prefix>
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand All @@ -138,7 +142,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down
6 changes: 2 additions & 4 deletions projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<igx-grid-cell
class="igx-grid__td igx-grid__td--fw"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
[class.igx-grid__td--pinned]="col.pinned"
[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[class.igx-grid__td--bool]="col.dataType === 'boolean'"
Expand Down Expand Up @@ -129,7 +128,6 @@
<ng-template #expandableCellTemplate let-col>
<igx-expandable-grid-cell
[class.igx-grid__td--pinned]="col.pinned"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[class.igx-grid__td--number]="(col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency') && col.visibleIndex !== 0"
Expand Down Expand Up @@ -163,7 +161,7 @@
<igx-grid-cell
class="igx-grid__td igx-grid__td--fw"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"

[class.igx-grid__td--pinned]="col.pinned"
[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down Expand Up @@ -196,7 +194,7 @@
<igx-expandable-grid-cell
class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"

[class.igx-grid__td--pinned]="col.pinned"
[class.igx-grid__td--number]="(col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency') && col.visibleIndex !== 0"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down
4 changes: 2 additions & 2 deletions projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<igx-hierarchical-grid-cell
class="igx-grid__td igx-grid__td--fw"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"

[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[class.igx-grid__td--bool]="col.dataType === 'boolean'"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down Expand Up @@ -102,7 +102,7 @@
<igx-hierarchical-grid-cell *ngFor="let col of pinnedColumns | igxNotGrouped"
class="igx-grid__td igx-grid__td--fw igx-grid__td--pinned"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"

[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
[ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[igxForTrackBy]='grid.trackColumnChanges' #igxDirRef>
<igx-grid-cell #cell class="igx-grid__td igx-grid__td--fw"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"

[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[class.igx-grid__td--bool]="col.dataType === 'boolean'"
[ngClass]="this.getCellClass(col) | igxPivotCellStyleClasses:data[col.field]:data:getColumnData(col):viewIndex:grid.pipeTrigger"
Expand Down
2 changes: 0 additions & 2 deletions projects/igniteui-angular/src/lib/grids/summaries/summary-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<ng-template igxGridFor let-col [igxGridForOf]="unpinnedColumns | igxNotGrouped" [igxForScrollContainer]="grid.parentVirtDir" let-colIndex="index" [igxForScrollOrientation]="'horizontal'" [igxForContainerSize]="grid.unpinnedWidth" [igxForTrackBy]="grid.trackColumnChanges" [igxForSizePropName]='"calcPixelWidth"' #igxDirRef>
<igx-grid-summary-cell
class="igx-grid-summary igx-grid-summary--fw"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
role="cell"
[class.igx-grid-summary--cosy]="grid.displayDensity === 'cosy'"
[class.igx-grid-summary--compact]="grid.displayDensity === 'compact'"
Expand Down Expand Up @@ -43,7 +42,6 @@
<ng-template #summaryCellTemplate let-col>
<igx-grid-summary-cell *ngFor="let col of pinnedColumns | igxNotGrouped"
role="cell"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
class="igx-grid-summary igx-grid-summary--fw igx-grid-summary--pinned"
[class.igx-grid-summary--cosy]="grid.displayDensity === 'cosy'"
[class.igx-grid-summary--compact]="grid.displayDensity === 'compact'"
Expand Down
15 changes: 10 additions & 5 deletions projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
<igx-input-group displayDensity="compact" >
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[formControl]="formControl"
(compositionstart)="grid.crudService.isInCompositionMode = true"
Expand All @@ -87,7 +88,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down Expand Up @@ -132,7 +134,8 @@
<igx-input-group [formGroup]="formGroup">
<input
type="text"
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[formControl]="formControl"
igxInput
[igxDateTimeEditor]="column.defaultDateTimeFormat"
Expand All @@ -145,7 +148,8 @@
<igx-prefix *ngIf="grid.currencyPositionLeft">{{ currencyCodeSymbol }}</igx-prefix>
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand All @@ -158,7 +162,8 @@
<igx-input-group displayDensity="compact" [formGroup]="formGroup">
<input
igxInput
[attr.aria-errormessage]="ariaErrorMessage"
[attr.aria-describedby]="ariaDescribeBy"
[attr.aria-invalid]="isInvalid"
[igxFocus]="true"
[step]="step"
type="number"
Expand Down
4 changes: 0 additions & 4 deletions projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<igx-grid-cell
class="igx-grid__td igx-grid__td--fw"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[class.igx-grid__td--bool]="col.dataType === 'boolean'"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down Expand Up @@ -57,7 +56,6 @@
<igx-tree-grid-cell
class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
[class.igx-grid__td--number]="(col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency') && col.visibleIndex !== 0"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
[ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down Expand Up @@ -112,7 +110,6 @@
<igx-grid-cell
class="igx-grid__td igx-grid__td--fw igx-grid__td--pinned"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
[class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
[ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down Expand Up @@ -144,7 +141,6 @@
<igx-tree-grid-cell
class="igx-grid__td igx-grid__td--fw igx-grid__td--tree-cell igx-grid__td--pinned"
[class.igx-grid__td--edited]="key | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
[attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
[class.igx-grid__td--number]="(col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency') && col.visibleIndex !== 0"
[ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
[ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
Expand Down