fix(packaging): move all injections of "Document" to "any", fix nz-me…

…ssage's generic type usage for latest typescript
NG-ZORRO · Nov 13, 2017 · 2bc3d94 · 2bc3d94
1 parent d52c6bb
commit 2bc3d94
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/src/components/anchor/nz-anchor.component.ts b/src/components/anchor/nz-anchor.component.ts
@@ -70,7 +70,7 @@ export class NzAnchorComponent implements OnDestroy, OnInit {
 
   @Output() nzScroll: EventEmitter<NzAnchorLinkComponent> = new EventEmitter();
 
-  constructor(private scrollSrv: NzScrollService, private _renderer: Renderer2, @Inject(DOCUMENT) private doc: Document) {
+  constructor(private scrollSrv: NzScrollService, private _renderer: Renderer2, @Inject(DOCUMENT) private doc: any) {
   }
 
   ngOnInit(): void {

diff --git a/src/components/core/scroll/nz-scroll.service.ts b/src/components/core/scroll/nz-scroll.service.ts
@@ -15,7 +15,7 @@ function easeInOutCubic(t: number, b: number, c: number, d: number) {
 @Injectable()
 export class NzScrollService {
 
-  constructor(@Inject(DOCUMENT) private doc: Document) {
+  constructor(@Inject(DOCUMENT) private doc: any) {
   }
 
   /** 设置 `el` 滚动条位置 */

diff --git a/src/components/message/nz-message-config.ts b/src/components/message/nz-message-config.ts
@@ -1,6 +1,6 @@
 import { InjectionToken } from '@angular/core';
 
-export class NzMessageConfig {
+export interface NzMessageConfig {
   // For all messages as default config (can override when dynamically created)
   nzDuration?: number;
   nzPauseOnHover?: boolean;

diff --git a/src/components/message/nz-message-container.component.ts b/src/components/message/nz-message-container.component.ts
@@ -14,13 +14,13 @@ import { NZ_MESSAGE_CONFIG, NZ_MESSAGE_DEFAULT_CONFIG, NzMessageConfig } from '.
     './style/index.less'
   ]
 })
-export class NzMessageContainerComponent<Config extends NzMessageConfig> implements OnInit {
+export class NzMessageContainerComponent implements OnInit {
   messages: NzMessageDataFilled[] = [];
-  config: Config;
+  config: NzMessageConfig;
 
-  constructor(@Optional() @Inject(NZ_MESSAGE_DEFAULT_CONFIG) defaultConfig: Config,
-              @Optional() @Inject(NZ_MESSAGE_CONFIG) config: Config) {
-    this.config = Object.assign({}, defaultConfig, config) as Config;
+  constructor(@Optional() @Inject(NZ_MESSAGE_DEFAULT_CONFIG) defaultConfig: NzMessageConfig,
+              @Optional() @Inject(NZ_MESSAGE_CONFIG) config: NzMessageConfig) {
+    this.config = Object.assign({}, defaultConfig, config) as NzMessageConfig;
   }
 
   ngOnInit() { }

diff --git a/src/components/message/nz-message.component.ts b/src/components/message/nz-message.component.ts
@@ -69,7 +69,7 @@ export class NzMessageComponent implements OnInit, OnDestroy {
   private _eraseTimingStart: number;
   private _eraseTTL: number; // Time to live
 
-  constructor(private _messageContainer: NzMessageContainerComponent<NzMessageConfig>) { }
+  constructor(private _messageContainer: NzMessageContainerComponent) { }
 
   ngOnInit() {
     this._options = this.nzMessage.options;

diff --git a/src/components/message/nz-message.service.ts b/src/components/message/nz-message.service.ts
@@ -5,7 +5,7 @@ import { NzMessageConfig } from './nz-message-config';
 import { NzMessageData, NzMessageDataFilled, NzMessageDataOptions } from './nz-message.definitions';
 import { NzMessageContainerComponent } from './nz-message-container.component';
 
-export class NzMessageBaseService<ContainerClass extends NzMessageContainerComponent<any>, MessageData> {
+export class NzMessageBaseService<ContainerClass extends NzMessageContainerComponent, MessageData> {
   protected _counter = 0; // Id counter for messages
   protected _container: ContainerClass;
 
@@ -38,7 +38,7 @@ export class NzMessageBaseService<ContainerClass extends NzMessageContainerCompo
 }
 
 @Injectable()
-export class NzMessageService extends NzMessageBaseService<NzMessageContainerComponent<NzMessageConfig>, NzMessageData> {
+export class NzMessageService extends NzMessageBaseService<NzMessageContainerComponent, NzMessageData> {
 
   constructor(overlay: Overlay) {
     super(overlay, NzMessageContainerComponent, 'message-');

diff --git a/src/components/notification/nz-notification-config.ts b/src/components/notification/nz-notification-config.ts
@@ -1,7 +1,7 @@
 import { InjectionToken } from '@angular/core';
 import { NzMessageConfig } from '../message/nz-message-config';
 
-export class NzNotificationConfig extends NzMessageConfig {
+export interface NzNotificationConfig extends NzMessageConfig {
   nzTop?: string;
   nzRight?: string;
 }

diff --git a/src/components/notification/nz-notification-container.component.ts b/src/components/notification/nz-notification-container.component.ts
@@ -14,7 +14,7 @@ import { NzMessageContainerComponent } from '../message/nz-message-container.com
     './style/index.less'
   ]
 })
-export class NzNotificationContainerComponent extends NzMessageContainerComponent<NzNotificationConfig> {
+export class NzNotificationContainerComponent extends NzMessageContainerComponent {
 
   constructor(@Optional() @Inject(NZ_NOTIFICATION_DEFAULT_CONFIG) defaultConfig: NzNotificationConfig,
               @Optional() @Inject(NZ_NOTIFICATION_CONFIG) config: NzNotificationConfig) {

diff --git a/src/components/root/nz-root.component.ts b/src/components/root/nz-root.component.ts
@@ -21,7 +21,7 @@ export class NzRootComponent implements OnInit {
   @Input() nzExtraFontUrl: string;
 
   constructor(
-    @Inject(DOCUMENT) private _document: Document,
+    @Inject(DOCUMENT) private _document: any,
     // Cannot use type annotation here due to https://github.com/angular/angular-cli/issues/2034
     // Should be revisited after AOT being made the only option
     @Inject(NZ_ROOT_CONFIG) @Optional() private options: any | undefined,

diff --git a/src/components/root/nz-root.module.ts b/src/components/root/nz-root.module.ts
@@ -17,7 +17,7 @@ import { NZ_ROOT_CONFIG, createNzRootInitializer } from './nz-root-config';
 export class NzRootModule implements OnDestroy {
   private styleHostComponent: ComponentRef<NzRootStyleComponent>;
 
-  constructor(@Inject(DOCUMENT) _document: Document, injector: Injector, resolver: ComponentFactoryResolver) {
+  constructor(@Inject(DOCUMENT) _document: any, injector: Injector, resolver: ComponentFactoryResolver) {
     const componentFactory = resolver.resolveComponentFactory(NzRootStyleComponent);
     const div = _document.createElement('div');
     this.styleHostComponent = componentFactory.create(injector, null, div);