Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 2 additions & 0 deletions packages/elements/src/tooltip/__test__/tooltip.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ describe('tooltip/Tooltip', function () {
});

await elementUpdated(el);
await nextFrame();

expect(tooltip.opened, 'Tooltip is not opened').to.be.true;

Expand All @@ -268,6 +269,7 @@ describe('tooltip/Tooltip', function () {
});

await elementUpdated(el);
await nextFrame();

expect(tooltip.opened, 'Tooltip is not hidden').to.be.false;
}).timeout(MouseMoveDelay * 5);
Expand Down
12 changes: 2 additions & 10 deletions packages/elements/src/tooltip/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,20 +382,12 @@ class Tooltip extends BasicElement {
* Hide tooltip
* @returns {void}
*/
private hideTooltip(): void {
private resetTooltip = (): void => {
this.reset();
this.matchTarget = null;
this.matchTargetRect = null;
this.positionTarget = null;
this.setOpened(false);
}

/**
* Reset tooltip
* @returns {void}
*/
private resetTooltip = (): void => {
this.hideTooltip();
};

/**
Expand Down Expand Up @@ -499,7 +491,7 @@ class Tooltip extends BasicElement {
*/
private onClick = (): void => {
this.clicked = true;
this.hideTooltip();
this.resetTooltip();
};

/**
Expand Down
5 changes: 5 additions & 0 deletions packages/elements/src/tooltip/managers/tooltip-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class TooltipManager {
* @returns {void}
*/
private onMouseOut = (event: MouseEvent): void => {
this.titleThrottler.task?.cancel();
this.registry.forEach(({ mouseout }) => mouseout(event));
};

Expand All @@ -74,6 +75,7 @@ class TooltipManager {
* @returns {void}
*/
private onMouseLeave = (event: MouseEvent): void => {
this.titleThrottler.task?.cancel();
this.registry.forEach(({ mouseleave }) => mouseleave(event));
};

Expand All @@ -82,6 +84,7 @@ class TooltipManager {
* @returns {void}
*/
private onWheel = (event: WheelEvent): void => {
this.titleThrottler.task?.cancel();
this.registry.forEach(({ wheel }) => wheel(event));
};

Expand All @@ -90,6 +93,7 @@ class TooltipManager {
* @returns {void}
*/
private onKeyDown = (event: KeyboardEvent): void => {
this.titleThrottler.task?.cancel();
this.registry.forEach(({ keydown }) => keydown(event));
};

Expand All @@ -98,6 +102,7 @@ class TooltipManager {
* @returns {void}
*/
private onBlur = (event: FocusEvent): void => {
this.titleThrottler.task?.cancel();
this.registry.forEach(({ blur }) => blur(event));
};

Expand Down
Loading