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

@@ -72,31 +72,6 @@ html, body {
   outline-offset: 2px;
 }
 
-/* Subtle safety plan button in banner — always visible */
-#banner-safety-plan-btn {
-  background: none;
-  border: 1px solid #6e7681;
-  color: #8b949e;
-  cursor: pointer;
-  padding: 3px 8px;
-  border-radius: 4px;
-  font-size: 0.75rem;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  transition: background 0.2s, border-color 0.2s, color 0.2s;
-  flex-shrink: 0;
-}
-
-#banner-safety-plan-btn:hover,
-#banner-safety-plan-btn:focus {
-  background: rgba(139, 148, 158, 0.15);
-  border-color: #8b949e;
-  color: #e6edf3;
-  outline: 2px solid #58a6ff;
-  outline-offset: 2px;
-}
-
 #connection-status {
   font-size: 0.7rem;
   color: #6e7681;
@@ -650,10 +625,6 @@ html, body {
     <a href="tel:988" aria-label="Call 988 Suicide and Crisis Lifeline">
       988 Suicide &amp; Crisis Lifeline — Call or text 988
     </a>
-    <button id="banner-safety-plan-btn" aria-label="Open my safety plan" title="My Safety Plan">
-      <svg width="14" height="14" 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>
-      <span class="sr-only">My Safety Plan</span>
-    </button>
     <div id="connection-status" aria-hidden="true">
       <span class="status-dot"></span>
       <span id="status-text">Online</span>
@@ -709,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>
@@ -837,13 +808,13 @@ Sovereignty and service always.`;
   var crisisPanel = document.getElementById('crisis-panel');
   var crisisOverlay = document.getElementById('crisis-overlay');
   var overlayDismissBtn = document.getElementById('overlay-dismiss-btn');
+  var overlayCallLink = document.querySelector('.overlay-call');
   var statusDot = document.querySelector('.status-dot');
   var statusText = document.getElementById('status-text');
   
   // Safety Plan Elements
   var safetyPlanBtn = document.getElementById('safety-plan-btn');
   var crisisSafetyPlanBtn = document.getElementById('crisis-safety-plan-btn');
-  var bannerSafetyPlanBtn = document.getElementById('banner-safety-plan-btn');
   var safetyPlanModal = document.getElementById('safety-plan-modal');
   var closeSafetyPlan = document.getElementById('close-safety-plan');
   var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
@@ -1016,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
@@ -1049,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;
@@ -1059,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');
@@ -1080,7 +1091,8 @@ Sovereignty and service always.`;
       }
     }, 1000);
 
-    overlayDismissBtn.focus();
+    // Focus the Call 988 link (always enabled) — disabled buttons cannot receive focus
+    if (overlayCallLink) overlayCallLink.focus();
   }
 
   // Register focus trap on document (always listening, gated by class check)
@@ -1088,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);
     }
   });
 
@@ -1329,15 +1321,6 @@ Sovereignty and service always.`;
     });
   }
 
-  // Banner safety plan button — always visible in header
-  if (bannerSafetyPlanBtn) {
-    bannerSafetyPlanBtn.addEventListener('click', function() {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(bannerSafetyPlanBtn);
-    });
-  }
-
   // ===== TEXTAREA AUTO-RESIZE =====
   msgInput.addEventListener('input', function() {
     this.style.height = 'auto';

tests/test_crisis_overlay_focus_trap.py

@@ -52,6 +52,34 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
             'Expected overlay dismissal to restore focus to the prior target.',
         )
 
+    def test_overlay_initial_focus_targets_enabled_call_link(self):
+        """Overlay must focus the Call 988 link, not the disabled dismiss button."""
+        # Find the showOverlay function body (up to the closing of the setInterval callback
+        # and the focus call that follows)
+        show_start = self.html.find('function showOverlay()')
+        self.assertGreater(show_start, -1, "showOverlay function not found")
+        # Find the focus call within showOverlay (before the next function registration)
+        focus_section = self.html[show_start:show_start + 2000]
+        self.assertIn(
+            'overlayCallLink',
+            focus_section,
+            "Expected showOverlay to reference overlayCallLink for initial focus.",
+        )
+        # Ensure the old buggy pattern is gone
+        focus_line_region = self.html[show_start + 800:show_start + 1200]
+        self.assertNotIn(
+            'overlayDismissBtn.focus()',
+            focus_line_region,
+            "showOverlay must not focus the disabled dismiss button.",
+        )
+
+    def test_overlay_call_link_variable_is_declared(self):
+        self.assertIn(
+            "querySelector('.overlay-call')",
+            self.html,
+            "Expected a JS reference to the .overlay-call link element.",
+        )
+
 
 if __name__ == '__main__':
     unittest.main()

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_service_worker_offline.py

@@ -50,6 +50,22 @@ class TestCrisisOfflinePage(unittest.TestCase):
         for phrase in required_phrases:
             self.assertIn(phrase, self.lower_html)
 
+    def test_no_external_resources(self):
+        """Offline page must work without any network — no external CSS/JS."""
+        import re
+        html = self.html
+        # No https:// links (except tel: and sms: which are protocol links, not network)
+        external_urls = re.findall(r'href=["\']https://|src=["\']https://', html)
+        self.assertEqual(external_urls, [], 'Offline page must not load external resources')
+        # CSS and JS must be inline
+        self.assertIn('<style>', html, 'CSS must be inline')
+        self.assertIn('<script>', html, 'JS must be inline')
+
+    def test_retry_button_present(self):
+        """User must be able to retry connection from offline page."""
+        self.assertIn('retry-connection', self.html)
+        self.assertIn('Retry connection', self.html)
+
 
 if __name__ == '__main__':
     unittest.main()