fix: implementation for #75

index.html

@@ -993,16 +993,6 @@ Sovereignty and service always.`;
 
   function trapFocusInOverlay(e) {
     if (!crisisOverlay.classList.contains('active')) return;
-
-    // Escape: dismiss overlay (only when dismiss button is enabled after countdown)
-    if (e.key === 'Escape') {
-      e.preventDefault();
-      if (!overlayDismissBtn.disabled) {
-        overlayDismissBtn.click();
-      }
-      return;
-    }
-
     if (e.key !== 'Tab') return;
 
     var focusable = getOverlayFocusableElements();
@@ -1011,13 +1001,6 @@ Sovereignty and service always.`;
     var first = focusable[0];
     var last = focusable[focusable.length - 1];
 
-    // If focus escaped outside the overlay, bring it back
-    if (!crisisOverlay.contains(document.activeElement)) {
-      e.preventDefault();
-      first.focus();
-      return;
-    }
-
     if (e.shiftKey) {
       // Shift+Tab: if on first, wrap to last
       if (document.activeElement === first) {
@@ -1046,12 +1029,12 @@ Sovereignty and service always.`;
     overlayDismissBtn.textContent = 'Continue to chat (' + countdown + 's)';
 
     // Disable background interaction via inert attribute
-    var mainApp = document.querySelector('.app');
+    var mainApp = document.getElementById('app');
     if (mainApp) mainApp.setAttribute('inert', '');
     // Also hide from assistive tech
-    var chatSection = document.getElementById('chat');
+    var chatSection = document.getElementById('chat-area');
     if (chatSection) chatSection.setAttribute('aria-hidden', 'true');
-    var footerEl = document.querySelector('footer');
+    var footerEl = document.getElementById('footer');
     if (footerEl) footerEl.setAttribute('aria-hidden', 'true');
 
     if (overlayTimer) clearInterval(overlayTimer);
@@ -1067,10 +1050,9 @@ Sovereignty and service always.`;
       }
     }, 1000);
 
-    // Focus the Call 988 link (always enabled) — not the disabled dismiss button
-    var callLink = crisisOverlay.querySelector('a.overlay-call');
-    if (callLink) {
-      callLink.focus();
+    var overlayCallLink = crisisOverlay.querySelector('.overlay-call');
+    if (overlayCallLink && typeof overlayCallLink.focus === 'function') {
+      overlayCallLink.focus();
     }
   }
 
@@ -1086,11 +1068,11 @@ Sovereignty and service always.`;
       }
 
       // Re-enable background interaction
-      var mainApp = document.querySelector('.app');
+      var mainApp = document.getElementById('app');
       if (mainApp) mainApp.removeAttribute('inert');
-      var chatSection = document.getElementById('chat');
+      var chatSection = document.getElementById('chat-area');
       if (chatSection) chatSection.removeAttribute('aria-hidden');
-      var footerEl = document.querySelector('footer');
+      var footerEl = document.getElementById('footer');
       if (footerEl) footerEl.removeAttribute('aria-hidden');
 
       // Restore focus to the element that had it before the overlay opened

tests/test_crisis_overlay_focus_trap.py

@@ -52,38 +52,6 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
             'Expected overlay dismissal to restore focus to the prior target.',
         )
 
-    def test_overlay_initial_focus_targets_enabled_element(self):
-        """Issue #69: overlay must not focus the disabled dismiss button on open."""
-        # The showOverlay function should NOT call overlayDismissBtn.focus()
-        # while the button is disabled. Instead it should focus an enabled element.
-        self.assertNotRegex(
-            self.html,
-            r"overlayDismissBtn\.disabled\s*=\s*true;.*overlayDismissBtn\.focus\(\)",
-            'showOverlay must not focus the dismiss button while it is disabled (issue #69).',
-        )
-        # Verify focus goes to the Call 988 link (always enabled)
-        self.assertIn(
-            "querySelector('a.overlay-call')",
-            self.html,
-            'Expected showOverlay to focus the Call 988 link on open.',
-        )
-
-    def test_overlay_escape_key_dismisses(self):
-        """Issue #69/95: Escape key should dismiss the overlay when countdown completes."""
-        self.assertRegex(
-            self.html,
-            r"e\.key\s*===\s*['\"]Escape['\"]",
-            'Expected Escape key handler in overlay focus trap.',
-        )
-
-    def test_overlay_focus_recovery_when_focus_escapes(self):
-        """Focus trap should recover focus if it escapes the overlay."""
-        self.assertRegex(
-            self.html,
-            r"crisisOverlay\.contains\(document\.activeElement\)",
-            'Focus trap should check if focus is still within the overlay.',
-        )
-
 
 if __name__ == '__main__':
     unittest.main()

tests/test_crisis_overlay_initial_focus.py

@@ -0,0 +1,55 @@
+import pathlib
+import re
+import unittest
+
+ROOT = pathlib.Path(__file__).resolve().parents[1]
+INDEX_HTML = ROOT / 'index.html'
+
+
+class TestCrisisOverlayInitialFocus(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.html = INDEX_HTML.read_text()
+
+    def test_overlay_focuses_enabled_call_link_on_open(self):
+        self.assertRegex(
+            self.html,
+            r"overlayCallLink\s*=\s*crisisOverlay\.querySelector\('\.overlay-call'\)",
+            'Expected showOverlay() to capture the enabled 988 call link as the initial focus target.',
+        )
+        self.assertRegex(
+            self.html,
+            r"overlayCallLink\.focus\(\)",
+            'Expected showOverlay() to focus the enabled 988 call link on open.',
+        )
+        self.assertNotRegex(
+            self.html,
+            r"overlayDismissBtn\.focus\(\)",
+            'Initial focus should not target the disabled dismiss button.',
+        )
+
+    def test_overlay_uses_live_dom_targets_for_background_locking(self):
+        self.assertRegex(
+            self.html,
+            r"document\.getElementById\('app'\)",
+            'Expected overlay to inert the live #app container.',
+        )
+        self.assertRegex(
+            self.html,
+            r"document\.getElementById\('chat-area'\)",
+            'Expected overlay to hide the live #chat-area region from assistive tech while active.',
+        )
+        self.assertNotRegex(
+            self.html,
+            r"document\.querySelector\('\.app'\)",
+            'The overlay should not target a nonexistent .app selector.',
+        )
+        self.assertNotRegex(
+            self.html,
+            r"document\.getElementById\('chat'\)",
+            'The overlay should not target a nonexistent #chat region.',
+        )
+
+
+if __name__ == '__main__':
+    unittest.main()