fix disclosure focus

basher · Apr 2, 2024 · 3a73486 · 3a73486
1 parent 7d2abfa
commit 3a73486
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/ui/npm-shrinkwrap.json b/ui/npm-shrinkwrap.json
diff --git a/ui/src/javascript/web-components/webui-disclosure.ts b/ui/src/javascript/web-components/webui-disclosure.ts
@@ -47,18 +47,21 @@ export default class WebUIDisclosure extends HTMLElement {
         return random;
     }
 
-    private hideContent(): void {
+    private hideContent(e?: KeyboardEvent): void {
         if (this.trigger?.getAttribute('aria-expanded') === 'true') {
-            // Set keyboard :FOCUS on the trigger button.
-            this.trigger?.focus();
             this.trigger?.setAttribute('aria-expanded', 'false');
+            this.content?.setAttribute('hidden', '');
+
+            // Set keyboard :FOCUS on the trigger button.
+            if (e?.type === 'keyup') {
+                this.trigger?.focus();
+            }
         }
-        this.content?.setAttribute('hidden', '');
     }
 
     private handleGlobalKeyup(e: KeyboardEvent): void {
         if (this.bindEscapeKey && e.code === 'Escape') {
-            this.hideContent();
+            this.hideContent(e);
         }
     }