Skip to content

[BS3] Modal accessibility fixes #858

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
merged 2 commits into from
Aug 28, 2020
Merged

[BS3] Modal accessibility fixes #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60b89f8
Fix aria-hidden being added to open modals
mabeyj Aug 21, 2020
94e6681
Fix aria-hidden not removed from next top modal
mabeyj Aug 21, 2020
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
6 changes: 3 additions & 3 deletions src/ModalManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class ModalManager {
this.modals.push(modal);

if (this.hideSiblingNodes) {
hideSiblings(container, modal.mountNode);
hideSiblings(container, modal.modalNode);
}

if (containerIdx !== -1) {
Expand Down Expand Up @@ -131,14 +131,14 @@ class ModalManager {
}

if (this.hideSiblingNodes) {
showSiblings(container, modal.mountNode);
showSiblings(container, modal.modalNode);
}
this.containers.splice(containerIdx, 1);
this.data.splice(containerIdx, 1);
}
else if (this.hideSiblingNodes) {
//otherwise make sure the next top modal is visible to a SR
ariaHidden(false, data.modals[data.modals.length - 1].mountNode);
ariaHidden(false, data.modals[data.modals.length - 1].modalNode);
}
}

Expand Down
13 changes: 12 additions & 1 deletion test/ModalManagerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@ describe('ModalManager', ()=> {
expect(app.getAttribute('aria-hidden')).to.equal('true');
});

it('should not add aria-hidden to modal', ()=>{
let modal = new Modal({});
let mount = document.createElement('div');

modal.modalNode = mount;
container.appendChild(mount);
manager.add(modal, container);

expect(mount.getAttribute('aria-hidden')).to.equal(null);
});

it('should add aria-hidden to previous modals', ()=>{
let modalA = new Modal({});
let mount = document.createElement('div');
Expand All @@ -129,7 +140,7 @@ describe('ModalManager', ()=> {
let modalB = new Modal({});
let mount = document.createElement('div');

modalA.mountNode = mount;
modalA.modalNode = mount;
container.appendChild(mount);

manager.add(modalA, container);
Expand Down