Skip to content

Commit a7a3967

Browse files
crisbetotinayuangao
authored andcommitted
fix(snack-bar): SimpleSnackBar not being exported (#3016)
* Fixes the `SimpleSnackBar` class not being exported. * Moves the `MdSnackBarModule` to the `index.ts` for consistency with other modules. Fixes #3010.
1 parent 1a854e7 commit a7a3967

File tree

4 files changed

+28
-35
lines changed

4 files changed

+28
-35
lines changed

src/lib/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {MdIconModule} from './icon/index';
2727
import {MdProgressSpinnerModule} from './progress-spinner/index';
2828
import {MdProgressBarModule} from './progress-bar/index';
2929
import {MdInputModule} from './input/index';
30-
import {MdSnackBarModule} from './snack-bar/snack-bar';
30+
import {MdSnackBarModule} from './snack-bar/index';
3131
import {MdTabsModule} from './tabs/index';
3232
import {MdToolbarModule} from './toolbar/index';
3333
import {MdTooltipModule} from './tooltip/index';

src/lib/snack-bar/index.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1+
import {NgModule, ModuleWithProviders} from '@angular/core';
2+
import {OverlayModule, PortalModule, CompatibilityModule, LIVE_ANNOUNCER_PROVIDER} from '../core';
3+
import {CommonModule} from '@angular/common';
4+
import {MdSnackBar} from './snack-bar';
5+
import {MdSnackBarContainer} from './snack-bar-container';
6+
import {SimpleSnackBar} from './simple-snack-bar';
7+
8+
@NgModule({
9+
imports: [OverlayModule, PortalModule, CommonModule, CompatibilityModule],
10+
exports: [MdSnackBarContainer, CompatibilityModule],
11+
declarations: [MdSnackBarContainer, SimpleSnackBar],
12+
entryComponents: [MdSnackBarContainer, SimpleSnackBar],
13+
providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
14+
})
15+
export class MdSnackBarModule {
16+
/** @deprecated */
17+
static forRoot(): ModuleWithProviders {
18+
return {
19+
ngModule: MdSnackBarModule,
20+
providers: []
21+
};
22+
}
23+
}
24+
125
export * from './snack-bar';
226
export * from './snack-bar-container';
327
export * from './snack-bar-config';
428
export * from './snack-bar-ref';
29+
export * from './simple-snack-bar';

src/lib/snack-bar/snack-bar.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ import {
99
} from '@angular/core/testing';
1010
import {NgModule, Component, Directive, ViewChild, ViewContainerRef} from '@angular/core';
1111
import {CommonModule} from '@angular/common';
12-
import {MdSnackBar, MdSnackBarModule} from './snack-bar';
13-
import {MdSnackBarConfig} from './snack-bar-config';
12+
import {MdSnackBarModule, MdSnackBar, MdSnackBarConfig, SimpleSnackBar} from './index';
1413
import {OverlayContainer, LiveAnnouncer} from '../core';
15-
import {SimpleSnackBar} from './simple-snack-bar';
1614

1715

1816
// TODO(josephperrott): Update tests to mock waiting for time to complete for animations.

src/lib/snack-bar/snack-bar.ts

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
import {
2-
NgModule,
3-
ModuleWithProviders,
4-
Injectable,
5-
ComponentRef,
6-
Optional,
7-
SkipSelf,
8-
} from '@angular/core';
1+
import {Injectable, ComponentRef, Optional, SkipSelf} from '@angular/core';
92
import {
103
ComponentType,
114
ComponentPortal,
125
Overlay,
13-
OverlayModule,
146
OverlayRef,
157
OverlayState,
16-
PortalModule,
178
LiveAnnouncer,
18-
CompatibilityModule,
19-
LIVE_ANNOUNCER_PROVIDER,
209
} from '../core';
21-
import {CommonModule} from '@angular/common';
2210
import {MdSnackBarConfig} from './snack-bar-config';
2311
import {MdSnackBarRef} from './snack-bar-ref';
2412
import {MdSnackBarContainer} from './snack-bar-container';
@@ -160,21 +148,3 @@ export class MdSnackBar {
160148
function _applyConfigDefaults(config: MdSnackBarConfig): MdSnackBarConfig {
161149
return extendObject(new MdSnackBarConfig(), config);
162150
}
163-
164-
165-
@NgModule({
166-
imports: [OverlayModule, PortalModule, CommonModule, CompatibilityModule],
167-
exports: [MdSnackBarContainer, CompatibilityModule],
168-
declarations: [MdSnackBarContainer, SimpleSnackBar],
169-
entryComponents: [MdSnackBarContainer, SimpleSnackBar],
170-
providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
171-
})
172-
export class MdSnackBarModule {
173-
/** @deprecated */
174-
static forRoot(): ModuleWithProviders {
175-
return {
176-
ngModule: MdSnackBarModule,
177-
providers: []
178-
};
179-
}
180-
}

0 commit comments

Comments
 (0)