Skip to content

Commit ff0e612

Browse files
crisbetojelbourn
authored andcommitted
chore: reorganize cdk/a11y directory structure (#9389)
* 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 1e2fe90 commit ff0e612

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';
File renamed without changes.
File renamed without changes.

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.
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

0 commit comments

Comments
 (0)