Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 16:25:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not steal focus from quick picks during startup

Browse Source 
Guard focus calls in NewChatViewPane and SessionsWelcomeOverlay
by checking IQuickInputService.currentQuickInput before focusing.
This prevents the sessions welcome page from closing an already
open quick pick (e.g. Open Recent) and stealing focus to the
chat input box.

Fixes microsoft/vscode#294505

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Osvaldo Ortega
2026-03-30 14:03:04 -07:00
parent 6e1a95ed84
commit 9b5db8746b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/sessions/contrib/welcome/browser/welcome.contribution.ts
View File

@@ -27,6 +27,7 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
import { IWorkbenchEnvironmentService } from '../../../../workbench/services/environment/common/environmentService.js';
import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
const WELCOME_COMPLETE_KEY = 'workbench.agentsession.welcomeComplete';
@@ -40,6 +41,7 @@ class SessionsWelcomeOverlay extends Disposable {
@ICommandService private readonly commandService: ICommandService,
@IExtensionService private readonly extensionService: IExtensionService,
@ILogService private readonly logService: ILogService,
@IQuickInputService private readonly quickInputService: IQuickInputService,
) {
super();
@@ -71,8 +73,11 @@ class SessionsWelcomeOverlay extends Disposable {
this._register(actionButton.onDidClick(() => this._runSetup(actionButton, spinnerContainer, errorContainer)));
// Focus the button so the overlay traps keyboard input
actionButton.focus();
// Focus the button so the overlay traps keyboard input,
// but only if no quick input is currently visible.
if (!this.quickInputService.currentQuickInput) {
actionButton.focus();
}
}
private async _runSetup(button: Button, spinner: HTMLElement, error: HTMLElement): Promise<void> {