Restrict hover focus trap behaviour to Settings indicators

src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts

@@ -76,7 +76,8 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	private defaultHoverOptions: Partial<IHoverOptions> = {
 		hoverPosition: HoverPosition.BELOW,
 		showPointer: true,
-		compact: false
+		compact: false,
+		addFocusTraps: true
 	};
 
 	private addHoverDisposables(disposables: DisposableStore, element: HTMLElement, showHover: (focus: boolean) => IHoverWidget | undefined) {

src/vs/workbench/services/hover/browser/hover.ts

@@ -119,6 +119,12 @@ export interface IHoverOptions {
 	 * another in the same group so it looks like the hover is moving from one element to the other.
 	 */
 	skipFadeInAnimation?: boolean;
+
+	/**
+	 * Whether to add focus traps so that when the hover closes, focus goes to the last focused element,
+	 * and when tabbing, focus stays inside of the hover.
+	 */
+	addFocusTraps?: boolean;
 }
 
 export interface IHoverAction {

src/vs/workbench/services/hover/browser/hoverService.ts

@@ -39,8 +39,10 @@ export class HoverService implements IHoverService {
 			return undefined;
 		}
 		this._currentHoverOptions = options;
-		if (document.activeElement) {
+		if (options.addFocusTraps && document.activeElement) {
 			this._lastFocusedElementBeforeOpen = document.activeElement as HTMLElement;
+		} else {
+			this._lastFocusedElementBeforeOpen = undefined;
 		}
 
 		const hoverDisposables = new DisposableStore();
@@ -118,7 +120,7 @@ export class HoverService implements IHoverService {
 		if (keybinding.getSingleModifierDispatchParts().some(value => !!value) || this._keybindingService.softDispatch(event, event.target)) {
 			return;
 		}
-		if (e.key !== 'Tab') {
+		if (!this._currentHoverOptions?.addFocusTraps || e.key !== 'Tab') {
 			this.hideHover();
 			this._lastFocusedElementBeforeOpen?.focus();
 		}

src/vs/workbench/services/hover/browser/hoverWidget.ts

@@ -52,6 +52,7 @@ export class HoverWidget extends Widget {
 	private _x: number = 0;
 	private _y: number = 0;
 	private _isLocked: boolean = false;
+	private _enableFocusTraps: boolean = false;
 	private _addedFocusTrap: boolean = false;
 
 	get isDisposed(): boolean { return this._isDisposed; }
@@ -110,6 +111,9 @@ export class HoverWidget extends Widget {
 		if (options.forcePosition) {
 			this._forcePosition = true;
 		}
+		if (options.addFocusTraps) {
+			this._enableFocusTraps = true;
+		}
 
 		this._hoverPosition = options.hoverPosition ?? HoverPosition.ABOVE;
 
@@ -224,7 +228,7 @@ export class HoverWidget extends Widget {
 	}
 
 	private addFocusTrap() {
-		if (this._addedFocusTrap) {
+		if (!this._enableFocusTraps || this._addedFocusTrap) {
 			return;
 		}
 		this._addedFocusTrap = true;