Merge pull request #7458 from mbektasbbg/check_if_label_is_linked

Make sure label is linked to a control when checking for element type
jupyterlab · Dec 12, 2019 · 7644983 · 7644983
2 parents d34be89 + 2e9182b
commit 7644983
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/apputils/src/toolbar.tsx b/packages/apputils/src/toolbar.tsx
@@ -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.