Refactor onboarding close button handling to ensure it is focusable

cwebster-99 · Copilot · cwebster-99 · commit cd2e1d8ed055 · 2026-04-17T16:08:25.000-05:00
Co-authored-by: Copilot &lt;copilot@github.com&gt;
diff --git a/src/vs/workbench/contrib/welcomeOnboarding/browser/onboardingVariationA.ts b/src/vs/workbench/contrib/welcomeOnboarding/browser/onboardingVariationA.ts
@@ -181,7 +181,6 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi
 		this.closeButton.type = 'button';
 		this.closeButton.setAttribute('aria-label', localize('onboarding.close', "Close"));
 		this.closeButton.appendChild(renderIcon(Codicon.close));
-		this.footerFocusableElements.push(this.closeButton);
 
 		// Header with progress
 		const header = append(this.card, $('.onboarding-a-header'));
@@ -1144,7 +1143,7 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi
 	}
 
 	private _getFocusableElements(): HTMLElement[] {
-		return [...this.stepFocusableElements, ...this.footerFocusableElements].filter(element => this._isTabbable(element));
+		return [...(this.closeButton ? [this.closeButton] : []), ...this.stepFocusableElements, ...this.footerFocusableElements].filter(element => this._isTabbable(element));
 	}
 
 	private _focusCurrentStepElement(): void {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi`
`181`	`181`	`this.closeButton.type = 'button';`
`182`	`182`	`this.closeButton.setAttribute('aria-label', localize('onboarding.close', "Close"));`
`183`	`183`	`this.closeButton.appendChild(renderIcon(Codicon.close));`
`184`		`- this.footerFocusableElements.push(this.closeButton);`
`185`	`184`
`186`	`185`	`// Header with progress`
`187`	`186`	`const header = append(this.card, $('.onboarding-a-header'));`
`@@ -1144,7 +1143,7 @@ export class OnboardingVariationA extends Disposable implements IOnboardingServi`
`1144`	`1143`	`}`
`1145`	`1144`
`1146`	`1145`	`private _getFocusableElements(): HTMLElement[] {`
`1147`		`- return [...this.stepFocusableElements, ...this.footerFocusableElements].filter(element => this._isTabbable(element));`
	`1146`	`+ return [...(this.closeButton ? [this.closeButton] : []), ...this.stepFocusableElements, ...this.footerFocusableElements].filter(element => this._isTabbable(element));`
`1148`	`1147`	`}`
`1149`	`1148`
`1150`	`1149`	`private _focusCurrentStepElement(): void {`