Skip to content

Commit

Permalink
chore(dev-app) Add demo page for FocusTrap
Browse files Browse the repository at this point in the history
Note that much of this demo page is known to not be working with the
current focus trap implementation (ex. elements in the focus trap with
tabindex > 0 send focus out of the trap, elements in iframes/shadow DOM
get skipped when focus wraps, all focus traps can be escaped by clicking
on the URL and then pressing tab). The demo page will be helpful for
research into FocusTrap improvements (see
angular#13054).
  • Loading branch information
vanessanschmitt committed Dec 3, 2019
1 parent f4d0c18 commit 6894a3c
Show file tree
Hide file tree
Showing 11 changed files with 368 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -149,6 +149,7 @@
/src/dev-app/examples-page/** @andrewseguin
/src/dev-app/expansion/** @jelbourn
/src/dev-app/focus-origin/** @mmalerba
/src/dev-app/focus-trap/** @jelbourn
/src/dev-app/google-map/** @mbehrlich
/src/dev-app/grid-list/** @jelbourn
/src/dev-app/icon/** @jelbourn
Expand Down
1 change: 1 addition & 0 deletions src/dev-app/BUILD.bazel
Expand Up @@ -37,6 +37,7 @@ ng_module(
"//src/dev-app/examples-page",
"//src/dev-app/expansion",
"//src/dev-app/focus-origin",
"//src/dev-app/focus-trap",
"//src/dev-app/google-map",
"//src/dev-app/grid-list",
"//src/dev-app/icon",
Expand Down
1 change: 1 addition & 0 deletions src/dev-app/dev-app/dev-app-layout.ts
Expand Up @@ -38,6 +38,7 @@ export class DevAppLayout {
{name: 'Drag and Drop', route: '/drag-drop'},
{name: 'Expansion Panel', route: '/expansion'},
{name: 'Focus Origin', route: '/focus-origin'},
{name: 'Focus Trap', route: '/focus-trap'},
{name: 'Google Map', route: '/google-map'},
{name: 'Grid List', route: '/grid-list'},
{name: 'Icon', route: '/icon'},
Expand Down
4 changes: 4 additions & 0 deletions src/dev-app/dev-app/routes.ts
Expand Up @@ -39,6 +39,10 @@ export const DEV_APP_ROUTES: Routes = [
path: 'focus-origin',
loadChildren: 'focus-origin/focus-origin-demo-module#FocusOriginDemoModule'
},
{
path: 'focus-trap',
loadChildren: 'focus-trap/focus-trap-demo-module#FocusTrapDemoModule'
},
{path: 'google-map', loadChildren: 'google-map/google-map-demo-module#GoogleMapDemoModule'},
{path: 'grid-list', loadChildren: 'grid-list/grid-list-demo-module#GridListDemoModule'},
{path: 'icon', loadChildren: 'icon/icon-demo-module#IconDemoModule'},
Expand Down
32 changes: 32 additions & 0 deletions src/dev-app/focus-trap/BUILD.bazel
@@ -0,0 +1,32 @@
package(default_visibility = ["//visibility:public"])

load("//tools:defaults.bzl", "ng_module", "sass_binary")

ng_module(
name = "focus-trap",
srcs = glob(["**/*.ts"]),
assets = [
"focus-trap-demo.html",
"focus-trap-dialog-demo.html",
":focus_trap_demo_scss",
":focus_trap_dialog_demo_scss",
],
deps = [
"//src/cdk/a11y",
"//src/material/button",
"//src/material/card",
"//src/material/dialog",
"//src/material/toolbar",
"@npm//@angular/router",
],
)

sass_binary(
name = "focus_trap_demo_scss",
src = "focus-trap-demo.scss",
)

sass_binary(
name = "focus_trap_dialog_demo_scss",
src = "focus-trap-dialog-demo.scss",
)
33 changes: 33 additions & 0 deletions src/dev-app/focus-trap/focus-trap-demo-module.ts
@@ -0,0 +1,33 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import {A11yModule} from '@angular/cdk/a11y';
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {MatCardModule} from '@angular/material/card';
import {MatDialogModule} from '@angular/material/dialog';
import {MatToolbarModule} from '@angular/material/toolbar';
import {RouterModule} from '@angular/router';
import {FocusTrapDemo, FocusTrapShadowDomDemo, FocusTrapDialogDemo} from './focus-trap-demo';

@NgModule({
imports: [
A11yModule,
CommonModule,
MatButtonModule,
MatCardModule,
MatDialogModule,
MatToolbarModule,
RouterModule.forChild([{path: '', component: FocusTrapDemo}]),
],
declarations: [FocusTrapDemo, FocusTrapShadowDomDemo, FocusTrapDialogDemo],
entryComponents: [FocusTrapDialogDemo],
})
export class FocusTrapDemoModule {
}
119 changes: 119 additions & 0 deletions src/dev-app/focus-trap/focus-trap-demo.html
@@ -0,0 +1,119 @@
<div>
<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Basic</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(basicFocusTrap)">
{{basicFocusTrap && basicFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region" #basicDemoRegion
[class.demo-focus-trap-enabled]="(basicFocusTrap && basicFocusTrap.enabled) || false">
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
</div>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Nested</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(nestedOuterFocusTrap)">
{{nestedOuterFocusTrap && nestedOuterFocusTrap.enabled ? "Disable" : "Enable"}} outer FocusTrap
</button>
<div class="demo-focus-trap-region" #nestedOuterDemoRegion
[class.demo-focus-trap-enabled]="(nestedOuterFocusTrap && nestedOuterFocusTrap.enabled) || false">
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
<button mat-raised-button class="demo-focus-trap-element"
(click)="toggleFocus(nestedInnerFocusTrap)">
{{nestedInnerFocusTrap && nestedInnerFocusTrap.enabled ? "Disable" : "Enable"}} inner FocusTrap
</button>
<div class="demo-focus-trap-region" #nestedInnerDemoRegion
[class.demo-focus-trap-enabled]="(nestedInnerFocusTrap && nestedInnerFocusTrap.enabled) || false">
<textarea class="demo-focus-trap-element" placeholder="Three"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Four"></textarea>
</div>
</div>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Tabindex > 0</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(tabIndexFocusTrap)">
{{tabIndexFocusTrap && tabIndexFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region" #tabIndexDemoRegion
[class.demo-focus-trap-enabled]="(tabIndexFocusTrap && tabIndexFocusTrap.enabled) || false">
<textarea class="demo-focus-trap-element" tabindex="1"
placeholder="I have tabindex 1"></textarea>
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
</div>
<textarea class="demo-focus-trap-element" tabindex="1"
placeholder="I have tabindex 1"></textarea>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Shadow DOMs</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(shadowDomFocusTrap)">
{{shadowDomFocusTrap && shadowDomFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region" #shadowDomDemoRegion
[class.demo-focus-trap-enabled]="(shadowDomFocusTrap && shadowDomFocusTrap.enabled) || false">
<shadow-dom-demo>
<textarea placeholder="I am in a shadow DOM"></textarea>
</shadow-dom-demo>
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
</div>
<shadow-dom-demo>
<textarea class="demo-focus-trap-element" placeholder="I am in a shadow DOM"></textarea>
</shadow-dom-demo>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">iframes</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(iframeFocusTrap)">
{{iframeFocusTrap && iframeFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region" #iframeDemoRegion
[class.demo-focus-trap-enabled]="(iframeFocusTrap && iframeFocusTrap.enabled) || false">
<iframe class="demo-focus-trap-element"
srcdoc="<textarea placeholder='I am in an iframe'></textarea>">
</iframe>
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
</div>
<iframe srcdoc="<textarea placeholder='I am in an iframe'></textarea>"></iframe>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Dynamic page content</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="toggleFocus(dynamicFocusTrap)">
{{dynamicFocusTrap && dynamicFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region" #dynamicDemoRegion
[class.demo-focus-trap-enabled]="(dynamicFocusTrap && dynamicFocusTrap.enabled) || false">
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
<button mat-raised-button class="demo-focus-trap-element" (click)="addNewElement()">
Click to add more focusable elements to the page
</button>
</div>
<div #newElements></div>
</mat-card-content>
</mat-card>

<mat-card class="demo-mat-card">
<mat-toolbar color="primary">Dialog-on-dialog</mat-toolbar>
<mat-card-content class="demo-mat-card-content">
<button mat-raised-button (click)="openDialog()">Open dialog</button>
</mat-card-content>
</mat-card>
</div>
34 changes: 34 additions & 0 deletions src/dev-app/focus-trap/focus-trap-demo.scss
@@ -0,0 +1,34 @@
.demo-focus-trap-region {
outline: 2px dashed lightgray;
padding: 4px;
margin: 12px 0;


&.demo-focus-trap-enabled {
outline: 2px solid red;
}

.demo-focus-trap-element, .demo-focus-trap-shadow-root {
display: block;
margin: 4px;
}

.demo-focus-trap-region {
margin: 12px 4px;
}
}

.demo-focus-trap-shadow-root {
display: block;
padding: 4px;
background-color: lightgrey;
}

.demo-mat-card {
padding: 0;
margin: 16px;

& .demo-mat-card-content {
padding: 24px;
}
}
123 changes: 123 additions & 0 deletions src/dev-app/focus-trap/focus-trap-demo.ts
@@ -0,0 +1,123 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
import {
AfterViewInit,
Component,
ElementRef,
ViewChild,
ViewEncapsulation} from '@angular/core';
import {MatDialog} from '@angular/material/dialog';

@Component({
selector: 'shadow-dom-demo',
template: '<ng-content></ng-content>',
host: {'class': 'demo-focus-trap-shadow-root'},
encapsulation: ViewEncapsulation.ShadowDom
})
export class FocusTrapShadowDomDemo {}

@Component({
selector: 'focus-trap-demo',
templateUrl: 'focus-trap-demo.html',
styleUrls: ['focus-trap-demo.css'],
})
export class FocusTrapDemo implements AfterViewInit {

basicFocusTrap: FocusTrap;
@ViewChild('basicDemoRegion', {static: false}) private readonly _basicDemoRegion!: ElementRef;

nestedOuterFocusTrap: FocusTrap;
@ViewChild('nestedOuterDemoRegion', {static: false})
private readonly _nestedOuterDemoRegion!: ElementRef;
nestedInnerFocusTrap: FocusTrap;
@ViewChild('nestedInnerDemoRegion', {static: false})
private readonly _nestedInnerDemoRegion!: ElementRef;

tabIndexFocusTrap: FocusTrap;
@ViewChild('tabIndexDemoRegion', {static: false})
private readonly _tabIndexDemoRegion!: ElementRef;

shadowDomFocusTrap: FocusTrap;
@ViewChild('shadowDomDemoRegion', {static: false})
private readonly _shadowDomDemoRegion!: ElementRef;

iframeFocusTrap: FocusTrap;
@ViewChild('iframeDemoRegion', {static: false})
private readonly _iframeDemoRegion!: ElementRef;

dynamicFocusTrap: FocusTrap;
@ViewChild('dynamicDemoRegion', {static: false})
private readonly _dynamicDemoRegion!: ElementRef;
@ViewChild('newElements', {static: false}) private readonly _newElements!: ElementRef;

constructor(
public dialog: MatDialog,
private _focusTrapFactory: FocusTrapFactory) {}

ngAfterViewInit() {
this.basicFocusTrap = this._focusTrapFactory.create(this._basicDemoRegion.nativeElement);
this.basicFocusTrap.enabled = false;

this.nestedOuterFocusTrap = this._focusTrapFactory.create(
this._nestedOuterDemoRegion.nativeElement);
this.nestedOuterFocusTrap.enabled = false;

this.nestedInnerFocusTrap = this._focusTrapFactory.create(
this._nestedInnerDemoRegion.nativeElement);
this.nestedInnerFocusTrap.enabled = false;

this.tabIndexFocusTrap = this._focusTrapFactory.create(
this._tabIndexDemoRegion.nativeElement);
this.tabIndexFocusTrap.enabled = false;

this.shadowDomFocusTrap = this._focusTrapFactory.create(
this._shadowDomDemoRegion.nativeElement);
this.shadowDomFocusTrap.enabled = false;

this.iframeFocusTrap = this._focusTrapFactory.create(this._iframeDemoRegion.nativeElement);
this.iframeFocusTrap.enabled = false;

this.dynamicFocusTrap = this._focusTrapFactory.create(this._dynamicDemoRegion.nativeElement);
this.dynamicFocusTrap.enabled = false;
}

toggleFocus(focusTrap: FocusTrap) {
focusTrap.enabled = !focusTrap.enabled;
if (focusTrap.enabled) {
focusTrap.focusInitialElementWhenReady();
}
}

addNewElement() {
const textarea = document.createElement('textarea');
textarea.setAttribute('placeholder', 'I am a new element!');
this._newElements.nativeElement.appendChild(textarea);
}

openDialog() {
this.dialog.open(FocusTrapDialogDemo);
}
}

let dialogCount = 0;

@Component({
selector: 'focus-trap-dialog-demo',
styleUrls: ['focus-trap-dialog-demo.css'],
templateUrl: 'focus-trap-dialog-demo.html',
})
export class FocusTrapDialogDemo {
id = dialogCount++;
constructor(public dialog: MatDialog) {}

openAnotherDialog() {
this.dialog.open(FocusTrapDialogDemo);
}
}
16 changes: 16 additions & 0 deletions src/dev-app/focus-trap/focus-trap-dialog-demo.html
@@ -0,0 +1,16 @@
<h2 mat-dialog-title>Dialog {{id}}</h2>

<mat-dialog-content>
<textarea class="demo-dialog-textarea" placeholder="One"></textarea>
<textarea class="demo-dialog-textarea" placeholder="Two"></textarea>
</mat-dialog-content>

<mat-dialog-actions>
<button mat-raised-button mat-dialog-close>
Close
</button>

<button mat-raised-button (click)="openAnotherDialog()">
Open another dialog
</button>
</mat-dialog-actions>

0 comments on commit 6894a3c

Please sign in to comment.