Skip to content

A11y: The focus doesn't go back to the version button after closing the Welcome modal #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofyakurilova merged 1 commit into from
Mar 25, 2025
Merged

A11y: The focus doesn't go back to the version button after closing the Welcome modal #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,13 @@ import { MatButtonModule } from '@angular/material/button';
import { of } from 'rxjs';
import { NEW_VERSION, VERSION } from '../../../mocks/version.mock';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { FocusManagerService } from '../../../services/focus-manager.service';
import SpyObj = jasmine.SpyObj;

describe('ConsentDialogComponent', () => {
let component: ConsentDialogComponent;
let fixture: ComponentFixture<ConsentDialogComponent>;
let compiled: HTMLElement;
let mockFocusManagerService: SpyObj<FocusManagerService>;

beforeEach(() => {
mockFocusManagerService = jasmine.createSpyObj('mockFocusManagerService', [
'focusFirstElementInContainer',
]);

TestBed.configureTestingModule({
imports: [
ConsentDialogComponent,
Expand All @@ -60,7 +53,6 @@ describe('ConsentDialogComponent', () => {
},
},
{ provide: MAT_DIALOG_DATA, useValue: {} },
{ provide: FocusManagerService, useValue: mockFocusManagerService },
],
});
fixture = TestBed.createComponent(ConsentDialogComponent);
Expand Down Expand Up @@ -117,12 +109,19 @@ describe('ConsentDialogComponent', () => {
});

it('should set focus to first focusable elem when close dialog', fakeAsync(() => {
const button = document.createElement('BUTTON');
button.classList.add('version-content');
document.querySelector('body')?.appendChild(button);

const versionButton = window.document.querySelector(
'.version-content'
) as HTMLButtonElement;
const buttonFocusSpy = spyOn(versionButton, 'focus');

component.confirm(true);
tick(100);

expect(
mockFocusManagerService.focusFirstElementInContainer
).toHaveBeenCalled();
expect(buttonFocusSpy).toHaveBeenCalled();
}));

describe('with new version available', () => {
Expand Down
9 changes: 6 additions & 3 deletions modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import { CalloutType } from '../../../model/callout-type';
import { NgIf } from '@angular/common';
import { MatCheckbox } from '@angular/material/checkbox';
import { FormsModule } from '@angular/forms';
import { FocusManagerService } from '../../../services/focus-manager.service';
import { timer } from 'rxjs';

type DialogData = {
Expand All @@ -48,7 +47,6 @@ type DialogData = {
styleUrl: './consent-dialog.component.scss',
})
export class ConsentDialogComponent {
private readonly focusManagerService = inject(FocusManagerService);
dialogRef = inject<MatDialogRef<ConsentDialogComponent>>(MatDialogRef);
data = inject<DialogData>(MAT_DIALOG_DATA);

Expand All @@ -62,7 +60,12 @@ export class ConsentDialogComponent {
};
this.dialogRef.close(dialogResult);
timer(100).subscribe(() => {
this.focusManagerService.focusFirstElementInContainer();
const versionButton = window.document.querySelector(
'.version-content'
) as HTMLButtonElement;
if (versionButton) {
versionButton.focus();
}
});
}
}
Loading