Skip to content

Commit 62f98c3

Browse files
authored
Merge pull request #16154 from IgniteUI/rivanova/fix-16145-20.0.x
fix(tooltip): not show tooltip when target is clicked - 20.0.x
2 parents bb7916f + 07c7807 commit 62f98c3

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

projects/igniteui-angular/src/lib/directives/tooltip/tooltip-target.directive.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ export class IgxTooltipTargetDirective extends IgxToggleActionDirective implemen
199199
public override onClick() {
200200
if (!this.target.collapsed) {
201201
this.target.forceClose(this.mergedOverlaySettings);
202+
} else if (this.target.toBeShown) {
203+
clearTimeout(this.target.timeoutId);
204+
this.target.toBeShown = false;
202205
}
203206
}
204207

projects/igniteui-angular/src/lib/directives/tooltip/tooltip.directive.spec.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,21 @@ describe('IgxTooltip', () => {
258258
verifyTooltipVisibility(tooltipNativeElement, tooltipTarget, false);
259259
}));
260260

261+
it('IgxTooltip should not be shown if the target is clicked - #16145', fakeAsync(() => {
262+
tooltipTarget.showDelay = 500;
263+
fix.detectChanges();
264+
265+
hoverElement(button);
266+
tick(300);
267+
verifyTooltipVisibility(tooltipNativeElement, tooltipTarget, false);
268+
269+
UIInteractions.simulateClickAndSelectEvent(button);
270+
fix.detectChanges();
271+
272+
tick(300);
273+
verifyTooltipVisibility(tooltipNativeElement, tooltipTarget, false);
274+
}));
275+
261276
it('IgxTooltip hides on pressing \'escape\' key', fakeAsync(() => {
262277
tooltipTarget.showTooltip();
263278
flush();

0 commit comments

Comments
 (0)