116404: Close modal on escape

alexandrevryghem · Aug 5, 2024 · b4023c1 · b4023c1
1 parent 535bff9
commit b4023c1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -166,9 +166,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param event
    */
   navigateDropdown(event: KeyboardEvent): void {
-    if (event.key === 'Tab') {
+    if (event.code === 'Tab') {
       this.deactivateSection(event, false);
       return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
     }
     event.preventDefault();
     event.stopPropagation();