Skip to content

Commit f9b5ccd

Browse files
jelbournjelbourn
authored
fix: remove cdk re-exports from @angular/material (#7112)
1 parent 7fe37e5 commit f9b5ccd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+249
-613
lines changed

‎src/lib/core/a11y/_a11y.scss renamed to ‎src/cdk/a11y/_a11y.scss

File renamed without changes.

‎src/cdk/a11y/focus-monitor.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {ComponentFixture, inject, TestBed, fakeAsync, tick} from '@angular/core/testing';
2-
import {Component, Renderer2} from '@angular/core';
3-
import {A11yModule} from './index';
4-
import {By} from '@angular/platform-browser';
51
import {TAB} from '@angular/cdk/keycodes';
6-
import {FocusOrigin, FocusMonitor, TOUCH_BUFFER_MS} from './focus-monitor';
72
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
3+
import {Component, Renderer2} from '@angular/core';
4+
import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
5+
import {By} from '@angular/platform-browser';
6+
import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
7+
import {A11yModule} from './index';
88

99

1010
describe('FocusMonitor', () => {

‎src/cdk/a11y/focus-monitor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {Platform} from '@angular/cdk/platform';
910
import {
1011
Directive,
1112
ElementRef,
@@ -18,11 +19,10 @@ import {
1819
Renderer2,
1920
SkipSelf,
2021
} from '@angular/core';
21-
import {Platform} from '@angular/cdk/platform';
2222
import {Observable} from 'rxjs/Observable';
23+
import {of as observableOf} from 'rxjs/observable/of';
2324
import {Subject} from 'rxjs/Subject';
2425
import {Subscription} from 'rxjs/Subscription';
25-
import {of as observableOf} from 'rxjs/observable/of';
2626

2727

2828
// This is the value used by AngularJS Material. Through trial and error (on iPhone 6S) they found

‎src/cdk/a11y/focus-trap.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {ComponentFixture, TestBed, async} from '@angular/core/testing';
1+
import {Platform} from '@angular/cdk/platform';
22
import {Component, ViewChild} from '@angular/core';
3-
import {FocusTrapFactory, FocusTrapDirective, FocusTrap} from './focus-trap';
3+
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
4+
import {FocusTrap, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
45
import {InteractivityChecker} from './interactivity-checker';
5-
import {Platform} from '../platform/platform';
66

77

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

‎src/cdk/a11y/interactivity-checker.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import {Platform} from '@angular/cdk/platform';
12
import {InteractivityChecker} from './interactivity-checker';
2-
import {Platform} from '../platform/platform';
3+
34

45
describe('InteractivityChecker', () => {
56
let testContainerElement: HTMLElement;

‎src/cdk/a11y/list-key-manager.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
2+
import {first} from '@angular/cdk/rxjs';
13
import {QueryList} from '@angular/core';
24
import {fakeAsync, tick} from '@angular/core/testing';
5+
import {createKeyboardEvent} from '../testing/event-objects';
6+
import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
37
import {FocusKeyManager} from './focus-key-manager';
4-
import {DOWN_ARROW, UP_ARROW, TAB} from '../keycodes/keycodes';
58
import {ListKeyManager} from './list-key-manager';
6-
import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
7-
import {createKeyboardEvent} from '../testing/event-objects';
8-
import {first} from '../rxjs/index';
99

1010

1111
class FakeFocusable {

‎src/lib/core/portal/portal-injector.ts renamed to ‎src/cdk/portal/portal-injector.ts

File renamed without changes.

‎src/cdk/portal/public_api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
export * from './portal';
1010
export * from './dom-portal-host';
1111
export * from './portal-directives';
12+
export * from './portal-injector';

‎src/demo-app/snack-bar/snack-bar-demo.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
import {Dir} from '@angular/cdk/bidi';
12
import {Component, ViewEncapsulation} from '@angular/core';
23
import {
34
MdSnackBar,
45
MdSnackBarConfig,
56
MdSnackBarHorizontalPosition,
67
MdSnackBarVerticalPosition,
7-
Dir,
88
} from '@angular/material';
99

10+
1011
@Component({
1112
moduleId: module.id,
1213
selector: 'snack-bar-demo',
@@ -25,7 +26,8 @@ export class SnackBarDemo {
2526
horizontalPosition: MdSnackBarHorizontalPosition = 'center';
2627
verticalPosition: MdSnackBarVerticalPosition = 'bottom';
2728

28-
constructor(public snackBar: MdSnackBar, private dir: Dir) { }
29+
constructor(public snackBar: MdSnackBar, private dir: Dir) {
30+
}
2931

3032
open() {
3133
let config = new MdSnackBarConfig();

‎src/lib/autocomplete/autocomplete.spec.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
1+
import {Direction, Directionality} from '@angular/cdk/bidi';
2+
import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
3+
import {OverlayContainer} from '@angular/cdk/overlay';
4+
import {map, RxChain, startWith} from '@angular/cdk/rxjs';
5+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
6+
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
27
import {
38
ChangeDetectionStrategy,
49
Component,
@@ -8,28 +13,23 @@ import {
813
ViewChild,
914
ViewChildren,
1015
} from '@angular/core';
16+
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
17+
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
18+
import {MdOption} from '@angular/material/core';
19+
import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
1120
import {By} from '@angular/platform-browser';
1221
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
13-
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
14-
import {ScrollDispatcher} from '@angular/cdk/scrolling';
15-
import {OverlayContainer} from '@angular/cdk/overlay';
16-
import {Direction, Directionality} from '@angular/cdk/bidi';
17-
import {map, RxChain, startWith} from '@angular/cdk/rxjs';
18-
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
22+
import {Observable} from 'rxjs/Observable';
23+
import {Subject} from 'rxjs/Subject';
24+
import {Subscription} from 'rxjs/Subscription';
25+
import {MdInputModule} from '../input/index';
1926
import {
2027
getMdAutocompleteMissingPanelError,
2128
MdAutocomplete,
2229
MdAutocompleteModule,
23-
MdAutocompleteTrigger,
2430
MdAutocompleteSelectedEvent,
31+
MdAutocompleteTrigger,
2532
} from './index';
26-
import {MdInputModule} from '../input/index';
27-
import {Subscription} from 'rxjs/Subscription';
28-
import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
29-
import {MdOption} from '@angular/material/core';
30-
import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
31-
import {Observable} from 'rxjs/Observable';
32-
import {Subject} from 'rxjs/Subject';
3333

3434

3535
describe('MdAutocomplete', () => {

‎src/lib/button-toggle/button-toggle.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../core/a11y/a11y';
21
@import '../core/style/elevation';
32
@import '../core/style/vendor-prefixes';
43
@import '../core/style/layout-common';

‎src/lib/button/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// TODO(jelbourn): Measure perf benefits for translate3d and will-change.
22
// TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser.
33
@import 'button-base';
4-
@import '../core/a11y/a11y';
4+
@import '../../cdk/a11y/a11y';
55
@import '../core/style/layout-common';
66

77
.mat-button, .mat-icon-button {

‎src/lib/card/card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import '../core/style/variables';
22
@import '../core/style/elevation';
3-
@import '../core/a11y/a11y';
3+
@import '../../cdk/a11y/a11y';
44

55

66
$mat-card-default-padding: 24px !default;

‎src/lib/chips/chip-input.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import {async, TestBed, ComponentFixture} from '@angular/core/testing';
2-
import {MdChipsModule} from './index';
1+
import {Directionality} from '@angular/cdk/bidi';
2+
import {ENTER} from '@angular/cdk/keycodes';
3+
import {PlatformModule} from '@angular/cdk/platform';
4+
import {createKeyboardEvent} from '@angular/cdk/testing';
35
import {Component, DebugElement} from '@angular/core';
4-
import {PlatformModule} from '../core/platform/index';
5-
import {MdChipInput, MdChipInputEvent} from './chip-input';
6+
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
67
import {By} from '@angular/platform-browser';
7-
import {Directionality} from '@angular/material/core';
8-
import {createKeyboardEvent} from '@angular/cdk/testing';
8+
import {MdChipInput, MdChipInputEvent} from './chip-input';
9+
import {MdChipsModule} from './index';
910

10-
import {ENTER} from '@angular/material/core';
1111

1212
const COMMA = 188;
1313

‎src/lib/chips/chip-input.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {
10-
Directive,
11-
ElementRef,
12-
Output,
13-
EventEmitter,
14-
Input,
15-
} from '@angular/core';
169
import {coerceBooleanProperty} from '@angular/cdk/coercion';
17-
import {ENTER} from '@angular/material/core';
10+
import {ENTER} from '@angular/cdk/keycodes';
11+
import {Directive, ElementRef, EventEmitter, Input, Output,} from '@angular/core';
1812
import {MdChipList} from './chip-list';
1913

14+
2015
export interface MdChipInputEvent {
2116
input: HTMLInputElement;
2217
value: string;

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
import {FocusKeyManager} from '@angular/cdk/a11y';
2+
import {Directionality} from '@angular/cdk/bidi';
3+
import {BACKSPACE, DELETE, ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE, TAB} from '@angular/cdk/keycodes';
24
import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
35
import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
46
import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
57
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
6-
import {
7-
BACKSPACE,
8-
DELETE,
9-
Directionality,
10-
ENTER,
11-
LEFT_ARROW,
12-
RIGHT_ARROW,
13-
SPACE,
14-
TAB,
15-
} from '@angular/material/core';
168
import {MdFormFieldModule} from '@angular/material/form-field';
179
import {By} from '@angular/platform-browser';
1810
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
19-
2011
import {MdInputModule} from '../input/index';
2112
import {MdChip} from './chip';
2213
import {MdChipInputEvent} from './chip-input';

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@
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+
89
import {FocusKeyManager} from '@angular/cdk/a11y';
10+
import {Directionality} from '@angular/cdk/bidi';
911
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1012
import {SelectionModel} from '@angular/cdk/collections';
13+
import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW,} from '@angular/cdk/keycodes';
1114
import {startWith} from '@angular/cdk/rxjs';
1215
import {
1316
AfterContentInit,
14-
ChangeDetectorRef,
1517
ChangeDetectionStrategy,
18+
ChangeDetectorRef,
1619
Component,
1720
ContentChildren,
1821
ElementRef,
@@ -28,21 +31,11 @@ import {
2831
ViewEncapsulation,
2932
} from '@angular/core';
3033
import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
31-
import {
32-
BACKSPACE,
33-
DELETE,
34-
Directionality,
35-
LEFT_ARROW,
36-
RIGHT_ARROW,
37-
UP_ARROW
38-
} from '@angular/material/core';
3934
import {MdFormFieldControl} from '@angular/material/form-field';
40-
4135
import {Observable} from 'rxjs/Observable';
4236
import {merge} from 'rxjs/observable/merge';
4337
import {Subject} from 'rxjs/Subject';
4438
import {Subscription} from 'rxjs/Subscription';
45-
4639
import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
4740
import {MdChipInput} from './chip-input';
4841

‎src/lib/chips/chip.spec.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import {Directionality} from '@angular/cdk/bidi';
2+
import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
3+
import {createKeyboardEvent} from '@angular/cdk/testing';
4+
import {Component, DebugElement} from '@angular/core';
15
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
2-
import {Component, DebugElement} from '@angular/core';
36
import {By} from '@angular/platform-browser';
4-
import {createKeyboardEvent} from '@angular/cdk/testing';
5-
import {MdChipList, MdChip, MdChipEvent, MdChipsModule, MdChipSelectionChange} from './index';
6-
import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
7-
import {Directionality} from '@angular/material/core';
7+
import {MdChip, MdChipEvent, MdChipList, MdChipSelectionChange, MdChipsModule} from './index';
8+
89

910
describe('Chips', () => {
1011
let fixture: ComponentFixture<any>;

0 commit comments

Comments
 (0)