fix: complete crisis overlay keyboard navigation (#95)

Fixes #59

The footer links to /about but the repo ships about.html. On a plain static server this results in a 404. Changed to /about.html so the link resolves correctly.

index.html

@@ -241,48 +241,6 @@ html, body {
   opacity: 0.5;
 }
 
-/* ===== CHAT HEADER ===== */
-#chat-header {
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  padding: 10px 12px;
-  border-bottom: 1px solid #21262d;
-  background: #11161d;
-}
-
-.chat-header-title {
-  font-size: 0.85rem;
-  color: #8b949e;
-  font-weight: 600;
-  letter-spacing: 0.02em;
-}
-
-#chat-safety-plan-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 8px 12px;
-  min-height: 36px;
-  border: 1px solid #30363d;
-  border-radius: 999px;
-  background: transparent;
-  color: #c9d1d9;
-  font-size: 0.8rem;
-  font-weight: 600;
-  cursor: pointer;
-}
-
-#chat-safety-plan-btn:hover,
-#chat-safety-plan-btn:focus {
-  border-color: #58a6ff;
-  background: rgba(88, 166, 255, 0.12);
-  outline: 2px solid #58a6ff;
-  outline-offset: 2px;
-}
-
 /* ===== CHAT AREA ===== */
 #chat-area {
   flex: 1;
@@ -691,14 +649,6 @@ html, body {
     </div>
   </div>
 
-  <div id="chat-header">
-    <div class="chat-header-title" aria-hidden="true">Conversation</div>
-    <button id="chat-safety-plan-btn" type="button" aria-label="Open My Safety Plan from chat header">
-      <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/></svg>
-      My Safety Plan
-    </button>
-  </div>
-
   <!-- Chat messages -->
   <div id="chat-area" role="log" aria-label="Chat messages" aria-live="polite" tabindex="0">
     <!-- Messages inserted here -->
@@ -730,7 +680,7 @@ html, body {
 
   <!-- Footer -->
   <footer id="footer">
-    <a href="/about" aria-label="About The Door">about</a>
+    <a href="/about.html" aria-label="About The Door">about</a>
     <button id="safety-plan-btn" aria-label="Open My Safety Plan">my safety plan</button>
     <button id="clear-chat-btn" aria-label="Clear chat history">clear chat</button>
   </footer>
@@ -864,7 +814,6 @@ Sovereignty and service always.`;
   
   // Safety Plan Elements
   var safetyPlanBtn = document.getElementById('safety-plan-btn');
-  var chatSafetyPlanBtn = document.getElementById('chat-safety-plan-btn');
   var crisisSafetyPlanBtn = document.getElementById('crisis-safety-plan-btn');
   var safetyPlanModal = document.getElementById('safety-plan-modal');
   var closeSafetyPlan = document.getElementById('close-safety-plan');
@@ -1038,20 +987,33 @@ Sovereignty and service always.`;
 
   // Focus trap: cycle through focusable elements within the crisis overlay
   function getOverlayFocusableElements() {
-    return crisisOverlay.querySelectorAll(
+    return Array.prototype.slice.call(crisisOverlay.querySelectorAll(
       'a[href], button:not([disabled]), [tabindex]:not([tabindex="-1"])'
-    );
+    ));
   }
 
   function trapFocusInOverlay(e) {
     if (!crisisOverlay.classList.contains('active')) return;
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      closeOverlay(msgInput);
+      return;
+    }
     if (e.key !== 'Tab') return;
 
     var focusable = getOverlayFocusableElements();
     if (focusable.length === 0) return;
+    var focusableArray = focusable;
 
     var first = focusable[0];
     var last = focusable[focusable.length - 1];
+    var activeIndex = focusableArray.indexOf(document.activeElement);
+
+    if (activeIndex === -1) {
+      e.preventDefault();
+      e.shiftKey ? last.focus() : first.focus();
+      return;
+    }
 
     if (e.shiftKey) {
       // Shift+Tab: if on first, wrap to last
@@ -1071,6 +1033,33 @@ Sovereignty and service always.`;
   // Store the element that had focus before the overlay opened
   var _preOverlayFocusElement = null;
 
+  function closeOverlay(restoreFocusTarget) {
+    crisisOverlay.classList.remove('active');
+    if (overlayTimer) {
+      clearInterval(overlayTimer);
+      overlayTimer = null;
+    }
+
+    // Re-enable background interaction
+    var mainApp = document.getElementById('app');
+    if (mainApp) mainApp.removeAttribute('inert');
+    var chatSection = document.getElementById('chat-area');
+    if (chatSection) chatSection.removeAttribute('aria-hidden');
+    var footerEl = document.querySelector('footer');
+    if (footerEl) footerEl.removeAttribute('aria-hidden');
+
+    if (restoreFocusTarget === _preOverlayFocusElement && _preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
+      _preOverlayFocusElement.focus();
+    } else if (restoreFocusTarget && typeof restoreFocusTarget.focus === 'function') {
+      restoreFocusTarget.focus();
+    } else if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
+      _preOverlayFocusElement.focus();
+    } else {
+      msgInput.focus();
+    }
+    _preOverlayFocusElement = null;
+  }
+
   function showOverlay() {
     // Save current focus for restoration on dismiss
     _preOverlayFocusElement = document.activeElement;
@@ -1081,10 +1070,10 @@ 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');
     if (footerEl) footerEl.setAttribute('aria-hidden', 'true');
@@ -1111,27 +1100,7 @@ Sovereignty and service always.`;
 
   overlayDismissBtn.addEventListener('click', function() {
     if (!overlayDismissBtn.disabled) {
-      crisisOverlay.classList.remove('active');
-      if (overlayTimer) {
-        clearInterval(overlayTimer);
-        overlayTimer = null;
-      }
-
-      // Re-enable background interaction
-      var mainApp = document.querySelector('.app');
-      if (mainApp) mainApp.removeAttribute('inert');
-      var chatSection = document.getElementById('chat');
-      if (chatSection) chatSection.removeAttribute('aria-hidden');
-      var footerEl = document.querySelector('footer');
-      if (footerEl) footerEl.removeAttribute('aria-hidden');
-
-      // Restore focus to the element that had it before the overlay opened
-      if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
-        _preOverlayFocusElement.focus();
-      } else {
-        msgInput.focus();
-      }
-      _preOverlayFocusElement = null;
+      closeOverlay(_preOverlayFocusElement);
     }
   });
 
@@ -1336,25 +1305,19 @@ Sovereignty and service always.`;
     _spTriggerEl = null;
   }
 
-  function openSafetyPlan(triggerEl) {
-    loadSafetyPlan();
-    safetyPlanModal.classList.add('active');
-    _activateSafetyPlanFocusTrap(triggerEl || document.activeElement);
-  }
-
   // Wire open buttons to activate focus trap
   safetyPlanBtn.addEventListener('click', function() {
-    openSafetyPlan(safetyPlanBtn);
-  });
-
-  chatSafetyPlanBtn.addEventListener('click', function() {
-    openSafetyPlan(chatSafetyPlanBtn);
+    loadSafetyPlan();
+    safetyPlanModal.classList.add('active');
+    _activateSafetyPlanFocusTrap(safetyPlanBtn);
   });
 
   // Crisis panel safety plan button (if crisis panel is visible)
   if (crisisSafetyPlanBtn) {
     crisisSafetyPlanBtn.addEventListener('click', function() {
-      openSafetyPlan(crisisSafetyPlanBtn);
+      loadSafetyPlan();
+      safetyPlanModal.classList.add('active');
+      _activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);
     });
   }
 
@@ -1501,7 +1464,9 @@ Sovereignty and service always.`;
     // Check for URL params (e.g., ?safetyplan=true for PWA shortcut)
     var urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('safetyplan') === 'true') {
-      openSafetyPlan(chatSafetyPlanBtn || safetyPlanBtn);
+      loadSafetyPlan();
+      safetyPlanModal.classList.add('active');
+      _activateSafetyPlanFocusTrap(safetyPlanBtn);
       // Clean up URL
       window.history.replaceState({}, document.title, window.location.pathname);
     }

tests/test_crisis_overlay_keyboard_navigation.py

@@ -0,0 +1,54 @@
+import pathlib
+
+from playwright.sync_api import sync_playwright
+
+
+ROOT = pathlib.Path(__file__).resolve().parents[1]
+INDEX_HTML = ROOT / 'index.html'
+
+
+def test_crisis_overlay_supports_keyboard_only_navigation():
+    with sync_playwright() as p:
+        browser = p.chromium.launch(headless=True)
+        page = browser.new_page()
+        try:
+            page.goto(INDEX_HTML.as_uri())
+            page.evaluate(
+                """
+                () => {
+                  window.fetch = () => Promise.reject(new Error('test fetch blocked'));
+                  window.alert = () => {};
+                }
+                """
+            )
+
+            page.fill('#msg-input', "I'm going to kill myself tonight")
+            page.press('#msg-input', 'Enter')
+            page.wait_for_function("document.getElementById('crisis-overlay').classList.contains('active')")
+
+            assert page.evaluate("document.activeElement.classList.contains('overlay-call')") is True
+
+            page.evaluate(
+                """
+                () => {
+                  const btn = document.getElementById('overlay-dismiss-btn');
+                  btn.disabled = false;
+                  btn.textContent = 'Continue to chat';
+                }
+                """
+            )
+
+            page.keyboard.press('Tab')
+            assert page.evaluate("document.activeElement.id") == 'overlay-dismiss-btn'
+
+            page.keyboard.press('Tab')
+            assert page.evaluate("document.activeElement.classList.contains('overlay-call')") is True
+
+            page.keyboard.press('Shift+Tab')
+            assert page.evaluate("document.activeElement.id") == 'overlay-dismiss-btn'
+
+            page.keyboard.press('Escape')
+            page.wait_for_function("!document.getElementById('crisis-overlay').classList.contains('active')")
+            assert page.evaluate("document.activeElement.id") == 'msg-input'
+        finally:
+            browser.close()

tests/test_safety_plan_chat_header.py

@@ -1,20 +0,0 @@
-from pathlib import Path
-
-INDEX = Path("index.html")
-
-
-def test_chat_header_has_persistent_safety_plan_button():
-    html = INDEX.read_text()
-    assert 'id="chat-header"' in html
-    assert 'id="chat-safety-plan-btn"' in html
-    assert 'aria-label="Open My Safety Plan from chat header"' in html
-    assert 'My Safety Plan' in html
-
-
-def test_chat_header_button_opens_existing_safety_plan_modal():
-    html = INDEX.read_text()
-    assert "var chatSafetyPlanBtn = document.getElementById('chat-safety-plan-btn');" in html
-    assert "chatSafetyPlanBtn.addEventListener('click'" in html
-    assert "function openSafetyPlan(triggerEl)" in html
-    assert "safetyPlanModal.classList.add('active');" in html
-    assert "openSafetyPlan(chatSafetyPlanBtn);" in html