Skip to content

Dialog Toggle Buttons Fix #610

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

Open
tommyneu wants to merge 1 commit into
base: 4.1
Choose a base branch
from
Open

Dialog Toggle Buttons Fix #610

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
29 changes: 16 additions & 13 deletions js/components/dcf-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default class DCFDialog {

dialogElement = null;

toggleButtons = [];
toggleButtonSelector = null;

closeButton = null;

Expand Down Expand Up @@ -129,17 +129,20 @@ export default class DCFDialog {
}
this.closeButton.setAttribute('type', 'button');

this.toggleButtons = Array.from(document.querySelectorAll(`.dcf-btn-toggle-dialog[data-controls='${this.dialogElement.getAttribute('id')}']`));
this.toggleButtonSelector = `.dcf-btn-toggle-dialog[data-controls='${this.dialogElement.getAttribute('id')}']`;

this.toggleButtons.forEach((singleToggleButton, index) => {
let buttonIndex = 0;
document.querySelectorAll(this.toggleButtonSelector).forEach((singleToggleButton) => {
if (singleToggleButton.getAttribute('id') === '' || singleToggleButton.getAttribute('id') === null) {
singleToggleButton.setAttribute('id', this.uuid.concat(`-dialog-toggle-button-${index}`));
singleToggleButton.setAttribute('id', this.uuid.concat(`-dialog-toggle-button-${buttonIndex}`));
}
if (this.dialogElement.classList.contains('dcf-dialog-non-modal')) {
singleToggleButton.setAttribute('aria-expanded', false);
} else {
singleToggleButton.setAttribute('aria-haspopup', 'dialog');
}
singleToggleButton.removeAttribute('disabled');
buttonIndex++;
});

this.#addEventListeners();
Expand Down Expand Up @@ -171,15 +174,14 @@ export default class DCFDialog {
}

#addEventListeners() {
// Set up toggle buttons to open and close modal
this.toggleButtons.forEach((singleToggleButton) => {
singleToggleButton.removeAttribute('disabled');
singleToggleButton.addEventListener('click', () => {
window.addEventListener('click', (event) => {
const toggleButton = event.target.closest(`.dcf-btn-toggle-dialog[data-controls='${this.dialogElement.getAttribute('id')}']`);
if (toggleButton !== null) {
this.toggle({
'type': 'toggleButton',
'button': singleToggleButton,
'button': toggleButton,
});
});
}
});

// If another modal is opened then close this one
Expand All @@ -202,7 +204,8 @@ export default class DCFDialog {
// Close dialog if we are no longer on it (this is important for the non-modal)
this.dialogElement.addEventListener('focusout', (event) => {
let isToggleButtonFocusout = false;
for (const singleToggleButton of this.toggleButtons) {
const allToggleButtons = document.querySelectorAll(this.toggleButtonSelector);
for (const singleToggleButton of allToggleButtons) {
if (singleToggleButton.isSameNode(event.relatedTarget) || singleToggleButton.contains(event.relatedTarget)) {
isToggleButtonFocusout = true;
}
Expand Down Expand Up @@ -281,7 +284,7 @@ export default class DCFDialog {
this.dialogElement.dispatchEvent(preCloseEvent);
this.dialogElement.close();
this.dialogElement.classList.remove('dcf-dialog-is-open');
this.toggleButtons.forEach((singleToggleButton) => {
document.querySelectorAll(this.toggleButtonSelector).forEach((singleToggleButton) => {
singleToggleButton.classList.remove('dcf-dialog-is-open');
if (this.dialogElement.classList.contains('dcf-dialog-non-modal')) {
singleToggleButton.setAttribute('aria-expanded', false);
Expand Down Expand Up @@ -311,7 +314,7 @@ export default class DCFDialog {
this.dialogElement.showModal();
}
this.dialogElement.classList.add('dcf-dialog-is-open');
this.toggleButtons.forEach((singleToggleButton) => {
document.querySelectorAll(this.toggleButtonSelector).forEach((singleToggleButton) => {
singleToggleButton.classList.add('dcf-dialog-is-open');
if (this.dialogElement.classList.contains('dcf-dialog-non-modal')) {
singleToggleButton.setAttribute('aria-expanded', true);
Expand Down