fix(module:list): fix loading style misplacement of spin (#1767)

close #1739
NG-ZORRO · Jul 2, 2018 · 336cc08 · 336cc08
1 parent 4eb039a
commit 336cc08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/components/list/list.spec.ts b/components/list/list.spec.ts
@@ -105,6 +105,13 @@ describe('list', () => {
           expect(dl.query(By.css('.ant-list-loading')) != null).toBe(value);
         });
       }
+
+      it('should be minimum area block when data is empty', () => {
+        context.nzLoading = true;
+        context.data = [];
+        fixture.detectChanges();
+        expect(dl.query(By.css('.ant-spin-nested-loading'))).not.toBeNull();
+      });
     });
 
     it('#nzDataSource', () => {

diff --git a/components/list/nz-list.component.html b/components/list/nz-list.component.html
@@ -9,6 +9,7 @@
   <ng-container *ngIf="_header; else _headerTpl">{{ _header }}</ng-container>
 </div>
 <nz-spin [nzSpinning]="nzLoading">
+  <div *ngIf="nzLoading && nzDataSource.length === 0" [style.min-height.px]="53"></div>
   <div *ngIf="nzGrid; else itemsTpl" nz-row [nzGutter]="nzGrid.gutter">
     <div nz-col [nzSpan]="nzGrid.span" [nzXs]="nzGrid.xs" [nzSm]="nzGrid.sm" [nzMd]="nzGrid.md" [nzLg]="nzGrid.lg" [nzXl]="nzGrid.xl" [nzXXl]="nzGrid.xxl"
       *ngFor="let item of nzDataSource; let index = index">