From 8c908d1f4978e6ca31f53f146e7835d9026c864a Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Thu, 9 Feb 2017 19:25:28 +0100
Subject: [PATCH] fix(snack-bar): SimpleSnackBar not being exported

* Fixes the `SimpleSnackBar` class not being exported.
* Moves the `MdSnackBarModule` to the `index.ts` for consistency with other modules.

Fixes #3010.
---
 src/lib/module.ts                   |  2 +-
 src/lib/snack-bar/index.ts          | 25 ++++++++++++++++++++++
 src/lib/snack-bar/snack-bar.spec.ts |  4 +---
 src/lib/snack-bar/snack-bar.ts      | 32 +----------------------------
 4 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/src/lib/module.ts b/src/lib/module.ts
index 490e419cb133..970cdd5785ea 100644
--- a/src/lib/module.ts
+++ b/src/lib/module.ts
@@ -27,7 +27,7 @@ import {MdIconModule} from './icon/index';
 import {MdProgressSpinnerModule} from './progress-spinner/index';
 import {MdProgressBarModule} from './progress-bar/index';
 import {MdInputModule} from './input/index';
-import {MdSnackBarModule} from './snack-bar/snack-bar';
+import {MdSnackBarModule} from './snack-bar/index';
 import {MdTabsModule} from './tabs/index';
 import {MdToolbarModule} from './toolbar/index';
 import {MdTooltipModule} from './tooltip/index';
diff --git a/src/lib/snack-bar/index.ts b/src/lib/snack-bar/index.ts
index b07c7374a06e..2425ecce98e9 100644
--- a/src/lib/snack-bar/index.ts
+++ b/src/lib/snack-bar/index.ts
@@ -1,4 +1,29 @@
+import {NgModule, ModuleWithProviders} from '@angular/core';
+import {OverlayModule, PortalModule, CompatibilityModule, LIVE_ANNOUNCER_PROVIDER} from '../core';
+import {CommonModule} from '@angular/common';
+import {MdSnackBar} from './snack-bar';
+import {MdSnackBarContainer} from './snack-bar-container';
+import {SimpleSnackBar} from './simple-snack-bar';
+
+@NgModule({
+  imports: [OverlayModule, PortalModule, CommonModule, CompatibilityModule],
+  exports: [MdSnackBarContainer, CompatibilityModule],
+  declarations: [MdSnackBarContainer, SimpleSnackBar],
+  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
+  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
+})
+export class MdSnackBarModule {
+  /** @deprecated */
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdSnackBarModule,
+      providers: []
+    };
+  }
+}
+
 export * from './snack-bar';
 export * from './snack-bar-container';
 export * from './snack-bar-config';
 export * from './snack-bar-ref';
+export * from './simple-snack-bar';
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index e733d33ee6de..d7c13c01a4b9 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -9,10 +9,8 @@ import {
 } from '@angular/core/testing';
 import {NgModule, Component, Directive, ViewChild, ViewContainerRef} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdSnackBar, MdSnackBarModule} from './snack-bar';
-import {MdSnackBarConfig} from './snack-bar-config';
+import {MdSnackBarModule, MdSnackBar, MdSnackBarConfig, SimpleSnackBar} from './index';
 import {OverlayContainer, LiveAnnouncer} from '../core';
-import {SimpleSnackBar} from './simple-snack-bar';
 
 
 // TODO(josephperrott): Update tests to mock waiting for time to complete for animations.
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index e944e53099a1..4adeded7193e 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -1,24 +1,12 @@
-import {
-  NgModule,
-  ModuleWithProviders,
-  Injectable,
-  ComponentRef,
-  Optional,
-  SkipSelf,
-} from '@angular/core';
+import {Injectable, ComponentRef, Optional, SkipSelf} from '@angular/core';
 import {
   ComponentType,
   ComponentPortal,
   Overlay,
-  OverlayModule,
   OverlayRef,
   OverlayState,
-  PortalModule,
   LiveAnnouncer,
-  CompatibilityModule,
-  LIVE_ANNOUNCER_PROVIDER,
 } from '../core';
-import {CommonModule} from '@angular/common';
 import {MdSnackBarConfig} from './snack-bar-config';
 import {MdSnackBarRef} from './snack-bar-ref';
 import {MdSnackBarContainer} from './snack-bar-container';
@@ -160,21 +148,3 @@ export class MdSnackBar {
 function _applyConfigDefaults(config: MdSnackBarConfig): MdSnackBarConfig {
   return extendObject(new MdSnackBarConfig(), config);
 }
-
-
-@NgModule({
-  imports: [OverlayModule, PortalModule, CommonModule, CompatibilityModule],
-  exports: [MdSnackBarContainer, CompatibilityModule],
-  declarations: [MdSnackBarContainer, SimpleSnackBar],
-  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
-  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
-})
-export class MdSnackBarModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdSnackBarModule,
-      providers: []
-    };
-  }
-}