Skip to content

Commit 35d67a7

Browse files
committed
chore: remove duplicated FocusKeyManager
Removes the FocusKeyManager class that was duplicated from the CDK.
1 parent fd5e5ff commit 35d67a7

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

src/lib/chips/chip-list.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Component, DebugElement, QueryList} from '@angular/core';
33
import {By} from '@angular/platform-browser';
44
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
55
import {MdChipList, MdChipsModule} from './index';
6-
import {FocusKeyManager} from '../core/a11y/focus-key-manager';
6+
import {FocusKeyManager} from '@angular/cdk/a11y';
77
import {createKeyboardEvent} from '@angular/cdk/testing';
88

99
import {MdInputModule} from '../input/index';

src/lib/chips/chip-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
} from '@angular/core';
2222

2323
import {MdChip} from './chip';
24-
import {FocusKeyManager} from '../core/a11y/focus-key-manager';
24+
import {FocusKeyManager} from '@angular/cdk/a11y';
2525
import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '../core/keyboard/keycodes';
2626
import {Directionality} from '@angular/cdk/bidi';
2727
import {Subscription} from 'rxjs/Subscription';

src/lib/core/a11y/focus-key-manager.ts

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,4 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ListKeyManager, ListKeyManagerOption} from './list-key-manager';
10-
11-
/**
12-
* This is the interface for focusable items (used by the FocusKeyManager).
13-
* Each item must know how to focus itself, whether or not it is currently disabled
14-
* and be able to supply it's label.
15-
*/
16-
export interface FocusableOption extends ListKeyManagerOption {
17-
focus(): void;
18-
}
19-
20-
export class FocusKeyManager extends ListKeyManager<FocusableOption> {
21-
/**
22-
* This method sets the active item to the item at the specified index.
23-
* It also adds focuses the newly active item.
24-
*/
25-
setActiveItem(index: number): void {
26-
super.setActiveItem(index);
27-
28-
if (this.activeItem) {
29-
this.activeItem.focus();
30-
}
31-
}
32-
}
9+
export {FocusKeyManager, FocusableOption} from '@angular/cdk/a11y';

src/lib/menu/menu-directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {AnimationEvent} from '@angular/animations';
2727
import {MenuPositionX, MenuPositionY} from './menu-positions';
2828
import {throwMdMenuInvalidPositionX, throwMdMenuInvalidPositionY} from './menu-errors';
2929
import {MdMenuItem} from './menu-item';
30-
import {FocusKeyManager} from '../core/a11y/focus-key-manager';
30+
import {FocusKeyManager} from '@angular/cdk/a11y';
3131
import {MdMenuPanel} from './menu-panel';
3232
import {Subscription} from 'rxjs/Subscription';
3333
import {transformMenu, fadeInItems} from './menu-animations';

src/lib/select/select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
import {NgForm, FormGroupDirective} from '@angular/forms';
3232
import {MdOption, MdOptionSelectionChange, MdOptgroup} from '../core/option/index';
3333
import {ENTER, SPACE, UP_ARROW, DOWN_ARROW, HOME, END} from '../core/keyboard/keycodes';
34-
import {FocusKeyManager} from '../core/a11y/focus-key-manager';
34+
import {FocusKeyManager} from '@angular/cdk/a11y';
3535
import {Directionality} from '../core/bidi/index';
3636
import {Observable} from 'rxjs/Observable';
3737
import {Subscription} from 'rxjs/Subscription';

0 commit comments

Comments
 (0)