From 2bc3d940b52a97be6c8ec404f68147409212d881 Mon Sep 17 00:00:00 2001 From: Wilson Zeng Date: Mon, 13 Nov 2017 14:43:08 +0800 Subject: [PATCH] fix(packaging): move all injections of "Document" to "any", fix nz-message's generic type usage for latest typescript --- src/components/anchor/nz-anchor.component.ts | 2 +- src/components/core/scroll/nz-scroll.service.ts | 2 +- src/components/message/nz-message-config.ts | 2 +- .../message/nz-message-container.component.ts | 10 +++++----- src/components/message/nz-message.component.ts | 2 +- src/components/message/nz-message.service.ts | 4 ++-- src/components/notification/nz-notification-config.ts | 2 +- .../nz-notification-container.component.ts | 2 +- src/components/root/nz-root.component.ts | 2 +- src/components/root/nz-root.module.ts | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/anchor/nz-anchor.component.ts b/src/components/anchor/nz-anchor.component.ts index 4c70886c101..a717a8772ca 100644 --- 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 = 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 index 99042ccb597..c9363b189d1 100644 --- 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 index 116ad0abf13..807aa0fc195 100644 --- 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 index 8e9a2cc4aaa..60b90527bec 100644 --- 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 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 index 88c4c830726..1b04720c298 100644 --- 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) { } + 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 index a6aed7e267e..8fceb6bfc04 100644 --- 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, MessageData> { +export class NzMessageBaseService { protected _counter = 0; // Id counter for messages protected _container: ContainerClass; @@ -38,7 +38,7 @@ export class NzMessageBaseService, NzMessageData> { +export class NzMessageService extends NzMessageBaseService { 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 index 47b53f46c56..5f24063d4da 100644 --- 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 index da2c360a686..8218c96b00c 100644 --- 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 { +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 index 9ec732aa3a5..d26f758edc7 100644 --- 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 index 27f5c12fb8a..55cf83121c5 100644 --- 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; - 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);