Skip to content

build: focus trap demo not working on IE/Edge #18106

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 1 commit into from
Jan 8, 2020
Merged

build: focus trap demo not working on IE/Edge #18106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/dev-app/focus-trap/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ng_module(
],
deps = [
"//src/cdk/a11y",
"//src/cdk/platform",
"//src/material/button",
"//src/material/card",
"//src/material/dialog",
Expand Down
68 changes: 43 additions & 25 deletions src/dev-app/focus-trap/focus-trap-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
<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">
<div
class="demo-focus-trap-region"
cdkTrapFocus
#basicFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="basicFocusTrap && basicFocusTrap.enabled">
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Two"></textarea>
</div>
Expand All @@ -19,16 +22,20 @@
<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">
<div class="demo-focus-trap-region"
cdkTrapFocus
#nestedOuterFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="nestedOuterFocusTrap && nestedOuterFocusTrap.enabled">
<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">
<div class="demo-focus-trap-region"
cdkTrapFocus
#nestedInnerFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="nestedInnerFocusTrap && nestedInnerFocusTrap.enabled">
<textarea class="demo-focus-trap-element" placeholder="Three"></textarea>
<textarea class="demo-focus-trap-element" placeholder="Four"></textarea>
</div>
Expand All @@ -42,8 +49,10 @@
<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">
<div class="demo-focus-trap-region"
cdkTrapFocus
#tabIndexFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="tabIndexFocusTrap && tabIndexFocusTrap.enabled">
<textarea class="demo-focus-trap-element" tabindex="1"
placeholder="I have tabindex 1"></textarea>
<textarea class="demo-focus-trap-element" placeholder="One"></textarea>
Expand All @@ -56,21 +65,26 @@

<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">
<mat-card-content class="demo-mat-card-content" [ngSwitch]="_supportsShadowDom">
<ng-container *ngSwitchCase="true">
<button mat-raised-button (click)="toggleFocus(shadowDomFocusTrap)">
{{shadowDomFocusTrap && shadowDomFocusTrap.enabled ? "Disable" : "Enable"}} FocusTrap
</button>
<div class="demo-focus-trap-region"
cdkTrapFocus
#shadowDomFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="shadowDomFocusTrap && shadowDomFocusTrap.enabled">
<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 placeholder="I am in a shadow DOM"></textarea>
<textarea class="demo-focus-trap-element" 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>
</ng-container>
<ng-container *ngSwitchCase="false">Shadow DOM not supported</ng-container>
</mat-card-content>
</mat-card>

Expand All @@ -80,8 +94,10 @@
<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">
<div class="demo-focus-trap-region"
cdkTrapFocus
#iframeFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="iframeFocusTrap && iframeFocusTrap.enabled">
<iframe class="demo-focus-trap-element"
srcdoc="<textarea placeholder='I am in an iframe'></textarea>">
</iframe>
Expand All @@ -98,8 +114,10 @@
<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">
<div class="demo-focus-trap-region"
cdkTrapFocus
#dynamicFocusTrap="cdkTrapFocus"
[class.demo-focus-trap-enabled]="dynamicFocusTrap && dynamicFocusTrap.enabled">
<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()">
Expand Down
79 changes: 21 additions & 58 deletions src/dev-app/focus-trap/focus-trap-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@
* found in the LICENSE file at https://angular.io/license
*/

import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
import {CdkTrapFocus} from '@angular/cdk/a11y';
import {
AfterViewInit,
Component,
ElementRef,
ViewChild,
ViewEncapsulation} from '@angular/core';
ViewEncapsulation,
ViewChildren,
QueryList,
} from '@angular/core';
import {MatDialog} from '@angular/material/dialog';
import {_supportsShadowDom} from '@angular/cdk/platform';
Copy link
Member

Choose a reason for hiding this comment

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

Out of curiosity: did we ever consider just publishing this without underscore?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't remember if we ever discussed making it public.


@Component({
selector: 'shadow-dom-demo',
Expand All @@ -29,69 +33,28 @@ export class FocusTrapShadowDomDemo {}
styleUrls: ['focus-trap-demo.css'],
})
export class FocusTrapDemo implements AfterViewInit {
@ViewChild('newElements')
private _newElements: ElementRef<HTMLElement>;

basicFocusTrap: FocusTrap;
@ViewChild('basicDemoRegion', {static: false}) private readonly _basicDemoRegion!: ElementRef;
@ViewChildren(CdkTrapFocus)
private _focusTraps: QueryList<CdkTrapFocus>;

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

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) {}
constructor(public dialog: MatDialog) {}

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;
// We want all the traps to be disabled by default, but doing so while using the value in
// the view will result in "changed after checked" errors so we defer it to the next tick.
setTimeout(() => {
this._focusTraps.forEach(trap => trap.enabled = false);
});
}

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

Expand Down