move overlay providers in individual files

Author: jelbourn

src/lib/core/overlay/overlay-container.ts

@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import {Injectable, Optional, SkipSelf} from '@angular/core';
 
 
 /**
@@ -31,3 +31,12 @@ export class OverlayContainer {
     this._containerElement = container;
   }
 }
+
+export const OVERLAY_CONTAINER_PROVIDER = {
+  // If there is already an OverlayContainer available, use that. Otherwise, provide a new one.
+  provide: OverlayContainer,
+  deps: [[new Optional(), new SkipSelf(), OverlayContainer]],
+  useFactory: (parentContainer: OverlayContainer) => {
+    return parentContainer || new OverlayContainer();
+  }
+};

src/lib/core/overlay/overlay.ts

@@ -4,17 +4,15 @@ import {
   ApplicationRef,
   Injector,
   NgZone,
-  Optional,
-  SkipSelf,
   Provider,
 } from '@angular/core';
 import {OverlayState} from './overlay-state';
 import {DomPortalHost} from '../portal/dom-portal-host';
 import {OverlayRef} from './overlay-ref';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {VIEWPORT_RULER_PROVIDER} from './position/viewport-ruler';
-import {OverlayContainer} from './overlay-container';
-import {ScrollDispatcher} from './scroll/scroll-dispatcher';
+import {OverlayContainer, OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
+import {SCROLL_DISPATCHER_PROVIDER} from './scroll/scroll-dispatcher';
 
 
 /** Next overlay unique ID. */
@@ -96,20 +94,6 @@ export const OVERLAY_PROVIDERS: Provider[] = [
   Overlay,
   OverlayPositionBuilder,
   VIEWPORT_RULER_PROVIDER,
-  {
-    // If there is already an ScrollDispatcher available, use that. Otherwise, provide a new one.
-    provide: ScrollDispatcher,
-    deps: [[new Optional(), new SkipSelf(), ScrollDispatcher]],
-    useFactory: (parentDispatcher: ScrollDispatcher) => {
-      return parentDispatcher || new ScrollDispatcher();
-    }
-  },
-  {
-    // If there is already an OverlayContainer available, use that. Otherwise, provide a new one.
-    provide: OverlayContainer,
-    deps: [[new Optional(), new SkipSelf(), OverlayContainer]],
-    useFactory: (parentContainer: OverlayContainer) => {
-      return parentContainer || new OverlayContainer();
-    }
-  }
+  SCROLL_DISPATCHER_PROVIDER,
+  OVERLAY_CONTAINER_PROVIDER,
 ];

src/lib/core/overlay/scroll/scroll-dispatcher.ts

@@ -1,4 +1,4 @@
-import {Injectable, ElementRef} from '@angular/core';
+import {Injectable, ElementRef, Optional, SkipSelf} from '@angular/core';
 import {Scrollable} from './scrollable';
 import {Subject} from 'rxjs/Subject';
 import {Observable} from 'rxjs/Observable';
@@ -88,3 +88,11 @@ export class ScrollDispatcher {
   }
 }
 
+export const SCROLL_DISPATCHER_PROVIDER = {
+  // If there is already an ScrollDispatcher available, use that. Otherwise, provide a new one.
+  provide: ScrollDispatcher,
+  deps: [[new Optional(), new SkipSelf(), ScrollDispatcher]],
+  useFactory: (parentDispatcher: ScrollDispatcher) => {
+    return parentDispatcher || new ScrollDispatcher();
+  }
+};