Remove/restore focus as console is hidden/shown

r-wasm · Jul 24, 2024 · 4a4b3cf · 4a4b3cf
1 parent 7e1a141
commit 4a4b3cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/_extensions/drop/drop-runtime.js b/_extensions/drop/drop-runtime.js
diff --git a/drop-runtime/src/drop-runtime.ts b/drop-runtime/src/drop-runtime.ts
@@ -8,6 +8,7 @@ declare global {
     RevealDrop?: {
       id: string;
       dropElement: HTMLDivElement;
+      focusElement: Element | null;
       init: (reveal: any) => void;
       toggleDrop: () => void;
       isActive: () => boolean;
@@ -33,6 +34,7 @@ type DropConfig = {
 
 window.RevealDrop = window.RevealDrop || {
   id: 'RevealDrop',
+  focusElement: null,
   dropElement: document.createElement('div'),
   init: function (reveal) {
     const revealConfig = reveal.getConfig();
@@ -83,12 +85,26 @@ window.RevealDrop = window.RevealDrop || {
         window.RevealDrop.toggleDrop();
         reveal.toggleHelp(false);
         reveal.toggleOverview(false);
-        reveal.configure({ keyboard: !window.RevealDrop.isActive() });
+
+        if (window.RevealDrop.isActive()) {
+          reveal.configure({ keyboard: false });
+          // Restore focus as console is shown
+          if (window.RevealDrop.focusElement instanceof HTMLElement) {
+            window.RevealDrop.focusElement.focus();
+          }
+        } else {
+          reveal.configure({ keyboard: true });
+          // Remove focus as console is hidden
+          window.RevealDrop.focusElement = document.activeElement;
+          if (document.activeElement instanceof HTMLElement) {
+            document.activeElement.blur();
+          }
+        }
+
         event.preventDefault();
         event.stopPropagation();
       }
     }, { capture: true });
-
   },
   toggleDrop() {
     window.RevealDrop.dropElement.classList.toggle("active");