fix: overlay initial focus targets enabled element (closes #90 , refs #69 )

2026-04-14 23:25:28 -04:00
3 changed files with 94 additions and 95 deletions
--- a/index.html
+++ b/index.html
@@ -613,31 +613,6 @@ html, body {
  top: 8px;
  outline: 2px solid #58a6ff;
 }
-
-/* Toast notification */
-.toast-notification {
-  position: fixed;
-  bottom: 24px;
-  left: 50%;
-  transform: translateX(-50%) translateY(100px);
-  padding: 12px 24px;
-  border-radius: 8px;
-  font-size: 0.9rem;
-  font-weight: 500;
-  z-index: 10001;
-  opacity: 0;
-  transition: transform 0.3s ease, opacity 0.3s ease;
-  pointer-events: none;
-  max-width: 90vw;
-  text-align: center;
-}
-.toast-notification.visible {
-  transform: translateX(-50%) translateY(0);
-  opacity: 1;
-}
-.toast-notification.success { background: #238636; color: #fff; }
-.toast-notification.error { background: #da3633; color: #fff; }
-
 </style>
 </head>
 <body>
@@ -1075,11 +1050,43 @@ Sovereignty and service always.`;
      }
    }, 1000);

-    overlayDismissBtn.focus();
+    // Focus the Call 988 link — always enabled, most important action
+    var callLink = crisisOverlay.querySelector('.overlay-call');
+    if (callLink) {
+      callLink.focus();
+    }
  }

-  // Register focus trap on document (always listening, gated by class check)
+  // Crisis overlay Escape key handler
+  function trapCrisisOverlayEscape(e) {
+    if (e.key !== 'Escape') return;
+    if (!crisisOverlay.classList.contains('active')) return;
+    if (overlayDismissBtn.disabled) return; // Don't escape during countdown
+    // Dismiss the overlay
+    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 chat input
+    if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
+      _preOverlayFocusElement.focus();
+    } else {
+      msgInput.focus();
+    }
+    _preOverlayFocusElement = null;
+  }
+
+  // Register focus trap and Escape handler on document (always listening, gated by class check)
  document.addEventListener('keydown', trapFocusInOverlay);
+  document.addEventListener('keydown', trapCrisisOverlayEscape);

  overlayDismissBtn.addEventListener('click', function() {
    if (!overlayDismissBtn.disabled) {
@@ -1230,9 +1237,9 @@ Sovereignty and service always.`;
      localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
      safetyPlanModal.classList.remove('active');
      _restoreSafetyPlanFocus();
-      showToast('Safety plan saved locally.', 'success');
+      alert('Safety plan saved locally.');
    } catch (e) {
-      showToast('Error saving plan.', 'error');
+      alert('Error saving plan.');
    }
  });

@@ -1477,22 +1484,6 @@ Sovereignty and service always.`;
    msgInput.focus();
  }

-  // ===== TOAST NOTIFICATION =====
-  var _toastEl = document.getElementById('toast-notification');
-  var _toastTimer = null;
-
-  function showToast(message, type) {
-    type = type || 'success';
-    _toastEl.textContent = message;
-    _toastEl.className = 'toast-notification ' + type;
-    void _toastEl.offsetHeight; // force reflow before transition
-    _toastEl.classList.add('visible');
-    if (_toastTimer) clearTimeout(_toastTimer);
-    _toastTimer = setTimeout(function() {
-      _toastEl.classList.remove('visible');
-    }, 3000);
-  }
-
  // ===== BOOT =====
  if (document.readyState === 'loading') {
    document.addEventListener('DOMContentLoaded', init);
@@ -1502,8 +1493,5 @@ Sovereignty and service always.`;

 })();
 </script>
-
-<div id="toast-notification" class="toast-notification"
-     role="status" aria-live="polite" aria-atomic="true"></div>
 </body>
 </html>
--- a/tests/test_crisis_overlay_focus_trap.py
+++ b/tests/test_crisis_overlay_focus_trap.py
@@ -52,6 +52,64 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
            'Expected overlay dismissal to restore focus to the prior target.',
        )

+    def test_overlay_registers_escape_key_handler(self):
+        self.assertRegex(
+            self.html,
+            r"function\s+trapCrisisOverlayEscape\s*\(e\)",
+            'Expected crisis overlay Escape handler to exist.',
+        )
+        self.assertRegex(
+            self.html,
+            r"if\s*\(e\.key\s*!==\s*'Escape'\)\s*return;",
+            'Expected Escape handler to guard on Escape key events.',
+        )
+        self.assertRegex(
+            self.html,
+            r"document\.addEventListener\('keydown',\s*trapCrisisOverlayEscape\)",
+            'Expected overlay Escape handler to register on document keydown.',
+        )
+
+    def test_overlay_escape_returns_focus_to_chat_input(self):
+        self.assertIn(
+            'msgInput.focus()',
+            self.html,
+            'Expected Escape to fall back to msgInput.focus() when no pre-overlay element.',
+        )
+
+    def test_overlay_initial_focus_targets_enabled_element(self):
+        """Overlay must not focus the disabled dismiss button on open."""
+        self.assertRegex(
+            self.html,
+            r'overlayDismissBtn\.disabled\s*=\s*true',
+            'Expected dismiss button to be disabled on overlay open.',
+        )
+        # In showOverlay body, overlayDismissBtn.focus() must not appear
+        show_overlay_match = re.search(
+            r'function showOverlay\(\)(.*?)(?=\nfunction |\n\s+// Register)',
+            self.html,
+            re.DOTALL,
+        )
+        self.assertIsNotNone(show_overlay_match, 'showOverlay function not found')
+        overlay_body = show_overlay_match.group(1)
+        self.assertNotIn(
+            'overlayDismissBtn.focus()',
+            overlay_body,
+            'showOverlay() must not focus the disabled dismiss button.',
+        )
+
+    def test_overlay_focuses_call_link(self):
+        """Overlay should focus the .overlay-call link on open."""
+        self.assertIn(
+            '.overlay-call',
+            self.html,
+            'Expected .overlay-call element to exist in the overlay.',
+        )
+        self.assertRegex(
+            self.html,
+            r"querySelector\('\.overlay-call'\)",
+            'Expected showOverlay to query for .overlay-call element.',
+        )
+

 if __name__ == '__main__':
    unittest.main()
--- a/tests/test_toast_notification.py
+++ b/tests/test_toast_notification.py
@@ -1,47 +0,0 @@
-"""Tests for inline toast notification replacing blocking alert() — issue #73."""
-import pathlib
-import unittest
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-INDEX_HTML = ROOT / "index.html"
-
-
-class TestToastNotification(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.html = INDEX_HTML.read_text(encoding="utf-8")
-
-    def test_no_blocking_alerts_in_safety_plan_save(self):
-        """Safety plan save handler must not use alert()."""
-        idx = self.html.find("localStorage.setItem('timmy_safety_plan'")
-        self.assertGreater(idx, 0, "Safety plan save handler not found")
-        section = self.html[idx : idx + 300]
-        self.assertNotIn(
-            "alert(",
-            section,
-            "Safety plan save handler still uses blocking alert()",
-        )
-
-    def test_toast_element_exists_in_dom(self):
-        self.assertIn('id="toast-notification"', self.html)
-
-    def test_toast_has_aria_live(self):
-        self.assertIn('aria-live="polite"', self.html)
-
-    def test_showToast_function_defined(self):
-        self.assertIn("function showToast(", self.html)
-
-    def test_toast_css_classes_present(self):
-        for cls in (".toast-notification", ".visible", ".success", ".error"):
-            self.assertIn(cls, self.html, f"Missing CSS class {cls}")
-
-    def test_toast_auto_dismiss_via_timeout(self):
-        idx = self.html.find("function showToast")
-        self.assertGreater(idx, 0, "showToast function not found")
-        self.assertIn("setTimeout", self.html[idx:])
-
-
-def test_showToast_replaces_alert():
-    html = INDEX_HTML.read_text(encoding="utf-8")
-    assert "showToast('Safety plan saved locally.'" in html
-    assert "showToast('Error saving plan.'" in html