Skip to content

Commit 17d0c2e

Browse files
committed
chore: reorganize cdk/a11y directory structure
* Since the `@angular/cdk/a11y` has grown a lot, it's becoming harder to navigate. These changes distribute the files into directories similarly to how we do it in `overlay`. * Removes individual imports from the focus trap tests in favor of importing the `A11yModule`.
1 parent 36be23c commit 17d0c2e

23 files changed

+27
-25
lines changed

src/cdk/a11y/a11y-module.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@
99
import {PlatformModule} from '@angular/cdk/platform';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
12-
import {ARIA_DESCRIBER_PROVIDER, AriaDescriber} from './aria-describer';
13-
import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
14-
import {CdkTrapFocus, FocusTrapDeprecatedDirective, FocusTrapFactory} from './focus-trap';
15-
import {InteractivityChecker} from './interactivity-checker';
16-
import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
12+
import {ARIA_DESCRIBER_PROVIDER, AriaDescriber} from './aria-describer/aria-describer';
13+
import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor/focus-monitor';
14+
import {
15+
CdkTrapFocus,
16+
FocusTrapDeprecatedDirective,
17+
FocusTrapFactory,
18+
} from './focus-trap/focus-trap';
19+
import {InteractivityChecker} from './interactivity-checker/interactivity-checker';
20+
import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer/live-announcer';
1721

1822
@NgModule({
1923
imports: [CommonModule, PlatformModule],

src/cdk/a11y/aria-describer.spec.ts renamed to src/cdk/a11y/aria-describer/aria-describer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {A11yModule, CDK_DESCRIBEDBY_HOST_ATTRIBUTE} from './index';
1+
import {A11yModule, CDK_DESCRIBEDBY_HOST_ATTRIBUTE} from '../index';
22
import {AriaDescriber, MESSAGES_CONTAINER_ID} from './aria-describer';
33
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
44
import {Component, ElementRef, ViewChild} from '@angular/core';

src/cdk/a11y/focus-monitor.spec.ts renamed to src/cdk/a11y/focus-monitor/focus-monitor.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {Component} from '@angular/core';
99
import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
1010
import {By} from '@angular/platform-browser';
1111
import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
12-
import {A11yModule} from './index';
12+
import {A11yModule} from '../index';
1313

1414

1515
describe('FocusMonitor', () => {
File renamed without changes.

src/cdk/a11y/focus-trap.spec.ts renamed to src/cdk/a11y/focus-trap/focus-trap.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
import {Platform} from '@angular/cdk/platform';
22
import {Component, ViewChild} from '@angular/core';
33
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
4-
import {FocusTrap, CdkTrapFocus, FocusTrapFactory} from './focus-trap';
5-
import {InteractivityChecker} from './interactivity-checker';
4+
import {A11yModule, FocusTrap, CdkTrapFocus} from '../index';
65

76

87
describe('FocusTrap', () => {
98

109
beforeEach(async(() => {
1110
TestBed.configureTestingModule({
11+
imports: [A11yModule],
1212
declarations: [
13-
CdkTrapFocus,
1413
FocusTrapWithBindings,
1514
SimpleFocusTrap,
1615
FocusTrapTargets,
1716
FocusTrapWithSvg,
1817
FocusTrapWithoutFocusableElements,
1918
FocusTrapWithAutoCapture,
2019
],
21-
providers: [InteractivityChecker, Platform, FocusTrapFactory]
2220
});
2321

2422
TestBed.compileComponents();

src/cdk/a11y/focus-trap.ts renamed to src/cdk/a11y/focus-trap/focus-trap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
} from '@angular/core';
1919
import {coerceBooleanProperty} from '@angular/cdk/coercion';
2020
import {take} from 'rxjs/operators/take';
21-
import {InteractivityChecker} from './interactivity-checker';
21+
import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
2222
import {DOCUMENT} from '@angular/common';
2323

2424

src/cdk/a11y/focus-key-manager.ts renamed to src/cdk/a11y/key-manager/focus-key-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {ListKeyManager, ListKeyManagerOption} from './list-key-manager';
10-
import {FocusOrigin} from './focus-monitor';
10+
import {FocusOrigin} from '../focus-monitor/focus-monitor';
1111

1212
/**
1313
* This is the interface for focusable items (used by the FocusKeyManager).

src/cdk/a11y/list-key-manager.spec.ts renamed to src/cdk/a11y/key-manager/list-key-manager.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import {DOWN_ARROW, TAB, UP_ARROW, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/k
22
import {take} from 'rxjs/operators/take';
33
import {QueryList} from '@angular/core';
44
import {fakeAsync, tick} from '@angular/core/testing';
5-
import {createKeyboardEvent} from '../testing/event-objects';
5+
import {createKeyboardEvent} from '@angular/cdk/testing';
66
import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
77
import {FocusKeyManager} from './focus-key-manager';
88
import {ListKeyManager} from './list-key-manager';
9-
import {FocusOrigin} from './focus-monitor';
9+
import {FocusOrigin} from '../focus-monitor/focus-monitor';
1010
import {Subject} from 'rxjs/Subject';
1111

1212

src/cdk/a11y/live-announcer.spec.ts renamed to src/cdk/a11y/live-announcer/live-announcer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {inject, fakeAsync, tick, ComponentFixture, TestBed} from '@angular/core/
22
import {Component} from '@angular/core';
33
import {By} from '@angular/platform-browser';
44
import {LiveAnnouncer, LIVE_ANNOUNCER_ELEMENT_TOKEN} from './live-announcer';
5-
import {A11yModule} from './index';
5+
import {A11yModule} from '../index';
66

77

88
describe('LiveAnnouncer', () => {

src/cdk/a11y/public-api.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {CdkTrapFocus} from './focus-trap';
8+
import {CdkTrapFocus} from './focus-trap/focus-trap';
99

1010

11-
export * from './activedescendant-key-manager';
12-
export * from './aria-describer';
11+
export * from './aria-describer/aria-describer';
12+
export * from './key-manager/activedescendant-key-manager';
13+
export * from './key-manager/focus-key-manager';
14+
export * from './key-manager/list-key-manager';
15+
export * from './focus-trap/focus-trap';
16+
export * from './interactivity-checker/interactivity-checker';
17+
export * from './live-announcer/live-announcer';
18+
export * from './focus-monitor/focus-monitor';
1319
export * from './fake-mousedown';
14-
export * from './focus-key-manager';
15-
export * from './focus-trap';
16-
export * from './interactivity-checker';
17-
export * from './list-key-manager';
18-
export * from './live-announcer';
19-
export * from './focus-monitor';
2020
export * from './a11y-module';
2121

2222
/**

0 commit comments

Comments
 (0)