Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(layout:sider): support for custom trigger with nzCollapsedWidth set to 0 #1951

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion components/layout/demo/custom-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Component, TemplateRef, ViewChild } from '@angular/core';
selector: 'nz-demo-layout-custom-trigger',
template: `
<nz-layout>
<nz-sider nzCollapsible [(nzCollapsed)]="isCollapsed" [nzTrigger]="triggerTemplate">
<nz-sider nzCollapsible [(nzCollapsed)]="isCollapsed" [nzCollapsedWidth]="collapsedWidth" [nzTrigger]="triggerTemplate" [nzZeroTrigger]="zeroTriggerTemplate">
<div class="logo">
</div>
<ul nz-menu [nzTheme]="'dark'" [nzMode]="'inline'" [nzInlineCollapsed]="isCollapsed">
Expand Down Expand Up @@ -71,10 +71,18 @@ import { Component, TemplateRef, ViewChild } from '@angular/core';
export class NzDemoLayoutCustomTriggerComponent {
isCollapsed = false;
triggerTemplate = null;
zeroTriggerTemplate = null;
collapsedWidth = 80;
@ViewChild('trigger') customTrigger: TemplateRef<void>;

/** custom trigger can be TemplateRef **/
changeTrigger(): void {
this.triggerTemplate = this.customTrigger;
}

/** custom trigger can be TemplateRef **/
changeZeroWidthTrigger(): void {
this.collapsedWidth = 0;
this.zeroTriggerTemplate = this.customTrigger;
}
}
28 changes: 28 additions & 0 deletions components/layout/nz-layout.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,34 @@ describe('layout', () => {
expect(trigger).not.toBeNull();
});
});

describe('custom-zero-trigger', () => {
let sider;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports : [ NzLayoutModule ],
declarations: [ NzDemoLayoutCustomTriggerComponent ],
providers : [],
schemas : [ NO_ERRORS_SCHEMA ]
}).compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(NzDemoLayoutCustomTriggerComponent);
testComponent = fixture.debugElement.componentInstance;
sider = fixture.debugElement.query(By.directive(NzSiderComponent)).injector.get(NzSiderComponent);
});
it('should display custom zero trigger', () => {
testComponent.changeZeroWidthTrigger();
testComponent.isCollapsed = true;
fixture.detectChanges();
const trigger = fixture.debugElement.query(By.css('.ant-layout-sider-zero-width-trigger'));
expect(trigger).not.toBeNull();
expect(trigger.nativeElement.firstElementChild.classList.contains('anticon-up')).toBe(true);
});
});

describe('responsive', () => {
let sider;

Expand Down
5 changes: 4 additions & 1 deletion components/layout/nz-sider.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<ng-content></ng-content>
</div>
<span class="ant-layout-sider-zero-width-trigger" *ngIf="isZeroTrigger" (click)="toggleCollapse()">
<i class="anticon anticon-bars"></i>
<ng-template [ngTemplateOutlet]="nzZeroTrigger"></ng-template>
</span>
<div class="ant-layout-sider-trigger" *ngIf="isSiderTrigger" (click)="toggleCollapse()" [style.width.px]="nzCollapsed?nzCollapsedWidth:nzWidth">
<ng-template [ngTemplateOutlet]="nzTrigger"></ng-template>
</div>
<ng-template #defaultTrigger>
<i class="anticon" [class.anticon-left]="!nzCollapsed" [class.anticon-right]="nzCollapsed" *ngIf="!nzReverseArrow"></i>
<i class="anticon" [class.anticon-left]="nzCollapsed" [class.anticon-right]="!nzCollapsed" *ngIf="nzReverseArrow"></i>
</ng-template>
<ng-template #defaultZeroTrigger>
<i class="anticon anticon-bars"></i>
</ng-template>
10 changes: 10 additions & 0 deletions components/layout/nz-sider.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export class NzSiderComponent implements OnInit, AfterViewInit {
private _collapsed = false;
private _collapsible = false;
@ViewChild('defaultTrigger') _trigger: TemplateRef<void>;
@ViewChild('defaultZeroTrigger') _zeroTrigger: TemplateRef<void>;
private _reverseArrow = false;
private below = false;
private isInit = false;
Expand Down Expand Up @@ -65,6 +66,15 @@ export class NzSiderComponent implements OnInit, AfterViewInit {
return this._trigger;
}

@Input()
set nzZeroTrigger(value: TemplateRef<void>) {
this._zeroTrigger = value;
}

get nzZeroTrigger(): TemplateRef<void> {
return this._zeroTrigger;
}

@Input()
set nzCollapsible(value: boolean) {
this._collapsible = toBoolean(value);
Expand Down