Merge pull request Expensify#91010 from Expensify/claude-skipBackButtonInDialogFocus

[CP Staging] Revert keyboard modality restoration on Esc/nav keys

Author: Beamanator

src/libs/hadTabNavigation.ts

@@ -1,10 +1,7 @@
-/** True when the user is keyboard-navigating; false when using a mouse. Tab + named nav keys set true; printable typing on body clears; printable typing inside editable fields preserves (data entry is not a modality switch). */
+/** True when the user is keyboard-navigating; false when typing or using a mouse. Only Tab sets true; printable/typing keys clear it. */
 let hadTabNavigation = false;
 let teardown: (() => void) | null = null;
 
-// Named keys that are unambiguously keyboard navigation intent — pressing any of these should restore keyboard modality even if typing had cleared it.
-const KEYBOARD_NAV_KEYS = new Set(['Escape', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight', 'Home', 'End', 'PageUp', 'PageDown']);
-
 function setup(): void {
     if (teardown || typeof document === 'undefined') {
         return;
@@ -15,7 +12,7 @@ function setup(): void {
         if (typeof e.key !== 'string') {
             return;
         }
-        if (e.key === 'Tab' || KEYBOARD_NAV_KEYS.has(e.key)) {
+        if (e.key === 'Tab') {
             hadTabNavigation = true;
             return;
         }

tests/unit/NavigationFocusReturnTest.ts

@@ -341,24 +341,6 @@ describe('captureTriggerForRoute', () => {
             expect(restoreTriggerForRoute('route-a')).toBe(false);
         });
 
-        it.each(['Escape', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight', 'Home', 'End', 'PageUp', 'PageDown'])(
-            'should RESTORE modality on %s after typing — keyboard-initiated back/nav must show visible focus on the restored trigger (WCAG 2.4.7)',
-            (navKey) => {
-                simulateTab();
-                simulateKey('a'); // Typing clears modality.
-                simulateKey(navKey); // Nav key restores it.
-                const trigger = appendButton();
-                trigger.focus();
-                setLastInteractiveElementForTests(trigger);
-
-                captureTriggerForRoute('route-a');
-                trigger.blur();
-                const spy = jest.spyOn(trigger, 'focus');
-                expect(restoreTriggerForRoute('route-a')).toBe(true);
-                expect(spy).toHaveBeenCalledWith(expect.objectContaining({focusVisible: true}));
-            },
-        );
-
         it('should clear modality on Backspace / Delete', () => {
             simulateTab();
             simulateKey('Backspace');