Skip to content

fix: correct ARIA expanded and activedescendant states for menu buttons #9172

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
karthikeyansundaram2 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

fix: correct ARIA expanded and activedescendant states for menu buttons #9172

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
31 changes: 31 additions & 0 deletions src/js/menu/menu-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class MenuButton extends Component {
this.on(this.menuButton_, 'mouseenter', () => {
this.addClass('vjs-hover');
this.menu.show();
this.menuButton_.el_.setAttribute('aria-expanded', 'true');
Events.on(document, 'keyup', this.handleMenuKeyUp_);
});
this.on('mouseleave', (e) => this.handleMouseLeave(e));
Expand Down Expand Up @@ -272,6 +273,11 @@ class MenuButton extends Component {
handleMouseLeave(event) {
this.removeClass('vjs-hover');
Events.off(document, 'keyup', this.handleMenuKeyUp_);

if (!this.buttonPressed_) {
this.menuButton_.el_.setAttribute('aria-expanded', 'false');
this.menuButton_.el_.removeAttribute('aria-activedescendant');
}
}

/**
Expand Down Expand Up @@ -395,6 +401,7 @@ class MenuButton extends Component {
}

this.menu.focus();
this.updateActiveDescendant_();
}
}

Expand All @@ -407,7 +414,31 @@ class MenuButton extends Component {
this.menu.unlockShowing();
this.menu.hide();
this.menuButton_.el_.setAttribute('aria-expanded', 'false');
this.menuButton_.el_.removeAttribute('aria-activedescendant');
}
}

/**
* Synchronize `aria-activedescendant` on the menu button with the currently
* focused menu item. If the focused item has no `id`, one is generated so it
* can be referenced.
*
* @private
*/
updateActiveDescendant_() {
const children = this.menu.children();
const focusedChild = children && children[this.menu.focusedChild_];

if (!focusedChild || !focusedChild.el_) {
this.menuButton_.el_.removeAttribute('aria-activedescendant');
return;
}

if (!focusedChild.el_.id) {
focusedChild.el_.id = `${this.menuButton_.id()}-item-${this.menu.focusedChild_}`;
}

this.menuButton_.el_.setAttribute('aria-activedescendant', focusedChild.el_.id);
}

/**
Expand Down