From 9522658918e90ca2f01b4ebca565a280cc424354 Mon Sep 17 00:00:00 2001 From: Hsuan Lee Date: Wed, 19 Jun 2019 21:15:47 +0800 Subject: [PATCH] chore: sync with antd 3.19 (#3590) * chore: sync with antd 3.19 * test(module:page-header): fix test --- .../page-header/nz-page-header.component.html | 8 +++++--- components/page-header/nz-page-header.component.ts | 13 ++++++++++++- components/page-header/nz-page-header.spec.ts | 6 +++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/components/page-header/nz-page-header.component.html b/components/page-header/nz-page-header.component.html index 0556d96660..055fb04948 100644 --- a/components/page-header/nz-page-header.component.html +++ b/components/page-header/nz-page-header.component.html @@ -1,8 +1,10 @@ -
- - +
+
+ + +
diff --git a/components/page-header/nz-page-header.component.ts b/components/page-header/nz-page-header.component.ts index a168c6b6b5..ed7150df0e 100644 --- a/components/page-header/nz-page-header.component.ts +++ b/components/page-header/nz-page-header.component.ts @@ -32,7 +32,18 @@ import { NzPageHeaderFooterDirective } from './nz-page-header-cells'; host: { class: 'ant-page-header', '[class.ant-page-header-has-footer]': 'nzPageHeaderFooter' - } + }, + styles: [ + ` + .ant-page-header-back-button { + border: 0px; + background: transparent; + padding: 0px; + line-height: inherit; + display: inline-block; + } + ` + ] }) export class NzPageHeaderComponent implements OnInit, OnChanges { isTemplateRefBackIcon = false; diff --git a/components/page-header/nz-page-header.spec.ts b/components/page-header/nz-page-header.spec.ts index e57dbd21fd..fccd1e64be 100644 --- a/components/page-header/nz-page-header.spec.ts +++ b/components/page-header/nz-page-header.spec.ts @@ -65,14 +65,14 @@ describe('NzPageHeaderComponent', () => { const fixture = TestBed.createComponent(NzDemoPageHeaderBasicComponent); const pageHeader = fixture.debugElement.query(By.directive(NzPageHeaderComponent)); fixture.detectChanges(); - expect(pageHeader.nativeElement.querySelector('.ant-page-header-back-icon > i.anticon-arrow-left')).toBeTruthy(); + expect(pageHeader.nativeElement.querySelector('.ant-page-header-back i.anticon-arrow-left')).toBeTruthy(); }); it('should does not have an default back icon', () => { const fixture = TestBed.createComponent(NzDemoPageHeaderContentComponent); const pageHeader = fixture.debugElement.query(By.directive(NzPageHeaderComponent)); fixture.detectChanges(); - expect(pageHeader.nativeElement.querySelector('.ant-page-header-back-icon')).toBeFalsy(); + expect(pageHeader.nativeElement.querySelector('.ant-page-header-back')).toBeFalsy(); }); it('should nzBack work', () => { @@ -82,7 +82,7 @@ describe('NzPageHeaderComponent', () => { spyOn(context, 'onBack'); fixture.detectChanges(); expect(context.onBack).not.toHaveBeenCalled(); - const back = pageHeader.nativeElement.querySelector('.ant-page-header-back-icon'); + const back = pageHeader.nativeElement.querySelector('.ant-page-header-back'); (back as HTMLElement).click(); fixture.detectChanges(); expect(context.onBack).toHaveBeenCalled();