fix(module: popupservice): set popupservice providers in referenced c…

…omponents. (#449)
NG-ZORRO · May 21, 2019 · a14ea6b · a14ea6b
1 parent 8e90387
commit a14ea6b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/components/action-sheet/action-sheet.module.ts b/components/action-sheet/action-sheet.module.ts
@@ -8,9 +8,10 @@ import { WhiteSpaceModule} from '../white-space/white-space.module';
 import { LocaleProviderModule } from '../locale-provider/locale-provider.module';
 import { PopupService } from '../core/services/popup.service';
 import { ActionSheetService } from './action-sheet.service';
+import { OverlayModule } from '@angular/cdk/overlay';
 
 @NgModule({
-  imports: [CommonModule, NgZorroAntdMobilePipesModule, ListModule, WhiteSpaceModule, WingBlankModule, LocaleProviderModule],
+  imports: [CommonModule,OverlayModule, NgZorroAntdMobilePipesModule, ListModule, WhiteSpaceModule, WingBlankModule, LocaleProviderModule],
   declarations: [
     ActionSheetComponent
   ],

diff --git a/components/core/services/popup.service.ts b/components/core/services/popup.service.ts
@@ -1,7 +1,9 @@
 import { Injectable, Injector, ComponentRef } from '@angular/core';
 import { Overlay, OverlayConfig, OverlayRef, GlobalPositionStrategy } from '@angular/cdk/overlay';
 import { ComponentPortal } from '@angular/cdk/portal';
-
+@Injectable({
+  providedIn: 'root'
+})
 @Injectable()
 export class PopupService {
   static overlay: Overlay = null;

diff --git a/components/modal/modal.module.ts b/components/modal/modal.module.ts
@@ -9,7 +9,8 @@ import { ButtonModule } from '../button/button.module';
 import { InputItemModule } from '../input-item/input-item.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AlertOptions } from './modal-options.provider';
-
+import { OverlayModule } from '@angular/cdk/overlay';
+import { PopupService } from '../core/services/popup.service';
 @NgModule({
   imports: [
     CommonModule,
@@ -19,11 +20,12 @@ import { AlertOptions } from './modal-options.provider';
     ButtonModule,
     InputItemModule,
     FormsModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    OverlayModule
   ],
   exports: [ModalComponent, ModalServiceComponent],
   declarations: [ModalComponent, ModalServiceComponent],
   entryComponents: [ModalServiceComponent],
-  providers: [AlertOptions, ModalService]
+  providers: [AlertOptions, ModalService, PopupService]
 })
 export class ModalModule {}
diff --git a/components/picker/picker.module.ts b/components/picker/picker.module.ts
@@ -5,9 +5,10 @@ import { PickerDirective } from './picker.directive';
 import { PickerOptions } from './picker-options.provider';
 import { PopupService } from '../core/services/popup.service';
 import { PickerService } from './picker.service';
+import { OverlayModule } from '@angular/cdk/overlay';
 
 @NgModule({
-  imports: [CommonModule],
+  imports: [CommonModule, OverlayModule],
   exports: [PickerComponent, PickerDirective],
   declarations: [PickerComponent, PickerDirective],
   providers: [PickerOptions, PopupService, PickerService],