Skip to content

Commit a7b80bd

Browse files
authored
Resolve amp violation for download modal (#532)
1 parent bd6b932 commit a7b80bd

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/ui-kit/components/modal/modal.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ export class SamModalComponent implements OnInit {
7676
*/
7777
@Input() condensed: boolean = false;
7878

79+
/**
80+
* Defines aria level for modal title
81+
*/
82+
@Input() headerLevel: number;
83+
7984
/**
8085
* (deprecated) Emitted event when modal is opened
8186
*/

src/ui-kit/components/modal/modal.template.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div *ngIf="show" class="modal-backdrop"></div>
22
<div aria-live="assertive" aria-modal="true" #modalRoot *ngIf="show" [attr.id]="id" role="dialog" [class]="condensed ? 'modal-dialog-condensed modal-dialog' :'modal-dialog'"
3-
(keydown)="closeEscape($event)" aria-labelledby="dialog-title" aria-describedby="dialog-description">
3+
(keydown)="closeEscape($event)" [attr.aria-labelledby]="id + '-dialog-title'" [attr.aria-describedby]="id + '-dialog-description'">
44
<div #modalContent class="modal-content" tabindex="-1" sam-click-outside (clickOutside)="closeOnOutsideClick && clickOutsideReady ? closeModal() : 0">
55
<div *ngIf="this.type !== 'primary'" class="usa-alert {{this.types[type].class}}">
66
<div [class]="((this.type == 'plain') && (condensed))? 'usa-alert-body plain-alert-body' : 'usa-alert-body'">
@@ -9,7 +9,10 @@
99
class="usa-sr-only">close
1010
modal</span></button>
1111
<span *ngIf="this.types[type].sr" class="sr-only">{{this.types[type].sr}}</span>
12-
<h3 id="dialog-title" class="usa-alert-heading">{{title}}</h3>
12+
<h3 *ngIf="!headerLevel" [attr.id]="id + '-dialog-title'" class="usa-alert-heading" >{{title}}</h3>
13+
<div *ngIf="headerLevel" [attr.id]="id + '-dialog-title'" class="usa-alert-heading"
14+
role="heading" [attr.aria-level]="headerLevel">{{title}}
15+
</div>
1316
</div>
1417
</div>
1518
<div *ngIf="this.type === 'primary'" class="primary-model-body">
@@ -20,11 +23,12 @@ <h3 id="dialog-title" class="usa-alert-heading">{{title}}</h3>
2023
<ng-container *ngIf="icon">
2124
<sam-icon [icon]="icon" size="2x"></sam-icon>
2225
</ng-container>
23-
<h3 id="dialog-title">{{title}}</h3>
26+
<h3 *ngIf="!headerLevel" [attr.id]="id + '-dialog-title'">{{title}}</h3>
27+
<div *ngIf="headerLevel" [attr.id]="id + '-dialog-title'" role="heading" [attr.aria-level]="headerLevel">{{title}}</div>
2428
</div>
2529
</div>
2630
<div class="modal-body">
27-
<p id="dialog-description" *ngIf="description">{{description}}</p>
31+
<p [attr.id]="id + '-dialog-description'" *ngIf="description">{{description}}</p>
2832
<ng-content></ng-content>
2933
<div *ngIf="cancelButtonLabel || submitButtonLabel" [ngClass]="(buttonPosition=='left') ? 'text-left' : ((buttonPosition=='right') ? 'text-right' : 'text-center')">
3034
<sam-button buttonType="tertiary" class="usa-button-outline usa-modal-content-cancel-btn"

0 commit comments

Comments
 (0)