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.

Sign up for GitHub

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

Cancel pending hover on mouse exit #14533

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Cancel pending hover on mouse exit #14533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions packages/core/src/browser/hover-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import '../../src/browser/style/hover-service.css';

export type HoverPosition = 'left' | 'right' | 'top' | 'bottom';

// Threshold, in milliseconds, over which a mouse movement is not considered
// quick enough as to be ignored
const quickMouseThresholdMillis = 200;

export namespace HoverPosition {
export function invertIfNecessary(position: HoverPosition, target: DOMRect, host: DOMRect, totalWidth: number, totalHeight: number): HoverPosition {
if (position === 'left') {
Expand Down Expand Up @@ -100,11 +104,13 @@ export class HoverService {
if (request.target !== this.hoverTarget) {
this.cancelHover();
this.pendingTimeout = disposableTimeout(() => this.renderHover(request), this.getHoverDelay());
this.hoverTarget = request.target;
this.listenForMouseOut();
}
}

protected getHoverDelay(): number {
return Date.now() - this.lastHidHover < 200
return Date.now() - this.lastHidHover < quickMouseThresholdMillis
? 0
: this.preferences.get('workbench.hover.delay', isOSX ? 1500 : 500);
}
Expand All @@ -116,7 +122,6 @@ export class HoverService {
if (cssClasses) {
host.classList.add(...cssClasses);
}
this.hoverTarget = target;
if (content instanceof HTMLElement) {
host.appendChild(content);
firstChild = content;
Expand Down Expand Up @@ -155,8 +160,6 @@ export class HoverService {
}
}
});

this.listenForMouseOut();
}

protected setHostPosition(target: HTMLElement, host: HTMLElement, position: HoverPosition): HoverPosition {
Expand Down Expand Up @@ -197,7 +200,11 @@ export class HoverService {
protected listenForMouseOut(): void {
const handleMouseMove = (e: MouseEvent) => {
if (e.target instanceof Node && !this.hoverHost.contains(e.target) && !this.hoverTarget?.contains(e.target)) {
this.cancelHover();
this.disposeOnHide.push(disposableTimeout(() => {
if (!this.hoverHost.matches(':hover') && !this.hoverTarget?.matches(':hover')) {
this.cancelHover();
}
}, quickMouseThresholdMillis));
}
};
document.addEventListener('mousemove', handleMouseMove);
Expand Down
Loading