move custom hover logic into BaseActionViewItem (microsoft#155278)

fixes microsoft#153429

Author: jrieken

src/vs/base/browser/ui/actionbar/actionViewItems.ts

@@ -23,6 +23,7 @@ export interface IBaseActionViewItemOptions {
 	draggable?: boolean;
 	isMenu?: boolean;
 	useEventAsContext?: boolean;
+	hoverDelegate?: IHoverDelegate;
 }
 
 export class BaseActionViewItem extends Disposable implements IActionViewItem {
@@ -32,6 +33,8 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
 	_context: unknown;
 	readonly _action: IAction;
 
+	private customHover?: ICustomHover;
+
 	get action() {
 		return this._action;
 	}
@@ -210,8 +213,27 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
 		// implement in subclass
 	}
 
+	protected getTooltip(): string | undefined {
+		return this.getAction().tooltip;
+	}
+
 	protected updateTooltip(): void {
-		// implement in subclass
+		if (!this.element) {
+			return;
+		}
+		const title = this.getTooltip() ?? '';
+		this.element.setAttribute('aria-label', title);
+		if (!this.options.hoverDelegate) {
+			this.element.title = title;
+		} else {
+			this.element.title = '';
+			if (!this.customHover) {
+				this.customHover = setupCustomHover(this.options.hoverDelegate, this.element, title);
+				this._store.add(this.customHover);
+			} else {
+				this.customHover.update(title);
+			}
+		}
 	}
 
 	protected updateClass(): void {
@@ -236,7 +258,6 @@ export interface IActionViewItemOptions extends IBaseActionViewItemOptions {
 	icon?: boolean;
 	label?: boolean;
 	keybinding?: string | null;
-	hoverDelegate?: IHoverDelegate;
 }
 
 export class ActionViewItem extends BaseActionViewItem {
@@ -245,7 +266,6 @@ export class ActionViewItem extends BaseActionViewItem {
 	protected override options: IActionViewItemOptions;
 
 	private cssClass?: string;
-	private customHover?: ICustomHover;
 
 	constructor(context: unknown, action: IAction, options: IActionViewItemOptions = {}) {
 		super(context, action, options);
@@ -317,7 +337,7 @@ export class ActionViewItem extends BaseActionViewItem {
 		}
 	}
 
-	override updateTooltip(): void {
+	override getTooltip() {
 		let title: string | null = null;
 
 		if (this.getAction().tooltip) {
@@ -330,24 +350,7 @@ export class ActionViewItem extends BaseActionViewItem {
 				title = nls.localize({ key: 'titleLabel', comment: ['action title', 'action keybinding'] }, "{0} ({1})", title, this.options.keybinding);
 			}
 		}
-		this._applyUpdateTooltip(title);
-	}
-
-	protected _applyUpdateTooltip(title: string | undefined | null): void {
-		if (title && this.label) {
-			this.label.setAttribute('aria-label', title);
-			if (!this.options.hoverDelegate) {
-				this.label.title = title;
-			} else {
-				this.label.title = '';
-				if (!this.customHover) {
-					this.customHover = setupCustomHover(this.options.hoverDelegate, this.label, title);
-					this._store.add(this.customHover);
-				} else {
-					this.customHover.update(title);
-				}
-			}
-		}
+		return title ?? undefined;
 	}
 
 	override updateClass(): void {

src/vs/platform/actions/browser/menuEntryActionViewItem.ts

@@ -231,7 +231,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 		}
 	}
 
-	override updateTooltip(): void {
+	override getTooltip() {
 		const keybinding = this._keybindingService.lookupKeybinding(this._commandAction.id, this._contextKeyService);
 		const keybindingLabel = keybinding && keybinding.getLabel();
 
@@ -249,7 +249,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 
 			title = localize('titleAndKbAndAlt', "{0}\n[{1}] {2}", title, UILabelProvider.modifierLabels[OS].altKey, altTitleSection);
 		}
-		this._applyUpdateTooltip(title);
+		return title;
 	}
 
 	override updateClass(): void {

src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts

@@ -65,15 +65,14 @@ export class CommandCenterControl {
 							searchIcon.classList.add('search-icon');
 
 							this.workspaceTitle.classList.add('search-label');
-							this._updateFromWindowTitle();
+							this.updateTooltip();
 							reset(this.label, searchIcon, this.workspaceTitle);
 							// this._renderAllQuickPickItem(container);
 
-							this._store.add(windowTitle.onDidChange(this._updateFromWindowTitle, this));
+							this._store.add(windowTitle.onDidChange(this.updateTooltip, this));
 						}
 
-						private _updateFromWindowTitle() {
-
+						override getTooltip() {
 							// label: just workspace name and optional decorations
 							const { prefix, suffix } = windowTitle.getTitleDecorations();
 							let label = windowTitle.workspaceName;
@@ -93,7 +92,8 @@ export class CommandCenterControl {
 							const title = kb
 								? localize('title', "Search {0} ({1}) \u2014 {2}", windowTitle.workspaceName, kb, windowTitle.value)
 								: localize('title2', "Search {0} \u2014 {1}", windowTitle.workspaceName, windowTitle.value);
-							this._applyUpdateTooltip(title);
+
+							return title;
 						}
 					}
 					return instantiationService.createInstance(InputLikeViewItem, action, { hoverDelegate });