Skip to content
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.

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

Make sure label is linked to a control when checking for element type #7458

Merged
merged 2 commits into from Dec 12, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/apputils/src/toolbar.tsx
Expand Up @@ -327,9 +327,13 @@ export class Toolbar<T extends Widget = Widget> extends Widget {
* Handle a DOM click event.
*/
protected handleClick(event: Event) {
// Clicking a label focuses the corresponding control, so let it be.
// Clicking a label focuses the corresponding control
// that is linked with `for` attribute, so let it be.
if (event.target instanceof HTMLLabelElement) {
return;
const forId = event.target.getAttribute('for');
if (forId && this.node.querySelector(`#${forId}`)) {
return;
}
}

// If this click already focused a control, let it be.
Expand Down