Skip to content

feat(FocusOriginMonitor): support monitoring subtree focus as well as element #3113

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 5 commits into from
Feb 16, 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
14 changes: 13 additions & 1 deletion src/demo-app/style/style-demo.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<button #b class="demo-button" cdkFocusClasses>focus me!</button>
<button #b class="demo-focusable" cdkMonitorElementFocus>focus me!</button>
<button (click)="b.focus()">focus programmatically</button>

<button (click)="fom.focusVia(b, renderer, 'mouse')">focusVia: mouse</button>
Expand All @@ -7,3 +7,15 @@
<button (click)="fom.focusVia(b, renderer, 'program')">focusVia: program</button>

<div>Active classes: {{b.classList}}</div>

<br>

<div class="demo-focusable" tabindex="0" cdkMonitorElementFocus>
<p>div with element focus monitored</p>
<button>1</button><button>2</button>
</div>

<div class="demo-focusable" tabindex="0" cdkMonitorSubtreeFocus>
<p>div with subtree focus monitored</p>
<button>1</button><button>2</button>
</div>
10 changes: 5 additions & 5 deletions src/demo-app/style/style-demo.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
.demo-button.cdk-focused {
.demo-focusable.cdk-focused {
border: 2px solid red;
}

.demo-button.cdk-mouse-focused {
.demo-focusable.cdk-mouse-focused {
background: green;
}

.demo-button.cdk-keyboard-focused {
.demo-focusable.cdk-keyboard-focused {
background: yellow;
}

.demo-button.cdk-program-focused {
.demo-focusable.cdk-program-focused {
background: blue;
}

.demo-button.cdk-touch-focused {
.demo-focusable.cdk-touch-focused {
background: purple;
}
183 changes: 0 additions & 183 deletions src/lib/core/style/focus-classes.ts

This file was deleted.

Loading