diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts index 33d7b7bbe58..0ba80be29cd 100644 --- a/src/cdk/overlay/position/connected-position-strategy.spec.ts +++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts @@ -1,12 +1,12 @@ import {ElementRef} from '@angular/core'; import {TestBed, inject} from '@angular/core/testing'; import {ConnectedPositionStrategy} from './connected-position-strategy'; -import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler'; +import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling'; import {OverlayPositionBuilder} from './overlay-position-builder'; import {ConnectedOverlayPositionChange} from './connected-position'; -import {Scrollable} from '../scroll/scrollable'; +import {Scrollable} from '@angular/cdk/scrolling'; import {Subscription} from 'rxjs/Subscription'; -import {ScrollDispatchModule} from '../scroll/index'; +import {ScrollDispatchModule} from '@angular/cdk/scrolling'; import {OverlayRef} from '../overlay-ref'; diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts index 6f7fef8aaf9..101e8c23bdf 100644 --- a/src/cdk/overlay/position/connected-position-strategy.ts +++ b/src/cdk/overlay/position/connected-position-strategy.ts @@ -8,7 +8,7 @@ import {PositionStrategy} from './position-strategy'; import {ElementRef} from '@angular/core'; -import {ViewportRuler} from './viewport-ruler'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import { ConnectionPositionPair, OriginConnectionPosition, @@ -18,7 +18,7 @@ import { } from './connected-position'; import {Subject} from 'rxjs/Subject'; import {Observable} from 'rxjs/Observable'; -import {Scrollable} from '../scroll/scrollable'; +import {Scrollable} from '@angular/cdk/scrolling'; import {isElementScrolledOutsideView, isElementClippedByScrolling} from './scroll-clip'; import {OverlayRef} from '../overlay-ref'; diff --git a/src/cdk/overlay/position/overlay-position-builder.ts b/src/cdk/overlay/position/overlay-position-builder.ts index 5f0d85b538e..1ce90297093 100644 --- a/src/cdk/overlay/position/overlay-position-builder.ts +++ b/src/cdk/overlay/position/overlay-position-builder.ts @@ -7,7 +7,7 @@ */ import {ElementRef, Injectable} from '@angular/core'; -import {ViewportRuler} from './viewport-ruler'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {ConnectedPositionStrategy} from './connected-position-strategy'; import {GlobalPositionStrategy} from './global-position-strategy'; import {OverlayConnectionPosition, OriginConnectionPosition} from './connected-position'; diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/public_api.ts index 572474a2dd3..f376b761e4a 100644 --- a/src/cdk/overlay/public_api.ts +++ b/src/cdk/overlay/public_api.ts @@ -8,15 +8,15 @@ import {NgModule, Provider} from '@angular/core'; import {PortalModule} from '@angular/cdk/portal'; import {Overlay} from './overlay'; -import {ScrollDispatchModule} from './scroll/index'; +import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling'; import { ConnectedOverlayDirective, - OverlayOrigin, MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER, + OverlayOrigin, } from './overlay-directives'; import {OverlayPositionBuilder} from './position/overlay-position-builder'; -import {VIEWPORT_RULER_PROVIDER} from './position/viewport-ruler'; import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container'; +import {ScrollStrategyOptions} from './scroll/scroll-strategy-options'; export const OVERLAY_PROVIDERS: Provider[] = [ @@ -31,7 +31,7 @@ export const OVERLAY_PROVIDERS: Provider[] = [ imports: [PortalModule, ScrollDispatchModule], exports: [ConnectedOverlayDirective, OverlayOrigin, ScrollDispatchModule], declarations: [ConnectedOverlayDirective, OverlayOrigin], - providers: [OVERLAY_PROVIDERS], + providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions], }) export class OverlayModule {} @@ -42,7 +42,7 @@ export {FullscreenOverlayContainer} from './fullscreen-overlay-container'; export {OverlayRef} from './overlay-ref'; export {OverlayState} from './overlay-state'; export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives'; -export {ViewportRuler} from './position/viewport-ruler'; +export {ViewportRuler} from '@angular/cdk/scrolling'; export {ComponentType} from '@angular/cdk/portal'; export * from './position/connected-position'; @@ -52,4 +52,4 @@ export * from './scroll/index'; export {PositionStrategy} from './position/position-strategy'; export {GlobalPositionStrategy} from './position/global-position-strategy'; export {ConnectedPositionStrategy} from './position/connected-position-strategy'; -export {VIEWPORT_RULER_PROVIDER} from './position/viewport-ruler'; +export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling'; diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts index 98b920341db..2be0acd12f7 100644 --- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts +++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts @@ -1,15 +1,9 @@ -import {NgModule, Component} from '@angular/core'; -import {inject, TestBed, async} from '@angular/core/testing'; +import {Component, NgModule} from '@angular/core'; +import {async, inject, TestBed} from '@angular/core/testing'; import {ComponentPortal, PortalModule} from '@angular/cdk/portal'; import {Platform} from '@angular/cdk/platform'; -import { - OverlayModule, - ViewportRuler, - OverlayState, - Overlay, - OverlayRef, - OverlayContainer, -} from '../index'; +import {ViewportRuler} from '@angular/cdk/scrolling'; +import {Overlay, OverlayContainer, OverlayModule, OverlayRef, OverlayState} from '../index'; describe('BlockScrollStrategy', () => { diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts index ef60e7d6084..3960e760491 100644 --- a/src/cdk/overlay/scroll/block-scroll-strategy.ts +++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts @@ -7,7 +7,7 @@ */ import {ScrollStrategy} from './scroll-strategy'; -import {ViewportRuler} from '../position/viewport-ruler'; +import {ViewportRuler} from '@angular/cdk/scrolling'; /** * Strategy that will prevent the user from scrolling while the overlay is visible. diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts index 2dffe7ef538..2fc805efe39 100644 --- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts +++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts @@ -2,12 +2,12 @@ import {inject, TestBed, async} from '@angular/core/testing'; import {NgModule, Component} from '@angular/core'; import {Subject} from 'rxjs/Subject'; import {ComponentPortal, PortalModule} from '@angular/cdk/portal'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; import { Overlay, OverlayState, OverlayRef, OverlayModule, - ScrollDispatcher, OverlayContainer, } from '../index'; diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts index edcf2c76574..7f6b6bf10d7 100644 --- a/src/cdk/overlay/scroll/close-scroll-strategy.ts +++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts @@ -9,7 +9,7 @@ import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy'; import {OverlayRef} from '../overlay-ref'; import {Subscription} from 'rxjs/Subscription'; -import {ScrollDispatcher} from './scroll-dispatcher'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; /** diff --git a/src/cdk/overlay/scroll/index.ts b/src/cdk/overlay/scroll/index.ts index 73b1708a2b4..1bd3b1b6fbc 100644 --- a/src/cdk/overlay/scroll/index.ts +++ b/src/cdk/overlay/scroll/index.ts @@ -6,14 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {NgModule} from '@angular/core'; -import {PlatformModule} from '@angular/cdk/platform'; -import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher'; -import {Scrollable} from './scrollable'; -import {ScrollStrategyOptions} from './scroll-strategy-options'; - -export {Scrollable} from './scrollable'; -export {ScrollDispatcher} from './scroll-dispatcher'; +export {Scrollable, ScrollDispatcher} from '@angular/cdk/scrolling'; // Export pre-defined scroll strategies and interface to build custom ones. export {ScrollStrategy} from './scroll-strategy'; @@ -22,11 +15,3 @@ export {RepositionScrollStrategy} from './reposition-scroll-strategy'; export {CloseScrollStrategy} from './close-scroll-strategy'; export {NoopScrollStrategy} from './noop-scroll-strategy'; export {BlockScrollStrategy} from './block-scroll-strategy'; - -@NgModule({ - imports: [PlatformModule], - exports: [Scrollable], - declarations: [Scrollable], - providers: [SCROLL_DISPATCHER_PROVIDER, ScrollStrategyOptions], -}) -export class ScrollDispatchModule { } diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts index a51fa05d28d..69128998b80 100644 --- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts +++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts @@ -9,7 +9,7 @@ import {Subscription} from 'rxjs/Subscription'; import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy'; import {OverlayRef} from '../overlay-ref'; -import {ScrollDispatcher} from './scroll-dispatcher'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; /** * Config options for the RepositionScrollStrategy. diff --git a/src/cdk/overlay/scroll/scroll-strategy-options.ts b/src/cdk/overlay/scroll/scroll-strategy-options.ts index 2ecbf3cc72a..4b558805fc1 100644 --- a/src/cdk/overlay/scroll/scroll-strategy-options.ts +++ b/src/cdk/overlay/scroll/scroll-strategy-options.ts @@ -10,8 +10,8 @@ import {Injectable} from '@angular/core'; import {CloseScrollStrategy} from './close-scroll-strategy'; import {NoopScrollStrategy} from './noop-scroll-strategy'; import {BlockScrollStrategy} from './block-scroll-strategy'; -import {ScrollDispatcher} from './scroll-dispatcher'; -import {ViewportRuler} from '../position/viewport-ruler'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import { RepositionScrollStrategy, RepositionScrollStrategyConfig, diff --git a/src/cdk/scrolling/index.ts b/src/cdk/scrolling/index.ts new file mode 100644 index 00000000000..f93e7c31d56 --- /dev/null +++ b/src/cdk/scrolling/index.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export * from './public_api'; diff --git a/src/cdk/scrolling/public_api.ts b/src/cdk/scrolling/public_api.ts new file mode 100644 index 00000000000..96b6f3a842b --- /dev/null +++ b/src/cdk/scrolling/public_api.ts @@ -0,0 +1,24 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import {NgModule} from '@angular/core'; +import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher'; +import {Scrollable} from './scrollable'; +import {PlatformModule} from '@angular/cdk/platform'; + +@NgModule({ + imports: [PlatformModule], + exports: [Scrollable], + declarations: [Scrollable], + providers: [SCROLL_DISPATCHER_PROVIDER], +}) +export class ScrollDispatchModule {} + +export * from './scroll-dispatcher'; +export * from './scrollable'; +export * from './viewport-ruler'; diff --git a/src/cdk/overlay/scroll/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts similarity index 98% rename from src/cdk/overlay/scroll/scroll-dispatcher.spec.ts rename to src/cdk/scrolling/scroll-dispatcher.spec.ts index 94112e82c67..d08dc5f8cf4 100644 --- a/src/cdk/overlay/scroll/scroll-dispatcher.spec.ts +++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts @@ -1,7 +1,7 @@ import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing'; import {NgModule, Component, ViewChild, ElementRef} from '@angular/core'; +import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public_api'; import {dispatchFakeEvent} from '@angular/cdk/testing'; -import {OverlayModule, Scrollable, ScrollDispatcher} from '../index'; describe('Scroll Dispatcher', () => { @@ -176,7 +176,7 @@ class NestedScrollingComponent { const TEST_COMPONENTS = [ScrollingComponent, NestedScrollingComponent]; @NgModule({ - imports: [OverlayModule], + imports: [ScrollDispatchModule], providers: [ScrollDispatcher], exports: TEST_COMPONENTS, declarations: TEST_COMPONENTS, diff --git a/src/cdk/overlay/scroll/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts similarity index 99% rename from src/cdk/overlay/scroll/scroll-dispatcher.ts rename to src/cdk/scrolling/scroll-dispatcher.ts index a85adc5fcff..177f830ac2c 100644 --- a/src/cdk/overlay/scroll/scroll-dispatcher.ts +++ b/src/cdk/scrolling/scroll-dispatcher.ts @@ -8,12 +8,12 @@ import {ElementRef, Injectable, NgZone, Optional, SkipSelf} from '@angular/core'; import {Platform} from '@angular/cdk/platform'; -import {Scrollable} from './scrollable'; import {Subject} from 'rxjs/Subject'; import {Subscription} from 'rxjs/Subscription'; import {fromEvent} from 'rxjs/observable/fromEvent'; import {merge} from 'rxjs/observable/merge'; -import {auditTime} from '../../rxjs/index'; +import {auditTime} from 'rxjs/operator/auditTime'; +import {Scrollable} from './scrollable'; /** Time in ms to throttle the scrolling events by default. */ diff --git a/src/cdk/overlay/scroll/scrollable.ts b/src/cdk/scrolling/scrollable.ts similarity index 100% rename from src/cdk/overlay/scroll/scrollable.ts rename to src/cdk/scrolling/scrollable.ts diff --git a/src/cdk/scrolling/tsconfig-build.json b/src/cdk/scrolling/tsconfig-build.json new file mode 100644 index 00000000000..20b5757fb12 --- /dev/null +++ b/src/cdk/scrolling/tsconfig-build.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig-build", + "files": [ + "public_api.ts" + ], + "angularCompilerOptions": { + "annotateForClosureCompiler": true, + "strictMetadataEmit": true, + "flatModuleOutFile": "index.js", + "flatModuleId": "@angular/cdk/scrolling", + "skipTemplateCodegen": true + } +} diff --git a/src/cdk/overlay/position/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts similarity index 98% rename from src/cdk/overlay/position/viewport-ruler.spec.ts rename to src/cdk/scrolling/viewport-ruler.spec.ts index ec87f596144..349b00efb18 100644 --- a/src/cdk/overlay/position/viewport-ruler.spec.ts +++ b/src/cdk/scrolling/viewport-ruler.spec.ts @@ -1,5 +1,5 @@ import {TestBed, inject} from '@angular/core/testing'; -import {ScrollDispatchModule} from '../scroll/index'; +import {ScrollDispatchModule} from './public_api'; import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler'; diff --git a/src/cdk/overlay/position/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts similarity index 98% rename from src/cdk/overlay/position/viewport-ruler.ts rename to src/cdk/scrolling/viewport-ruler.ts index 6a9e62485bd..fbd55ad9e2d 100644 --- a/src/cdk/overlay/position/viewport-ruler.ts +++ b/src/cdk/scrolling/viewport-ruler.ts @@ -7,7 +7,7 @@ */ import {Injectable, Optional, SkipSelf} from '@angular/core'; -import {ScrollDispatcher} from '../scroll/scroll-dispatcher'; +import {ScrollDispatcher} from './scroll-dispatcher'; /** diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts index 267598c7cad..6965450053b 100644 --- a/src/demo-app/system-config.ts +++ b/src/demo-app/system-config.ts @@ -37,6 +37,7 @@ System.config({ '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js', '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js', '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js', + '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js', '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js', '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js', }, diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts index d99329ec07d..2360a995fe4 100644 --- a/src/e2e-app/system-config.ts +++ b/src/e2e-app/system-config.ts @@ -37,6 +37,7 @@ System.config({ '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js', '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js', '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js', + '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js', '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js', '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js', '@angular/material-examples': 'dist/bundles/material-examples.umd.js', diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts index 91f7f6a5e0f..3678b583caa 100644 --- a/src/lib/autocomplete/autocomplete.spec.ts +++ b/src/lib/autocomplete/autocomplete.spec.ts @@ -11,7 +11,8 @@ import { import {By} from '@angular/platform-browser'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {OverlayContainer, ScrollDispatcher} from '@angular/cdk/overlay'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; +import {OverlayContainer} from '@angular/cdk/overlay'; import {Direction, Directionality} from '@angular/cdk/bidi'; import {map, RxChain, startWith} from '@angular/cdk/rxjs'; import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing'; diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts index 294ded4a264..e1d7dc74e67 100644 --- a/src/lib/button/button.spec.ts +++ b/src/lib/button/button.spec.ts @@ -1,7 +1,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {FakeViewportRuler} from '@angular/cdk/testing'; import {MdButtonModule} from './index'; import {MdRipple} from '../core/ripple/index'; diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts index bfdc0159c29..6abe20c6560 100644 --- a/src/lib/checkbox/checkbox.spec.ts +++ b/src/lib/checkbox/checkbox.spec.ts @@ -9,7 +9,7 @@ import { import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing'; import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './index'; import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer'; diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts index 400d872b314..4a16b4b3b28 100644 --- a/src/lib/core/ripple/index.ts +++ b/src/lib/core/ripple/index.ts @@ -7,7 +7,7 @@ */ import {NgModule} from '@angular/core'; -import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay'; +import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling'; import {PlatformModule} from '@angular/cdk/platform'; import {MdCommonModule} from '../common-behaviors/common-module'; import {MdRipple} from './ripple'; diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts index 1748a707d30..b6875b691ac 100644 --- a/src/lib/core/ripple/ripple-renderer.ts +++ b/src/lib/core/ripple/ripple-renderer.ts @@ -8,7 +8,7 @@ import {ElementRef, NgZone} from '@angular/core'; import {Platform} from '@angular/cdk/platform'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {RippleRef, RippleState} from './ripple-ref'; diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts index a3b1d491c26..5fb8608a8fe 100644 --- a/src/lib/core/ripple/ripple.spec.ts +++ b/src/lib/core/ripple/ripple.spec.ts @@ -1,7 +1,7 @@ import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; import {Platform} from '@angular/cdk/platform'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {dispatchMouseEvent} from '@angular/cdk/testing'; import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer'; import { diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts index 878453caaa1..e8c27b65e6d 100644 --- a/src/lib/core/ripple/ripple.ts +++ b/src/lib/core/ripple/ripple.ts @@ -18,7 +18,7 @@ import { InjectionToken, Optional, } from '@angular/core'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {Platform} from '@angular/cdk/platform'; import {RippleConfig, RippleRenderer} from './ripple-renderer'; import {RippleRef} from './ripple-ref'; diff --git a/src/lib/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts index 1ba5c0195ac..0e03603d646 100644 --- a/src/lib/radio/radio.spec.ts +++ b/src/lib/radio/radio.spec.ts @@ -2,7 +2,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing'; import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer'; import {MdRadioButton, MdRadioChange, MdRadioGroup, MdRadioModule} from './index'; diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts index cdab73d963b..18a6b6b90bf 100644 --- a/src/lib/select/select.spec.ts +++ b/src/lib/select/select.spec.ts @@ -22,7 +22,8 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing'; import {Directionality} from '@angular/cdk/bidi'; import {DOWN_ARROW, END, ENTER, HOME, SPACE, TAB, UP_ARROW} from '@angular/cdk/keycodes'; -import {OverlayContainer, ScrollDispatcher, ViewportRuler} from '@angular/cdk/overlay'; +import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling'; +import {OverlayContainer} from '@angular/cdk/overlay'; import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing'; import {Subject} from 'rxjs/Subject'; import {map} from 'rxjs/operator/map'; diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts index 58ee4f85de0..fec6353800b 100644 --- a/src/lib/tabs/index.ts +++ b/src/lib/tabs/index.ts @@ -10,7 +10,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {PortalModule} from '@angular/cdk/portal'; import {ObserversModule} from '@angular/cdk/observers'; -import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay'; +import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling'; import {MdCommonModule, MdRippleModule} from '../core'; import {MdTab} from './tab'; import {MdTabGroup} from './tab-group'; diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts index fc444a9a06a..d30a5835a8b 100644 --- a/src/lib/tabs/tab-group.spec.ts +++ b/src/lib/tabs/tab-group.spec.ts @@ -2,7 +2,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core'; import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations'; import {By} from '@angular/platform-browser'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing'; import {Observable} from 'rxjs/Observable'; import {MdTab, MdTabGroup, MdTabHeaderPosition, MdTabsModule} from './index'; diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts index 45af10e36c4..7d9ff944307 100644 --- a/src/lib/tabs/tab-header.spec.ts +++ b/src/lib/tabs/tab-header.spec.ts @@ -6,7 +6,7 @@ import {CommonModule} from '@angular/common'; import {By} from '@angular/platform-browser'; import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes'; import {PortalModule} from '@angular/cdk/portal'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {Direction, Directionality} from '@angular/cdk/bidi'; import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing'; import {MdTabHeader} from './tab-header'; diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts index 7bca77c309e..e38e006ad6a 100644 --- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts +++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts @@ -1,7 +1,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {dispatchFakeEvent, dispatchMouseEvent, FakeViewportRuler} from '@angular/cdk/testing'; import {Direction, Directionality} from '@angular/cdk/bidi'; import {Subject} from 'rxjs/Subject'; diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts index 8df00aaf7f7..8c51f8eec50 100644 --- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts +++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts @@ -25,7 +25,7 @@ import { QueryList, forwardRef, } from '@angular/core'; -import {ViewportRuler} from '@angular/cdk/overlay'; +import {ViewportRuler} from '@angular/cdk/scrolling'; import {Directionality} from '@angular/cdk/bidi'; import {Platform} from '@angular/cdk/platform'; import {auditTime, takeUntil} from '@angular/cdk/rxjs'; diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts index 6a9aa095f4b..1a4f1d699af 100644 --- a/src/lib/tooltip/tooltip.ts +++ b/src/lib/tooltip/tooltip.ts @@ -24,6 +24,7 @@ import { } from '@angular/core'; import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations'; import {ComponentPortal} from '@angular/cdk/portal'; +import {ScrollDispatcher} from '@angular/cdk/scrolling'; import {Observable} from 'rxjs/Observable'; import {Subject} from 'rxjs/Subject'; import {Directionality} from '@angular/cdk/bidi'; @@ -36,7 +37,6 @@ import { OverlayRef, OverlayState, RepositionScrollStrategy, - ScrollDispatcher, // This import is only used to define a generic type. The current TypeScript version incorrectly // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953) // tslint:disable-next-line:no-unused-variable diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js index df15bf56b75..7790a25cd57 100644 --- a/test/karma-test-shim.js +++ b/test/karma-test-shim.js @@ -59,6 +59,7 @@ System.config({ '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js', '@angular/cdk/portal': 'dist/packages/cdk/portal/index.js', '@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js', + '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js', '@angular/cdk/table': 'dist/packages/cdk/table/index.js', '@angular/cdk/testing': 'dist/packages/cdk/testing/index.js', },