Skip to content

Commit 2818f3a

Browse files
authored
Merge pull request #16157 from IgniteUI/rivanova/fix-16145-master
fix(tooltip): not show tooltip when target is clicked - master
2 parents dbf466a + f72022c commit 2818f3a

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
@@ -348,6 +348,9 @@ export class IgxTooltipTargetDirective extends IgxToggleActionDirective implemen
348348
public override onClick() {
349349
if (!this.target.collapsed) {
350350
this._hideOnInteraction();
351+
} else if (this.target.timeoutId) {
352+
clearTimeout(this.target.timeoutId);
353+
this.target.timeoutId = null;
351354
}
352355
}
353356

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
@@ -261,6 +261,21 @@ describe('IgxTooltip', () => {
261261
verifyTooltipVisibility(tooltipNativeElement, tooltipTarget, false);
262262
}));
263263

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

0 commit comments

Comments
 (0)