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

fix(module:tooptip): fix setTitle proxy to nzTitle #2698

Merged
merged 2 commits into from
Jan 24, 2019
Merged
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
14 changes: 8 additions & 6 deletions components/popover/nz-popover.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
(@fadeAnimation.done)="_afterVisibilityAnimation($event)">
<div class="ant-popover-content">
<div class="ant-popover-arrow"></div>
<div class="ant-popover-inner">
<div class="ant-popover-title" *ngIf="nzTitle">
<ng-container *nzStringTemplateOutlet="nzTitle">{{ nzTitle }}</ng-container>
</div>
<div class="ant-popover-inner-content">
<ng-container *nzStringTemplateOutlet="nzContent">{{ nzContent }}</ng-container>
<div class="ant-popover-inner" role="tooltip">
<div>
<div class="ant-popover-title" *ngIf="nzTitle">
<ng-container *nzStringTemplateOutlet="nzTitle">{{ nzTitle }}</ng-container>
</div>
<div class="ant-popover-inner-content">
<ng-container *nzStringTemplateOutlet="nzContent">{{ nzContent }}</ng-container>
</div>
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion components/popover/nz-popover.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, Input, TemplateRef, ViewEncapsulation } from '@angular/core';

import { fadeAnimation } from '../core/animation/fade-animations';
import { isNotNil } from '../core/util';
import { NzToolTipComponent } from '../tooltip/nz-tooltip.component';
Expand All @@ -19,7 +20,8 @@ import { NzToolTipComponent } from '../tooltip/nz-tooltip.component';
export class NzPopoverComponent extends NzToolTipComponent {
_prefix = 'ant-popover-placement';

@Input() @ContentChild('neverUsedTemplate') nzTitle: string | TemplateRef<void>; // used to remove NzToolTipComponent @ContentChild('nzTemplate')
/** Used to remove NzToolTipComponent @ContentChild('nzTemplate') */
@Input() @ContentChild('neverUsedTemplate') nzTitle: string | TemplateRef<void>;
@Input() @ContentChild('nzTemplate') nzContent: string | TemplateRef<void>;

constructor(cdr: ChangeDetectorRef) {
Expand Down
30 changes: 15 additions & 15 deletions components/tooltip/nz-tooltip.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ContentChild,
EventEmitter,
Input,
OnChanges,
Output,
TemplateRef,
ViewChild,
Expand All @@ -37,7 +38,7 @@ import { toBoolean } from '../core/util/convert';
}
` ]
})
export class NzToolTipComponent {
export class NzToolTipComponent implements OnChanges {
_hasBackdrop = false;
_prefix = 'ant-tooltip-placement';
_positions: ConnectionPositionPair[] = [ ...DEFAULT_4_POSITIONS ];
Expand All @@ -55,8 +56,6 @@ export class NzToolTipComponent {
@Input() nzMouseEnterDelay = 0.15; // second
@Input() nzMouseLeaveDelay = 0.1; // second

@Output() readonly nzVisibleChange = new EventEmitter<boolean>();

@Input()
set nzVisible(value: boolean) {
const visible = toBoolean(value);
Expand All @@ -66,19 +65,15 @@ export class NzToolTipComponent {
}
}

get nzVisible(): boolean {
return this.visibleSource.value;
}
get nzVisible(): boolean { return this.visibleSource.value; }

@Input()
set nzTrigger(value: string) {
this._trigger = value;
this._hasBackdrop = this._trigger === 'click';
}

get nzTrigger(): string {
return this._trigger;
}
get nzTrigger(): string { return this._trigger; }

@Input()
set nzPlacement(value: string) {
Expand All @@ -88,8 +83,16 @@ export class NzToolTipComponent {
}
}

get nzPlacement(): string {
return this._placement;
get nzPlacement(): string { return this._placement; }

@Output() readonly nzVisibleChange = new EventEmitter<boolean>();

constructor(public cdr: ChangeDetectorRef) {}

ngOnChanges(): void {
Promise.resolve().then(() => {
this.updatePosition();
});
}

// Manually force updating current overlay's position
Expand All @@ -107,8 +110,7 @@ export class NzToolTipComponent {
}
}
this.setClassMap();
/** TODO may cause performance problem */
this.cdr.detectChanges();
this.cdr.detectChanges(); // TODO: performance?
}

show(): void {
Expand Down Expand Up @@ -141,8 +143,6 @@ export class NzToolTipComponent {
this.overlayOrigin = origin;
}

constructor(public cdr: ChangeDetectorRef) {}

protected isContentEmpty(): boolean {
return this.nzTitle instanceof TemplateRef ? false : (this.nzTitle === '' || !isNotNil(this.nzTitle));
}
Expand Down
7 changes: 6 additions & 1 deletion components/tooltip/nz-tooltip.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { NzToolTipComponent } from './nz-tooltip.component';

@Directive({
selector: '[nz-tooltip]',
host: {
host : {
'[class.ant-tooltip-open]': 'isTooltipOpen'
}
})
Expand Down Expand Up @@ -165,6 +165,11 @@ export class NzTooltipDirective implements AfterViewInit, OnChanges, OnInit, OnD
this.updateCompValue(key, change.currentValue);
}
});

if (changes.setTitle) {
this.nzTitle = changes.setTitle.currentValue;
this.updateCompValue('nzTitle', changes.setTitle.currentValue);
}
}
}
}
14 changes: 13 additions & 1 deletion components/tooltip/nz-tooltip.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,24 @@ describe('NzTooltip', () => {
expect(triggerElement.nextSibling.tagName).toBe('BUTTON');
}));

it('should set `setTitle` proxy to `nzTitle`', () => {
fixture.detectChanges();
const tooltipComponent = (component.titleStringNzTooltipDirective as any).tooltip as NzToolTipComponent; // tslint:disable-line:no-any
expect(tooltipComponent.nzTitle).toBe('title-string');

component.title = 'changed!';
fixture.detectChanges();
expect(tooltipComponent.nzTitle).toBe('changed!');
});

});

});

@Component({
selector: 'nz-tooltip-test-new',
template: `
<a #titleString nz-tooltip nzTitle="title-string" nzTrigger="hover" nzPlacement="topLeft" nzOverlayClassName="testClass" [nzOverlayStyle]="{color:'#000'}"
<a #titleString nz-tooltip [nzTitle]="title" nzTrigger="hover" nzPlacement="topLeft" nzOverlayClassName="testClass" [nzOverlayStyle]="{color:'#000'}"
[nzMouseEnterDelay]="0.15" [nzMouseLeaveDelay]="0.1">Show</a>
<a #titleTemplate nz-tooltip [nzTitle]="template">Show</a>
<ng-template #template>
Expand All @@ -266,6 +276,8 @@ export class NzTooltipTestNewComponent {
@ViewChild('titleTemplate', { read: NzTooltipDirective }) titleTemplateNzTooltipDirective: NzTooltipDirective;
@ViewChild('inBtnGroup') inBtnGroup: ElementRef;

title = 'title-string';

}

@Component({
Expand Down