feat(cdk): move cdkScrollable, ScrollDispatcher, and ViewportRuler out of overlay (#6547)

Author: jelbourn

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';
 
 

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';
 

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';

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';

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', () => {

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.

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';
 

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';
 
 
 /**

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 { }

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.