Skip to content

Commit 8987fd3

Browse files
authored
Improve console accessibility (#2649)
1 parent 653e092 commit 8987fd3

30 files changed

+113
-30
lines changed

console-webapp/src/app/app.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
></mat-progress-bar>
88
</div>
99
<mat-sidenav-container class="console-app__container">
10+
<mat-sidenav-content class="console-app__content-wrapper">
11+
<div class="console-app__content" role="main">
12+
<router-outlet></router-outlet>
13+
</div>
14+
</mat-sidenav-content>
1015
<mat-sidenav
1116
[mode]="breakpointObserver.isMobileView() ? 'over' : 'side'"
1217
[opened]="!breakpointObserver.isMobileView()"
@@ -15,10 +20,5 @@
1520
>
1621
<app-navigation />
1722
</mat-sidenav>
18-
<mat-sidenav-content class="console-app__content-wrapper">
19-
<div class="console-app__content">
20-
<router-outlet></router-outlet>
21-
</div>
22-
</mat-sidenav-content>
2323
</mat-sidenav-container>
2424
</div>

console-webapp/src/app/app.component.spec.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,18 @@ import { AppComponent } from './app.component';
2020
import { MaterialModule } from './material.module';
2121
import { BackendService } from './shared/services/backend.service';
2222
import { AppRoutingModule } from './app-routing.module';
23+
import { AppModule } from './app.module';
2324

2425
describe('AppComponent', () => {
2526
beforeEach(async () => {
2627
await TestBed.configureTestingModule({
2728
declarations: [AppComponent],
28-
imports: [MaterialModule, BrowserAnimationsModule, AppRoutingModule],
29+
imports: [
30+
MaterialModule,
31+
BrowserAnimationsModule,
32+
AppRoutingModule,
33+
AppModule,
34+
],
2935
providers: [
3036
BackendService,
3137
provideHttpClient(),
@@ -36,6 +42,7 @@ describe('AppComponent', () => {
3642

3743
it('should create the app', () => {
3844
const fixture = TestBed.createComponent(AppComponent);
45+
fixture.detectChanges();
3946
const app = fixture.componentInstance;
4047
expect(app).toBeTruthy();
4148
});

console-webapp/src/app/domains/domainList.component.spec.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { MaterialModule } from '../material.module';
2121
import { BackendService } from '../shared/services/backend.service';
2222
import { DomainListComponent } from './domainList.component';
2323
import { FormsModule } from '@angular/forms';
24+
import { AppModule } from '../app.module';
2425

2526
describe('DomainListComponent', () => {
2627
let component: DomainListComponent;
@@ -29,7 +30,12 @@ describe('DomainListComponent', () => {
2930
beforeEach(async () => {
3031
await TestBed.configureTestingModule({
3132
declarations: [DomainListComponent],
32-
imports: [MaterialModule, BrowserAnimationsModule, FormsModule],
33+
imports: [
34+
MaterialModule,
35+
BrowserAnimationsModule,
36+
FormsModule,
37+
AppModule,
38+
],
3339
providers: [
3440
BackendService,
3541
provideHttpClient(),

console-webapp/src/app/header/header.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<a
1313
[routerLink]="'/home'"
1414
routerLinkActive="active"
15+
aria-label="Google Registry logo"
1516
class="console-app__logo"
1617
>
1718
<svg

console-webapp/src/app/header/header.component.spec.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,32 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
1717
import { HeaderComponent } from './header.component';
1818
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1919
import { MaterialModule } from '../material.module';
20+
import { ActivatedRoute } from '@angular/router';
21+
import { AppModule, SelectedRegistrarModule } from '../app.module';
22+
import { AppRoutingModule } from '../app-routing.module';
23+
import { BackendService } from '../shared/services/backend.service';
24+
import { provideHttpClient } from '@angular/common/http';
25+
import { provideHttpClientTesting } from '@angular/common/http/testing';
2026

2127
describe('HeaderComponent', () => {
2228
let component: HeaderComponent;
2329
let fixture: ComponentFixture<HeaderComponent>;
2430

2531
beforeEach(async () => {
2632
await TestBed.configureTestingModule({
27-
imports: [MaterialModule, BrowserAnimationsModule],
33+
imports: [
34+
SelectedRegistrarModule,
35+
MaterialModule,
36+
BrowserAnimationsModule,
37+
AppRoutingModule,
38+
AppModule,
39+
],
40+
providers: [
41+
BackendService,
42+
{ provide: ActivatedRoute, useValue: {} as ActivatedRoute },
43+
provideHttpClient(),
44+
provideHttpClientTesting(),
45+
],
2846
declarations: [HeaderComponent],
2947
}).compileComponents();
3048

console-webapp/src/app/home/home.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
1616

1717
import { HomeComponent } from './home.component';
1818
import { MaterialModule } from '../material.module';
19+
import { AppModule } from '../app.module';
1920

2021
describe('HomeComponent', () => {
2122
let component: HomeComponent;
2223
let fixture: ComponentFixture<HomeComponent>;
2324

2425
beforeEach(async () => {
2526
await TestBed.configureTestingModule({
26-
imports: [MaterialModule],
27+
imports: [MaterialModule, AppModule],
2728
declarations: [HomeComponent],
2829
}).compileComponents();
2930

console-webapp/src/app/navigation/navigation.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<mat-tree-node
77
*matTreeNodeDef="let node"
88
matTreeNodeToggle
9+
tabindex="0"
910
(click)="onClick(node)"
11+
(keyup.enter)="onClick(node)"
1012
[class.active]="router.url.includes(node.path)"
1113
[elementId]="getElementId(node)"
1214
>

console-webapp/src/app/registrar/registrarDetails.component.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
<div class="console-app__registrar-view">
1+
<div
2+
class="console-app__registrar-view"
3+
cdkTrapFocus
4+
[cdkTrapFocusAutoCapture]="true"
5+
>
26
<h1 class="mat-headline-4">Registrars</h1>
37
<mat-divider></mat-divider>
48
<div class="console-app__registrar-view-content">

console-webapp/src/app/registrar/registrarsTable.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ <h1 class="mat-headline-4">Registrars</h1>
5959
<mat-row
6060
*matRowDef="let row; columns: displayedColumns"
6161
(click)="openDetails(row.registrarId)"
62+
tabindex="0"
63+
(keyup.enter)="openDetails(row.registrarId)"
6264
></mat-row>
6365
</mat-table>
6466

console-webapp/src/app/settings/contact/contact.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ <h1>No contacts found</h1>
3232
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
3333
<mat-row
3434
*matRowDef="let row; columns: displayedColumns"
35+
tabindex="0"
3536
(click)="openDetails(row)"
37+
(keyup.enter)="openDetails(row)"
3638
></mat-row>
3739
</mat-table>
3840
}

0 commit comments

Comments
 (0)