Skip to content

Commit 0f6a2ec

Browse files
jelbournkara
jelbourn
authored and
kara
committed
feat(cdk): move cdkScrollable, ScrollDispatcher, and ViewportRuler out of overlay (#6547)
1 parent c90ca55 commit 0f6a2ec

37 files changed

+95
-65
lines changed

‎src/cdk/overlay/position/connected-position-strategy.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {ElementRef} from '@angular/core';
22
import {TestBed, inject} from '@angular/core/testing';
33
import {ConnectedPositionStrategy} from './connected-position-strategy';
4-
import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
4+
import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
55
import {OverlayPositionBuilder} from './overlay-position-builder';
66
import {ConnectedOverlayPositionChange} from './connected-position';
7-
import {Scrollable} from '../scroll/scrollable';
7+
import {Scrollable} from '@angular/cdk/scrolling';
88
import {Subscription} from 'rxjs/Subscription';
9-
import {ScrollDispatchModule} from '../scroll/index';
9+
import {ScrollDispatchModule} from '@angular/cdk/scrolling';
1010
import {OverlayRef} from '../overlay-ref';
1111

1212

‎src/cdk/overlay/position/connected-position-strategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {PositionStrategy} from './position-strategy';
1010
import {ElementRef} from '@angular/core';
11-
import {ViewportRuler} from './viewport-ruler';
11+
import {ViewportRuler} from '@angular/cdk/scrolling';
1212
import {
1313
ConnectionPositionPair,
1414
OriginConnectionPosition,
@@ -18,7 +18,7 @@ import {
1818
} from './connected-position';
1919
import {Subject} from 'rxjs/Subject';
2020
import {Observable} from 'rxjs/Observable';
21-
import {Scrollable} from '../scroll/scrollable';
21+
import {Scrollable} from '@angular/cdk/scrolling';
2222
import {isElementScrolledOutsideView, isElementClippedByScrolling} from './scroll-clip';
2323
import {OverlayRef} from '../overlay-ref';
2424

‎src/cdk/overlay/position/overlay-position-builder.ts

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

99
import {ElementRef, Injectable} from '@angular/core';
10-
import {ViewportRuler} from './viewport-ruler';
10+
import {ViewportRuler} from '@angular/cdk/scrolling';
1111
import {ConnectedPositionStrategy} from './connected-position-strategy';
1212
import {GlobalPositionStrategy} from './global-position-strategy';
1313
import {OverlayConnectionPosition, OriginConnectionPosition} from './connected-position';

‎src/cdk/overlay/public_api.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import {NgModule, Provider} from '@angular/core';
99
import {PortalModule} from '@angular/cdk/portal';
1010
import {Overlay} from './overlay';
11-
import {ScrollDispatchModule} from './scroll/index';
11+
import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
1212
import {
1313
ConnectedOverlayDirective,
14-
OverlayOrigin,
1514
MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
15+
OverlayOrigin,
1616
} from './overlay-directives';
1717
import {OverlayPositionBuilder} from './position/overlay-position-builder';
18-
import {VIEWPORT_RULER_PROVIDER} from './position/viewport-ruler';
1918
import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
19+
import {ScrollStrategyOptions} from './scroll/scroll-strategy-options';
2020

2121

2222
export const OVERLAY_PROVIDERS: Provider[] = [
@@ -31,7 +31,7 @@ export const OVERLAY_PROVIDERS: Provider[] = [
3131
imports: [PortalModule, ScrollDispatchModule],
3232
exports: [ConnectedOverlayDirective, OverlayOrigin, ScrollDispatchModule],
3333
declarations: [ConnectedOverlayDirective, OverlayOrigin],
34-
providers: [OVERLAY_PROVIDERS],
34+
providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions],
3535
})
3636
export class OverlayModule {}
3737

@@ -42,7 +42,7 @@ export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
4242
export {OverlayRef} from './overlay-ref';
4343
export {OverlayState} from './overlay-state';
4444
export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
45-
export {ViewportRuler} from './position/viewport-ruler';
45+
export {ViewportRuler} from '@angular/cdk/scrolling';
4646
export {ComponentType} from '@angular/cdk/portal';
4747

4848
export * from './position/connected-position';
@@ -52,4 +52,4 @@ export * from './scroll/index';
5252
export {PositionStrategy} from './position/position-strategy';
5353
export {GlobalPositionStrategy} from './position/global-position-strategy';
5454
export {ConnectedPositionStrategy} from './position/connected-position-strategy';
55-
export {VIEWPORT_RULER_PROVIDER} from './position/viewport-ruler';
55+
export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';

‎src/cdk/overlay/scroll/block-scroll-strategy.spec.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import {NgModule, Component} from '@angular/core';
2-
import {inject, TestBed, async} from '@angular/core/testing';
1+
import {Component, NgModule} from '@angular/core';
2+
import {async, inject, TestBed} from '@angular/core/testing';
33
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
44
import {Platform} from '@angular/cdk/platform';
5-
import {
6-
OverlayModule,
7-
ViewportRuler,
8-
OverlayState,
9-
Overlay,
10-
OverlayRef,
11-
OverlayContainer,
12-
} from '../index';
5+
import {ViewportRuler} from '@angular/cdk/scrolling';
6+
import {Overlay, OverlayContainer, OverlayModule, OverlayRef, OverlayState} from '../index';
137

148

159
describe('BlockScrollStrategy', () => {

‎src/cdk/overlay/scroll/block-scroll-strategy.ts

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

99
import {ScrollStrategy} from './scroll-strategy';
10-
import {ViewportRuler} from '../position/viewport-ruler';
10+
import {ViewportRuler} from '@angular/cdk/scrolling';
1111

1212
/**
1313
* Strategy that will prevent the user from scrolling while the overlay is visible.

‎src/cdk/overlay/scroll/close-scroll-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import {inject, TestBed, async} from '@angular/core/testing';
22
import {NgModule, Component} from '@angular/core';
33
import {Subject} from 'rxjs/Subject';
44
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
5+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
56
import {
67
Overlay,
78
OverlayState,
89
OverlayRef,
910
OverlayModule,
10-
ScrollDispatcher,
1111
OverlayContainer,
1212
} from '../index';
1313

‎src/cdk/overlay/scroll/close-scroll-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy';
1010
import {OverlayRef} from '../overlay-ref';
1111
import {Subscription} from 'rxjs/Subscription';
12-
import {ScrollDispatcher} from './scroll-dispatcher';
12+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
1313

1414

1515
/**

‎src/cdk/overlay/scroll/index.ts

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

9-
import {NgModule} from '@angular/core';
10-
import {PlatformModule} from '@angular/cdk/platform';
11-
import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher';
12-
import {Scrollable} from './scrollable';
13-
import {ScrollStrategyOptions} from './scroll-strategy-options';
14-
15-
export {Scrollable} from './scrollable';
16-
export {ScrollDispatcher} from './scroll-dispatcher';
9+
export {Scrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
1710

1811
// Export pre-defined scroll strategies and interface to build custom ones.
1912
export {ScrollStrategy} from './scroll-strategy';
@@ -22,11 +15,3 @@ export {RepositionScrollStrategy} from './reposition-scroll-strategy';
2215
export {CloseScrollStrategy} from './close-scroll-strategy';
2316
export {NoopScrollStrategy} from './noop-scroll-strategy';
2417
export {BlockScrollStrategy} from './block-scroll-strategy';
25-
26-
@NgModule({
27-
imports: [PlatformModule],
28-
exports: [Scrollable],
29-
declarations: [Scrollable],
30-
providers: [SCROLL_DISPATCHER_PROVIDER, ScrollStrategyOptions],
31-
})
32-
export class ScrollDispatchModule { }

‎src/cdk/overlay/scroll/reposition-scroll-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {Subscription} from 'rxjs/Subscription';
1010
import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy';
1111
import {OverlayRef} from '../overlay-ref';
12-
import {ScrollDispatcher} from './scroll-dispatcher';
12+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
1313

1414
/**
1515
* Config options for the RepositionScrollStrategy.

‎src/cdk/overlay/scroll/scroll-strategy-options.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {Injectable} from '@angular/core';
1010
import {CloseScrollStrategy} from './close-scroll-strategy';
1111
import {NoopScrollStrategy} from './noop-scroll-strategy';
1212
import {BlockScrollStrategy} from './block-scroll-strategy';
13-
import {ScrollDispatcher} from './scroll-dispatcher';
14-
import {ViewportRuler} from '../position/viewport-ruler';
13+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
14+
import {ViewportRuler} from '@angular/cdk/scrolling';
1515
import {
1616
RepositionScrollStrategy,
1717
RepositionScrollStrategyConfig,

‎src/cdk/scrolling/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './public_api';

‎src/cdk/scrolling/public_api.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
import {NgModule} from '@angular/core';
10+
import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher';
11+
import {Scrollable} from './scrollable';
12+
import {PlatformModule} from '@angular/cdk/platform';
13+
14+
@NgModule({
15+
imports: [PlatformModule],
16+
exports: [Scrollable],
17+
declarations: [Scrollable],
18+
providers: [SCROLL_DISPATCHER_PROVIDER],
19+
})
20+
export class ScrollDispatchModule {}
21+
22+
export * from './scroll-dispatcher';
23+
export * from './scrollable';
24+
export * from './viewport-ruler';

‎src/cdk/overlay/scroll/scroll-dispatcher.spec.ts renamed to ‎src/cdk/scrolling/scroll-dispatcher.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
22
import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
3+
import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public_api';
34
import {dispatchFakeEvent} from '@angular/cdk/testing';
4-
import {OverlayModule, Scrollable, ScrollDispatcher} from '../index';
55

66
describe('Scroll Dispatcher', () => {
77

@@ -176,7 +176,7 @@ class NestedScrollingComponent {
176176

177177
const TEST_COMPONENTS = [ScrollingComponent, NestedScrollingComponent];
178178
@NgModule({
179-
imports: [OverlayModule],
179+
imports: [ScrollDispatchModule],
180180
providers: [ScrollDispatcher],
181181
exports: TEST_COMPONENTS,
182182
declarations: TEST_COMPONENTS,

‎src/cdk/overlay/scroll/scroll-dispatcher.ts renamed to ‎src/cdk/scrolling/scroll-dispatcher.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
import {ElementRef, Injectable, NgZone, Optional, SkipSelf} from '@angular/core';
1010
import {Platform} from '@angular/cdk/platform';
11-
import {Scrollable} from './scrollable';
1211
import {Subject} from 'rxjs/Subject';
1312
import {Subscription} from 'rxjs/Subscription';
1413
import {fromEvent} from 'rxjs/observable/fromEvent';
1514
import {merge} from 'rxjs/observable/merge';
16-
import {auditTime} from '../../rxjs/index';
15+
import {auditTime} from 'rxjs/operator/auditTime';
16+
import {Scrollable} from './scrollable';
1717

1818

1919
/** Time in ms to throttle the scrolling events by default. */

‎src/cdk/overlay/scroll/scrollable.ts renamed to ‎src/cdk/scrolling/scrollable.ts

File renamed without changes.

‎src/cdk/scrolling/tsconfig-build.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": "../tsconfig-build",
3+
"files": [
4+
"public_api.ts"
5+
],
6+
"angularCompilerOptions": {
7+
"annotateForClosureCompiler": true,
8+
"strictMetadataEmit": true,
9+
"flatModuleOutFile": "index.js",
10+
"flatModuleId": "@angular/cdk/scrolling",
11+
"skipTemplateCodegen": true
12+
}
13+
}

‎src/cdk/overlay/position/viewport-ruler.spec.ts renamed to ‎src/cdk/scrolling/viewport-ruler.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {TestBed, inject} from '@angular/core/testing';
2-
import {ScrollDispatchModule} from '../scroll/index';
2+
import {ScrollDispatchModule} from './public_api';
33
import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
44

55

‎src/cdk/overlay/position/viewport-ruler.ts renamed to ‎src/cdk/scrolling/viewport-ruler.ts

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

99
import {Injectable, Optional, SkipSelf} from '@angular/core';
10-
import {ScrollDispatcher} from '../scroll/scroll-dispatcher';
10+
import {ScrollDispatcher} from './scroll-dispatcher';
1111

1212

1313
/**

‎src/demo-app/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ System.config({
3737
'@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
3838
'@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
3939
'@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
40+
'@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
4041
'@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
4142
'@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
4243
},

‎src/e2e-app/system-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ System.config({
3737
'@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
3838
'@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
3939
'@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
40+
'@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
4041
'@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
4142
'@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
4243
'@angular/material-examples': 'dist/bundles/material-examples.umd.js',

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
import {By} from '@angular/platform-browser';
1212
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1313
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
14-
import {OverlayContainer, ScrollDispatcher} from '@angular/cdk/overlay';
14+
import {ScrollDispatcher} from '@angular/cdk/scrolling';
15+
import {OverlayContainer} from '@angular/cdk/overlay';
1516
import {Direction, Directionality} from '@angular/cdk/bidi';
1617
import {map, RxChain, startWith} from '@angular/cdk/rxjs';
1718
import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';

‎src/lib/button/button.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {Component, DebugElement} from '@angular/core';
33
import {By} from '@angular/platform-browser';
4-
import {ViewportRuler} from '@angular/cdk/overlay';
4+
import {ViewportRuler} from '@angular/cdk/scrolling';
55
import {FakeViewportRuler} from '@angular/cdk/testing';
66
import {MdButtonModule} from './index';
77
import {MdRipple} from '../core/ripple/index';

‎src/lib/checkbox/checkbox.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
1010
import {Component, DebugElement} from '@angular/core';
1111
import {By} from '@angular/platform-browser';
12-
import {ViewportRuler} from '@angular/cdk/overlay';
12+
import {ViewportRuler} from '@angular/cdk/scrolling';
1313
import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
1414
import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './index';
1515
import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';

‎src/lib/core/ripple/index.ts

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

99
import {NgModule} from '@angular/core';
10-
import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
10+
import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
1111
import {PlatformModule} from '@angular/cdk/platform';
1212
import {MdCommonModule} from '../common-behaviors/common-module';
1313
import {MdRipple} from './ripple';

‎src/lib/core/ripple/ripple-renderer.ts

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

99
import {ElementRef, NgZone} from '@angular/core';
1010
import {Platform} from '@angular/cdk/platform';
11-
import {ViewportRuler} from '@angular/cdk/overlay';
11+
import {ViewportRuler} from '@angular/cdk/scrolling';
1212
import {RippleRef, RippleState} from './ripple-ref';
1313

1414

‎src/lib/core/ripple/ripple.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
22
import {Component, ViewChild} from '@angular/core';
33
import {Platform} from '@angular/cdk/platform';
4-
import {ViewportRuler} from '@angular/cdk/overlay';
4+
import {ViewportRuler} from '@angular/cdk/scrolling';
55
import {dispatchMouseEvent} from '@angular/cdk/testing';
66
import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
77
import {

‎src/lib/core/ripple/ripple.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
InjectionToken,
1919
Optional,
2020
} from '@angular/core';
21-
import {ViewportRuler} from '@angular/cdk/overlay';
21+
import {ViewportRuler} from '@angular/cdk/scrolling';
2222
import {Platform} from '@angular/cdk/platform';
2323
import {RippleConfig, RippleRenderer} from './ripple-renderer';
2424
import {RippleRef} from './ripple-ref';

‎src/lib/radio/radio.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t
22
import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
33
import {Component, DebugElement} from '@angular/core';
44
import {By} from '@angular/platform-browser';
5-
import {ViewportRuler} from '@angular/cdk/overlay';
5+
import {ViewportRuler} from '@angular/cdk/scrolling';
66
import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
77
import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
88
import {MdRadioButton, MdRadioChange, MdRadioGroup, MdRadioModule} from './index';

‎src/lib/select/select.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2222
import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
2323
import {Directionality} from '@angular/cdk/bidi';
2424
import {DOWN_ARROW, END, ENTER, HOME, SPACE, TAB, UP_ARROW} from '@angular/cdk/keycodes';
25-
import {OverlayContainer, ScrollDispatcher, ViewportRuler} from '@angular/cdk/overlay';
25+
import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
26+
import {OverlayContainer} from '@angular/cdk/overlay';
2627
import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing';
2728
import {Subject} from 'rxjs/Subject';
2829
import {map} from 'rxjs/operator/map';

‎src/lib/tabs/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {PortalModule} from '@angular/cdk/portal';
1212
import {ObserversModule} from '@angular/cdk/observers';
13-
import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
13+
import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
1414
import {MdCommonModule, MdRippleModule} from '../core';
1515
import {MdTab} from './tab';
1616
import {MdTabGroup} from './tab-group';

0 commit comments

Comments
 (0)