Skip to content

Commit 0c4f08a

Browse files
committed
fix: remove cdk re-exports from @angular/material
BREAKING CHANGE: `@angular/material` no longer re-exports symbols from `@angular/cdk`.
1 parent 548eca0 commit 0c4f08a

Some content is hidden

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

66 files changed

+135
-478
lines changed
File renamed without changes.

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/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',
@@ -24,7 +25,8 @@ export class SnackBarDemo {
2425
horizontalPosition: MdSnackBarHorizontalPosition = 'center';
2526
verticalPosition: MdSnackBarVerticalPosition = 'bottom';
2627

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

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

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;

0 commit comments

Comments
 (0)