Use intersection observer to hide hovers

Tyriar · Tyriar · commit a26e4fdd2018 · 2020-09-04T09:24:10.000-07:00
Fixes microsoft#106127
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -838,9 +838,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				setTimeout(() => this.layout(this._timeoutDimension!), 0);
 			}
 		}
-		if (!visible) {
-			this._widgetManager.hideHovers();
-		}
 	}
 
 	public scrollDownLine(): void {
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts b/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
@@ -5,13 +5,12 @@
 
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ITerminalWidget } from 'vs/workbench/contrib/terminal/browser/widgets/widgets';
-import { IHoverService } from 'vs/workbench/services/hover/browser/hover';
 
 export class TerminalWidgetManager implements IDisposable {
 	private _container: HTMLElement | undefined;
 	private _attached: Map<string, ITerminalWidget> = new Map();
 
-	constructor(@IHoverService private readonly _hoverService: IHoverService) {
+	constructor() {
 	}
 
 	attachToElement(terminalWrapper: HTMLElement) {
@@ -23,17 +22,12 @@ export class TerminalWidgetManager implements IDisposable {
 	}
 
 	dispose(): void {
-		this.hideHovers();
 		if (this._container && this._container.parentElement) {
 			this._container.parentElement.removeChild(this._container);
 			this._container = undefined;
 		}
 	}
 
-	hideHovers(): void {
-		this._hoverService.hideHover();
-	}
-
 	attachWidget(widget: ITerminalWidget): IDisposable | undefined {
 		if (!this._container) {
 			return;
diff --git a/src/vs/workbench/services/hover/browser/hover.ts b/src/vs/workbench/services/hover/browser/hover.ts
@@ -30,11 +30,6 @@ export interface IHoverService {
 	 * ```
 	 */
 	showHover(options: IHoverOptions, focus?: boolean): void;
-
-	/**
-	 * Hides the hover if it was visible.
-	 */
-	hideHover(): void;
 }
 
 export interface IHoverOptions {
diff --git a/src/vs/workbench/services/hover/browser/hoverService.ts b/src/vs/workbench/services/hover/browser/hoverService.ts
@@ -12,6 +12,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { HoverWidget } from 'vs/workbench/services/hover/browser/hoverWidget';
 import { IContextViewProvider, IDelegate } from 'vs/base/browser/ui/contextview/contextview';
+import { IDisposable } from 'vs/base/common/lifecycle';
 
 export class HoverService implements IHoverService {
 	declare readonly _serviceBrand: undefined;
@@ -35,14 +36,20 @@ export class HoverService implements IHoverService {
 		const provider = this._contextViewService as IContextViewProvider;
 		provider.showContextView(new HoverContextViewDelegate(hover, focus));
 		hover.onRequestLayout(() => provider.layout());
+
+		if ('IntersectionObserver' in window) {
+			const observer = new IntersectionObserver(e => this._intersectionChange(e, hover), { threshold: 0 });
+			const firstTargetElement = 'targetElements' in options.target ? options.target.targetElements[0] : options.target;
+			observer.observe(firstTargetElement);
+			hover.onDispose(() => observer.disconnect());
+		}
 	}
 
-	hideHover(): void {
-		if (!this._currentHoverOptions) {
-			return;
+	private _intersectionChange(entries: IntersectionObserverEntry[], hover: IDisposable): void {
+		const entry = entries[entries.length - 1];
+		if (!entry.isIntersecting) {
+			hover.dispose();
 		}
-		this._currentHoverOptions = undefined;
-		this._contextViewService.hideContextView();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -838,9 +838,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {`
`838`	`838`	`setTimeout(() => this.layout(this._timeoutDimension!), 0);`
`839`	`839`	`}`
`840`	`840`	`}`
`841`		`- if (!visible) {`
`842`		`- this._widgetManager.hideHovers();`
`843`		`- }`
`844`	`841`	`}`
`845`	`842`
`846`	`843`	`public scrollDownLine(): void {`