Skip to content

demo(sidenav): add accessibility demo pages #7498

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.

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 10 commits into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 15 additions & 7 deletions src/demo-app/a11y/a11y-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ import {
FoggyTabContent,
} from './tabs/tabs-a11y';
import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
import {SidenavAccessibilityDemo} from './sidenav/sidenav-a11y';
import {SidenavBasicAccessibilityDemo} from './sidenav/basic-sidenav-a11y';
import {SidenavDualAccessibilityDemo} from './sidenav/dual-sidenav-a11y';
import {SidenavMobileAccessibilityDemo} from './sidenav/mobile-sidenav-a11y';


@NgModule({
Expand Down Expand Up @@ -77,22 +81,26 @@ export class AccessibilityRoutingModule {}
DialogNeptuneIFrameDialog,
DialogWelcomeExampleDialog,
ExpansionPanelAccessibilityDemo,
FoggyTabContent,
GridListAccessibilityDemo,
IconAccessibilityDemo,
InputAccessibilityDemo,
MenuAccessibilityDemo,
ProgressBarAccessibilityDemo,
ProgressSpinnerAccessibilityDemo,
RadioAccessibilityDemo,
ToolbarAccessibilityDemo,
RainyTabContent,
SelectAccessibilityDemo,
SidenavAccessibilityDemo,
SidenavBasicAccessibilityDemo,
SidenavDualAccessibilityDemo,
SidenavMobileAccessibilityDemo,
SliderAccessibilityDemo,
SlideToggleAccessibilityDemo,
SnackBarAccessibilityDemo,
SelectAccessibilityDemo,
TabsAccessibilityDemo,
SunnyTabContent,
RainyTabContent,
FoggyTabContent,
TabsAccessibilityDemo,
ToolbarAccessibilityDemo,
TooltipAccessibilityDemo,
],
entryComponents: [
Expand All @@ -102,9 +110,9 @@ export class AccessibilityRoutingModule {}
DialogNeptuneExampleDialog,
DialogNeptuneIFrameDialog,
DialogWelcomeExampleDialog,
SunnyTabContent,
RainyTabContent,
FoggyTabContent,
RainyTabContent,
SunnyTabContent,
]
})
export class AccessibilityDemoModule {}
18 changes: 11 additions & 7 deletions src/demo-app/a11y/a11y.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<h1>Accessibility Demo</h1>
<ng-container *ngIf="!fullscreen">
<h1>
Accessibility Demo
</h1>

<nav>
<a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
<a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]" (click)="skipNavigation()">
{{navItem.name}}
</a>
</nav>
<nav>
<a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
<a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]" (click)="skipNavigation()">
{{navItem.name}}
</a>
</nav>
</ng-container>

<div #maincontent tabindex="-1">
<h1 #header tabindex="-1" *ngIf="!!currentComponent">{{currentComponent}} Demo</h1>
Expand Down
40 changes: 29 additions & 11 deletions src/demo-app/a11y/a11y.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
import {Component, ElementRef, OnDestroy, ViewChild, ViewEncapsulation} from '@angular/core';
import {NavigationEnd, Router} from '@angular/router';
import {Subscription} from 'rxjs/Subscription';

@Component({
moduleId: module.id,
Expand All @@ -16,17 +17,21 @@ export class AccessibilityHome {}
encapsulation: ViewEncapsulation.None,
preserveWhitespaces: false,
})
export class AccessibilityDemo {
export class AccessibilityDemo implements OnDestroy {
currentComponent: string = '';

fullscreen = false;

private _routerSubscription = Subscription.EMPTY;

@ViewChild('maincontent') mainContent: ElementRef;
@ViewChild('header') sectionHeader: ElementRef;

navItems = [
{name: 'Home', route: '.'},
{name: 'Autocomplete', route: 'autocomplete'},
{name: 'Button', route: 'button'},
{name: 'Button toggle', route: 'button-toggle'},
{name: 'Button', route: 'button'},
{name: 'Card', route: 'card'},
{name: 'Checkbox', route: 'checkbox'},
{name: 'Chips', route: 'chips'},
Expand All @@ -40,26 +45,39 @@ export class AccessibilityDemo {
{name: 'Progress bar', route: 'progress-bar'},
{name: 'Progress spinner', route: 'progress-spinner'},
{name: 'Radio buttons', route: 'radio'},
{name: 'Slider', route: 'slider'},
{name: 'Select', route: 'select'},
{name: 'Sidenav', route: 'sidenav'},
{name: 'Slide toggle', route: 'slide-toggle'},
{name: 'Slider', route: 'slider'},
{name: 'Snack bar', route: 'snack-bar'},
{name: 'Select', route: 'select'},
{name: 'Tabs', route: 'tabs'},
{name: 'Toolbar', route: 'toolbar'},
{name: 'Tooltip', route: 'tooltip'},
];

constructor(router: Router) {
router.events.subscribe(event => {
let nav = this.navItems.find(navItem => {
let fragments = (event as NavigationEnd).url.split('/');
return fragments[fragments.length - 1] === navItem.route;
});
this.currentComponent = nav ? nav.name : '';
this._routerSubscription = router.events.subscribe((e) => {
if (e instanceof NavigationEnd) {
let fragments = e.url.split('/');
let nav = this.navItems.find(navItem => {
return fragments[fragments.length - 1] === navItem.route;
});
this.currentComponent = nav ? nav.name : '';

let routerState = router.routerState.root;
while (routerState.children.length) {
routerState = routerState.children[0];
}
this.fullscreen = !!routerState.snapshot.data.fullscreen;
}
});
}

skipNavigation() {
(this.currentComponent ? this.sectionHeader : this.mainContent).nativeElement.focus();
}

ngOnDestroy() {
this._routerSubscription.unsubscribe();
}
}
12 changes: 10 additions & 2 deletions src/demo-app/a11y/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ import {SelectAccessibilityDemo} from './select/select-a11y';
import {TabsAccessibilityDemo} from './tabs/tabs-a11y';
import {TABS_DEMO_ROUTES} from './tabs/routes';
import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
import {SidenavAccessibilityDemo} from './sidenav/sidenav-a11y';
import {SidenavBasicAccessibilityDemo} from './sidenav/basic-sidenav-a11y';
import {SidenavDualAccessibilityDemo} from './sidenav/dual-sidenav-a11y';
import {SidenavMobileAccessibilityDemo} from './sidenav/mobile-sidenav-a11y';

export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
{path: '', component: AccessibilityHome},
Expand All @@ -43,10 +47,14 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
{path: 'progress-bar', component: ProgressBarAccessibilityDemo},
{path: 'progress-spinner', component: ProgressSpinnerAccessibilityDemo},
{path: 'radio', component: RadioAccessibilityDemo},
{path: 'slider', component: SliderAccessibilityDemo},
{path: 'select', component: SelectAccessibilityDemo},
{path: 'sidenav', component: SidenavAccessibilityDemo},
{path: 'sidenav/basic', component: SidenavBasicAccessibilityDemo, data: {fullscreen: true}},
{path: 'sidenav/dual', component: SidenavDualAccessibilityDemo, data: {fullscreen: true}},
{path: 'sidenav/mobile', component: SidenavMobileAccessibilityDemo, data: {fullscreen: true}},
{path: 'slide-toggle', component: SlideToggleAccessibilityDemo},
{path: 'slider', component: SliderAccessibilityDemo},
{path: 'snack-bar', component: SnackBarAccessibilityDemo},
{path: 'select', component: SelectAccessibilityDemo},
{path: 'tabs', component: TabsAccessibilityDemo, children: TABS_DEMO_ROUTES},
{path: 'toolbar', component: ToolbarAccessibilityDemo},
{path: 'tooltip', component: TooltipAccessibilityDemo},
Expand Down
24 changes: 24 additions & 0 deletions src/demo-app/a11y/sidenav/basic-sidenav-a11y.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<mat-toolbar color="primary" role="header" aria-label="Basic sidenav app">
<button mat-icon-button aria-label="Navigation menu" (click)="snav.toggle()">
<mat-icon aria-hidden="true">menu</mat-icon>
</button>
<h1 class="a11y-demo-sidenav-app-name">Basic Sidenav App</h1>
</mat-toolbar>

<mat-sidenav-container class="a11y-demo-sidenav-container">
<mat-sidenav #snav mode="side" role="navigation">
<mat-nav-list>
<a mat-list-item routerLink="..">Home</a>
<a mat-list-item routerLink="../basic">Basic sidenav example</a>
<a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
<a mat-list-item routerLink="../dual">Dual sidenavs example</a>
</mat-nav-list>
</mat-sidenav>

<mat-sidenav-content role="region">
<button mat-raised-button aria-label="Close basic sidenav example" color="primary"
class="a11y-demo-sidenav-close" routerLink="..">
Close example
</button>
</mat-sidenav-content>
</mat-sidenav-container>
13 changes: 13 additions & 0 deletions src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import {Component, ViewEncapsulation} from '@angular/core';


@Component({
moduleId: module.id,
selector: 'basic-sidenav-a11y',
templateUrl: 'basic-sidenav-a11y.html',
styleUrls: ['shared.css'],
host: {'class': 'a11y-demo-sidenav-app'},
encapsulation: ViewEncapsulation.None,
preserveWhitespaces: false,
})
export class SidenavBasicAccessibilityDemo {}
43 changes: 43 additions & 0 deletions src/demo-app/a11y/sidenav/dual-sidenav-a11y.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<mat-toolbar color="primary" role="header" aria-label="Dual sidenav app">
<button mat-icon-button aria-label="Navigation menu" (click)="startSnav.toggle()">
<mat-icon aria-hidden="true">menu</mat-icon>
</button>
<h1 class="a11y-demo-sidenav-app-name">Dual Sidenav App</h1>
<span class="a11y-demo-sidenav-spacer" aria-hidden="true"></span>
<button mat-icon-button aria-label="Playlist menu" (click)="endSnav.toggle()">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to focus on the playlist items when toggle sidenav? The focus stays in the toggle icon button, and user need to go through the left sidenav to reach the second sidenav.

<mat-icon aria-hidden="true">playlist_play</mat-icon>
</button>
</mat-toolbar>

<mat-sidenav-container class="a11y-demo-sidenav-container">
<mat-sidenav #startSnav mode="side" role="navigation">
<mat-nav-list>
<a mat-list-item routerLink="..">Home</a>
<a mat-list-item routerLink="../basic">Basic sidenav example</a>
<a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
<a mat-list-item routerLink="../dual">Dual sidenavs example</a>
</mat-nav-list>
</mat-sidenav>

<mat-sidenav-content role="region">
<button mat-raised-button aria-label="Close dual sidenav example" color="primary"
class="a11y-demo-sidenav-close" routerLink="..">
Close example
</button>
</mat-sidenav-content>

<mat-sidenav #endSnav mode="side" position="end" class="a11y-demo-sidenav-playlist" role="region"
(open)="playlist1.focus()">
<h2 class="a11y-demo-sidenav-playlist-header">Playlists</h2>
<button #playlist1 mat-button aria-label="Thumbs up playlist" (click)="play('Thumbs up')">
Thumbs up
</button>
<button mat-button aria-label="Last added playlist" (click)="play('Last added')">
Last added
</button>
<button mat-button aria-label="Free and purchased playlist"
(click)="play('Free and purchased')">
Free and purchased
</button>
</mat-sidenav>
</mat-sidenav-container>
13 changes: 13 additions & 0 deletions src/demo-app/a11y/sidenav/dual-sidenav-a11y.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.a11y-demo-sidenav-spacer {
flex: 1;
}

mat-sidenav.a11y-demo-sidenav-playlist {
display: flex;
flex-direction: column;
width: 200px;
}

.a11y-demo-sidenav-playlist-header {
text-align: center;
}
20 changes: 20 additions & 0 deletions src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {MatSnackBar} from '@angular/material/snack-bar';


@Component({
moduleId: module.id,
selector: 'dual-sidenav-a11y',
templateUrl: 'dual-sidenav-a11y.html',
styleUrls: ['shared.css', 'dual-sidenav-a11y.css'],
host: {'class': 'a11y-demo-sidenav-app'},
encapsulation: ViewEncapsulation.None,
preserveWhitespaces: false,
})
export class SidenavDualAccessibilityDemo {
constructor(private _snackbar: MatSnackBar) {}

play(list: string) {
this._snackbar.open(`Playing "${list}"`, '', {duration: 1000});
}
}
34 changes: 34 additions & 0 deletions src/demo-app/a11y/sidenav/mobile-sidenav-a11y.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<mat-toolbar color="primary" role="header" aria-label="Responsive sidenav app"
[class.a11y-demo-sidenav-header-fixed]="mobileQuery.matches">
<button mat-icon-button aria-label="Navigation menu" (click)="snav.toggle()">
<mat-icon aria-hidden="true">menu</mat-icon>
</button>
<h1 class="a11y-demo-sidenav-app-name">Responsive Sidenav App</h1>
</mat-toolbar>

<mat-sidenav-container
class="a11y-demo-sidenav-container"
[class.a11y-demo-sidenav-container-fixed]="mobileQuery.matches"
[style.marginTop.px]="mobileQuery.matches ? 56 : 0">
<mat-sidenav
#snav
role="navigation"
[mode]="mobileQuery.matches ? 'over' : 'side'"
[fixedInViewport]="mobileQuery.matches">
<mat-nav-list>
<a mat-list-item routerLink="..">Home</a>
<a mat-list-item routerLink="../basic">Basic sidenav example</a>
<a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
<a mat-list-item routerLink="../dual">Dual sidenavs example</a>
</mat-nav-list>
<p class="a11y-demo-sidenav-filler" *ngFor="let f of filler">Filler content</p>
</mat-sidenav>

<mat-sidenav-content role="region">
<button mat-raised-button aria-label="Close responsive sidenav example" color="primary"
class="a11y-demo-sidenav-close" routerLink="..">
Close example
</button>
<p class="a11y-demo-sidenav-filler" *ngFor="let f of filler">Filler content</p>
</mat-sidenav-content>
</mat-sidenav-container>
4 changes: 4 additions & 0 deletions src/demo-app/a11y/sidenav/mobile-sidenav-a11y.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.a11y-demo-sidenav-header-fixed {
position: fixed;
z-index: 2;
}
28 changes: 28 additions & 0 deletions src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angular/core';


@Component({
moduleId: module.id,
selector: 'mobile-sidenav-a11y',
templateUrl: 'mobile-sidenav-a11y.html',
styleUrls: ['shared.css', 'mobile-sidenav-a11y.css'],
host: {'class': 'a11y-demo-sidenav-app'},
encapsulation: ViewEncapsulation.None,
preserveWhitespaces: false,
})
export class SidenavMobileAccessibilityDemo implements OnDestroy {
mobileQuery = matchMedia('(max-width: 600px)');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is breaking internal build, where is this imported?


filler = Array(20).fill(0);

_mobileQueryListener: () => void;

constructor(changeDetectorRef: ChangeDetectorRef) {
this._mobileQueryListener = () => changeDetectorRef.detectChanges();
this.mobileQuery.addListener(this._mobileQueryListener);
}

ngOnDestroy(): void {
this.mobileQuery.removeListener(this._mobileQueryListener);
}
}
Loading