refactor: merge next to master

CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="1.8.1"></a>
+## [1.8.1](https://github.com/NG-ZORRO/ng-zorro-antd/compare/1.8.0...1.8.1) (2018-11-24)
+
+
+### Bug Fixes
+
+* **collapse:** can't fold up active panel with accordion ([#2440](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2440)) ([a17ea49](https://github.com/NG-ZORRO/ng-zorro-antd/commit/a17ea49)), closes [#2437](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2437)
+* **list:** fix invalid render empty style when unspecified data source ([#2415](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2415)) ([7ae325f](https://github.com/NG-ZORRO/ng-zorro-antd/commit/7ae325f)), closes [#2385](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2385)
+* **menu:** fix dropdown menu item selected className ([#2434](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2434)) ([e6e2369](https://github.com/NG-ZORRO/ng-zorro-antd/commit/e6e2369)), closes [#2433](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2433)
+* **menu:** fix fold menu ([#2454](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2454)) ([e41640a](https://github.com/NG-ZORRO/ng-zorro-antd/commit/e41640a)), closes [#2449](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2449)
+
+
+### Features
+
+* Adds danish locale ([#2486](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2486)) ([811a009](https://github.com/NG-ZORRO/ng-zorro-antd/commit/811a009)), closes [#2485](https://github.com/NG-ZORRO/ng-zorro-antd/issues/2485)
+
+
+
 <a name="1.8.0"></a>
 # [1.8.0](https://github.com/NG-ZORRO/ng-zorro-antd/compare/1.7.1...1.8.0) (2018-10-26)
 

README-zh_CN.md

@@ -38,7 +38,7 @@ Ant Design 的 Angular 实现，开发和服务于企业级后台产品。
 
 ## 🖥 支持环境
 
-- Angular `^6.0.0`
+- Angular `^7.0.0`
 - 现代浏览器，以及 Internet Explorer 11+ （使用 [polyfills](https://angular.io/guide/browser-support)）
 - [Electron](http://electron.atom.io/)
 
@@ -70,7 +70,7 @@ $ ng add ng-zorro-antd
 在每一个需要使用组件的 module 中引入 `NgZorroAntdModule`。
 
 ```ts
-import { NgZorroAntModule } from 'ng-zorro-antd';
+import { NgZorroAntdModule } from 'ng-zorro-antd';
 
 @NgModule({
   imports: [ NgZorroAntdModule ]

README.md

@@ -39,7 +39,7 @@ English | [简体中文](README-zh_CN.md)
 
 ## 🖥 Environment Support
 
-* Angular `^6.0.0`
+* Angular `^7.0.0`
 * Modern browsers and Internet Explorer 11+ (with [polyfills](https://angular.io/guide/browser-support))
 * [Electron](http://electron.atom.io/)
 
@@ -77,7 +77,7 @@ $ npm install ng-zorro-antd
 Import the module into every module where you want to use the components.
 
 ```ts
-import { NgZorroAntModule } from 'ng-zorro-antd';
+import { NgZorroAntdModule } from 'ng-zorro-antd';
 
 @NgModule({
   imports: [ NgZorroAntdModule ]

components/affix/affix.spec.ts

@@ -44,6 +44,8 @@ describe('affix', () => {
     new Event('pageshow'),
     new Event('load')
   ];
+  const height = 100;
+  const width = 100;
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
@@ -109,13 +111,13 @@ describe('affix', () => {
       describe('when element gets shifted horizontally', () => {
         it('adjusts left position accordingly to maintain natural position', fakeAsync(() => {
           setupInitialState();
-          componentObject.offsetTo(componentObject.elementRef(), { top: startOffset, left: 10, width: 100, height: 100 });
+          componentObject.offsetTo(componentObject.elementRef(), { top: startOffset, left: 10, width, height });
           emitScroll(window, defaultOffsetTop + startOffset + 1);
 
           expect(componentObject.wrap().offsetLeft).toBe(10);
 
           emitScroll(window, defaultOffsetTop + startOffset - 1);
-          componentObject.offsetTo(componentObject.elementRef(), { top: startOffset, left: 100, width: 100, height: 100 });
+          componentObject.offsetTo(componentObject.elementRef(), { top: startOffset, left: 100, width, height });
           emitScroll(window, defaultOffsetTop + startOffset + 1);
 
           expect(componentObject.wrap().offsetLeft).toBe(100);
@@ -288,6 +290,15 @@ describe('affix', () => {
       fixture.detectChanges();
       expect(component.updatePosition).toHaveBeenCalled();
     });
+
+    it('should be a string value', () => {
+      spyOn(component, 'updatePosition');
+      expect(component.updatePosition).not.toHaveBeenCalled();
+      fixture.detectChanges();
+      context.fakeTarget = '#target';
+      fixture.detectChanges();
+      expect(component.updatePosition).toHaveBeenCalled();
+    });
   });
 
   describe('(nzChange)', () => {
@@ -318,19 +329,20 @@ describe('affix', () => {
     }));
   });
 
-  it('should adjust the width when resize', fakeAsync(() => {
+  it('should adjust placeholder width when resize', fakeAsync(() => {
     const offsetTop = 150;
     context.newOffset = offsetTop;
     setupInitialState({ offsetTop: offsetTop + 1 });
     emitScroll(window, 2);
+    expect(componentObject.elementRef().style.width).toBe(`${width}px`);
     componentObject.offsetYTo(componentObject.elementRef(), offsetTop + 2);
     tick(20);
     fixture.detectChanges();
     componentObject.emitEvent(window, new Event('resize'));
     tick(20);
     fixture.detectChanges();
 
-    expect(componentObject.wrap().offsetTop).toBe(offsetTop);
+    expect(componentObject.elementRef().style.width).toBe(``);
 
     discardPeriodicTasks();
   }));
@@ -352,7 +364,7 @@ describe('affix', () => {
     }
 
     getOffset(el: Element): Offset {
-      return this.offsets[el.id] || { top: 10, left: 0, height: 100, width: 100 };
+      return this.offsets[el.id] || { top: 10, left: 0, height, width };
     }
 
     emitEvent(el: Element | Window, event: Event): void {
@@ -368,8 +380,8 @@ describe('affix', () => {
       this.offsets[this.getKey(el)] = {
         top: offset.top,
         left: offset.left,
-        height: 100,
-        width: 100
+        height,
+        width
       };
     }
 
@@ -379,8 +391,8 @@ describe('affix', () => {
         {
           top: offsetTop,
           left: 0,
-          height: 100,
-          width: 100
+          height,
+          width
         }
       );
     }
@@ -486,14 +498,12 @@ describe('affix-extra', () => {
     <button id="content">Affix Button</button>
   </nz-affix>
   <div id="target"></div>
-  `,
-  styleUrls: [ './style/index.less' ],
-  encapsulation: ViewEncapsulation.None
+  `
 })
 class TestAffixComponent {
   @ViewChild(NzAffixComponent)
   nzAffixComponent: NzAffixComponent;
-  fakeTarget: Element | Window = null;
+  fakeTarget: string | Element | Window = null;
   newOffset: {};
   newOffsetBottom: {};
 }

components/affix/doc/index.en-US.md

@@ -20,7 +20,7 @@ Please note that Affix should not cover other content on the page, especially wh
 | -------- | ----------- | ---- | ------- |
 | `[nzOffsetBottom]` | Pixels to offset from bottom when calculating position of scroll | number | - |
 | `[nzOffsetTop]` | Pixels to offset from top when calculating position of scroll | number | 0 |
-| `[nzTarget]` | specifies the scrollable area dom node | `HTMLElement` | `window` |
+| `[nzTarget]` | specifies the scrollable area dom node | `string, HTMLElement` | `window` |
 | `(nzChange)` | Callback for when affix state is changed | `EventEmitter<boolean>` | - |
 
 **Note:** Children of `nz-affix` can not be `position: absolute`, but you can set `nz-affix` as `position: absolute`:

components/affix/doc/index.zh-CN.md

@@ -21,7 +21,7 @@ title: Affix
 | --- | --- | --- | --- |
 | `[nzOffsetBottom]` | 距离窗口底部达到指定偏移量后触发 | number |  |
 | `[nzOffsetTop]` | 距离窗口顶部达到指定偏移量后触发 | number |  |
-| `[nzTarget]` | 设置 `nz-affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | `HTMLElement` | `window` |
+| `[nzTarget]` | 设置 `nz-affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | `string, HTMLElement` | `window` |
 | `(nzChange)` | 固定状态改变时触发的回调函数 | `EventEmitter<boolean>` | 无 |
 
 **注意：**`nz-affix` 内的元素不要使用绝对定位，如需要绝对定位的效果，可以直接设置 `nz-affix` 为绝对定位：

components/affix/nz-affix.component.ts

@@ -1,15 +1,17 @@
-// tslint:disable:no-any
+import { DOCUMENT } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   ElementRef,
   EventEmitter,
+  Inject,
   Input,
   OnDestroy,
   OnInit,
   Output,
-  ViewChild
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
 
 import { NzScrollService } from '../core/scroll/nz-scroll.service';
@@ -21,41 +23,23 @@ import { throttleByAnimationFrameDecorator } from '../core/util/throttleByAnimat
   selector       : 'nz-affix',
   templateUrl    : './nz-affix.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styles         : [
-    `:host {
+  styles         : [ `
+    nz-affix {
       display: block;
-    }`
-  ]
+    }
+  ` ],
+  encapsulation  : ViewEncapsulation.None
 })
 export class NzAffixComponent implements OnInit, OnDestroy {
 
-  private timeout: any;
-  private events = [
-    'resize',
-    'scroll',
-    'touchstart',
-    'touchmove',
-    'touchend',
-    'pageshow',
-    'load'
-  ];
-  private affixStyle: any;
-  private placeholderStyle: any;
-
-  @ViewChild('wrap') private wrap: ElementRef;
-
-  private _target: Element | Window = window;
-
   @Input()
-  set nzTarget(value: Element | Window) {
+  set nzTarget(value: string | Element | Window) {
     this.clearEventListeners();
-    this._target = value || window;
+    this._target = typeof value === 'string' ? this.doc.querySelector(value) : value || window;
     this.setTargetEventListeners();
     this.updatePosition({});
   }
 
-  private _offsetTop: number;
-
   @Input()
   set nzOffsetTop(value: number) {
     if (typeof value === 'undefined') {
@@ -68,8 +52,6 @@ export class NzAffixComponent implements OnInit, OnDestroy {
     return this._offsetTop;
   }
 
-  private _offsetBottom: number;
-
   @Input()
   set nzOffsetBottom(value: number) {
     if (typeof value === 'undefined') {
@@ -78,43 +60,48 @@ export class NzAffixComponent implements OnInit, OnDestroy {
     this._offsetBottom = toNumber(value, null);
   }
 
-  @Output() nzChange: EventEmitter<boolean> = new EventEmitter();
+  @Output()
+  readonly nzChange: EventEmitter<boolean> = new EventEmitter();
 
-  constructor(private scrollSrv: NzScrollService, private _el: ElementRef, private cd: ChangeDetectorRef) {
+  // tslint:disable-next-line:no-any
+  constructor(private scrollSrv: NzScrollService, private _el: ElementRef, @Inject(DOCUMENT) private doc: any, private cd: ChangeDetectorRef) {
   }
 
+  private timeout;
+  private events = [
+    'resize',
+    'scroll',
+    'touchstart',
+    'touchmove',
+    'touchend',
+    'pageshow',
+    'load'
+  ];
+  private affixStyle;
+  private placeholderStyle;
+
+  @ViewChild('wrap') private wrap: ElementRef;
+
+  private _target: Element | Window = window;
+
+  private _offsetTop: number;
+
+  private _offsetBottom: number;
+
   ngOnInit(): void {
     this.timeout = setTimeout(() => {
       this.setTargetEventListeners();
       this.updatePosition({});
     });
   }
 
-  private setTargetEventListeners(): void {
-    this.clearEventListeners();
-    this.events.forEach((eventName: string) => {
-      this._target.addEventListener(eventName, this.updatePosition, false);
-    });
-  }
-
-  private clearEventListeners(): void {
-    this.events.forEach(eventName => {
-      this._target.removeEventListener(eventName, this.updatePosition, false);
-    });
-  }
-
   ngOnDestroy(): void {
     this.clearEventListeners();
     clearTimeout(this.timeout);
+    // tslint:disable-next-line:no-any
     (this.updatePosition as any).cancel();
   }
 
-  private getTargetRect(target: Element | Window | null): ClientRect {
-    return target !== window ?
-      (target as HTMLElement).getBoundingClientRect() :
-      { top: 0, left: 0, bottom: 0 } as ClientRect;
-  }
-
   getOffset(element: Element, target: Element | Window | null): {
     top: number;
     left: number;
@@ -127,7 +114,7 @@ export class NzAffixComponent implements OnInit, OnDestroy {
     const scrollTop = this.scrollSrv.getScroll(target, true);
     const scrollLeft = this.scrollSrv.getScroll(target, false);
 
-    const docElem = window.document.body;
+    const docElem = this.doc.body;
     const clientTop = docElem.clientTop || 0;
     const clientLeft = docElem.clientLeft || 0;
 
@@ -139,6 +126,25 @@ export class NzAffixComponent implements OnInit, OnDestroy {
     };
   }
 
+  private setTargetEventListeners(): void {
+    this.clearEventListeners();
+    this.events.forEach((eventName: string) => {
+      this._target.addEventListener(eventName, this.updatePosition, false);
+    });
+  }
+
+  private clearEventListeners(): void {
+    this.events.forEach(eventName => {
+      this._target.removeEventListener(eventName, this.updatePosition, false);
+    });
+  }
+
+  private getTargetRect(target: Element | Window | null): ClientRect {
+    return target !== window ?
+      (target as HTMLElement).getBoundingClientRect() :
+      { top: 0, left: 0, bottom: 0 } as ClientRect;
+  }
+
   private genStyle(affixStyle: {}): string {
     if (affixStyle == null) {
       return '';
@@ -149,7 +155,7 @@ export class NzAffixComponent implements OnInit, OnDestroy {
     }).join(';');
   }
 
-  private setAffixStyle(e: any, affixStyle: {}): void {
+  private setAffixStyle(e: Event, affixStyle: {}): void {
     const originalAffixStyle = this.affixStyle;
     const isWindow = this._target === window;
     if (e.type === 'scroll' && originalAffixStyle && affixStyle && isWindow) {
@@ -185,6 +191,7 @@ export class NzAffixComponent implements OnInit, OnDestroy {
   }
 
   @throttleByAnimationFrameDecorator()
+  // tslint:disable-next-line:no-any
   updatePosition(e: any): void {
     const targetNode = this._target;
     // Backwards support
@@ -250,5 +257,4 @@ export class NzAffixComponent implements OnInit, OnDestroy {
       this.setPlaceholderStyle(null);
     }
   }
-
 }