Revert "Use skipNextFocusRestore() instead of filtering back button in focusFirstInteractiveElement"

This reverts commit 611c41c.

Author: MelvinBot

src/hooks/useDialogContainerFocus/index.ts

@@ -5,14 +5,15 @@ import FOCUSABLE_SELECTOR from '@libs/focusableSelector';
 import hasFocusableAttributes from '@libs/focusGuards';
 import getHadTabNavigation from '@libs/hadTabNavigation';
 import {Priorities, tryClaim} from '@libs/ScreenFocusArbiter';
+import CONST from '@src/CONST';
 import type UseDialogContainerFocus from './types';
 
 function focusFirstInteractiveElement(container: HTMLElement | null): boolean {
     if (!getHadTabNavigation() || !container || (document.activeElement && document.activeElement !== document.body)) {
         return false;
     }
     const targets = container.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR);
-    const target = Array.from(targets).find(hasFocusableAttributes);
+    const target = Array.from(targets).find((el) => hasFocusableAttributes(el) && el.id !== CONST.BACK_BUTTON_NATIVE_ID);
     if (!target) {
         return false;
     }

src/hooks/useParticipantSubmission.ts

@@ -5,7 +5,6 @@ import {READ_COMMANDS} from '@libs/API/types';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import HttpUtils from '@libs/HttpUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {skipNextFocusRestore} from '@libs/NavigationFocusReturn';
 import {isPaidGroupPolicy} from '@libs/PolicyUtils';
 import {findSelfDMReportID, generateReportID, isInvoiceRoomWithID} from '@libs/ReportUtils';
 import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
@@ -365,8 +364,6 @@ function useParticipantSubmission({
             : iouConfirmationPageRoute;
 
         KeyboardUtils.dismissKeyboardAndExecute(() => {
-            // Skip the focus restore so the confirm page doesn't auto-focus the back button.
-            skipNextFocusRestore();
             // If the backTo parameter is set, we should navigate back to the confirmation screen that is already on the stack.
             // We wrap navigation in setNavigationActionToMicrotaskQueue so that data loading in Onyx and navigation do not occur simultaneously, which resets the amount to 0.
             // More information can be found here: https://github.com/Expensify/App/issues/73728

tests/unit/focusFirstInteractiveElementTest.ts

@@ -303,6 +303,27 @@ describe('focusFirstInteractiveElement', () => {
             expect(buttonSpy).toHaveBeenCalled();
         });
 
+        it('should skip the back button (BACK_BUTTON_NATIVE_ID) and focus the next element', () => {
+            const backButton = document.createElement('button');
+            backButton.id = 'backButton';
+            const nextButton = document.createElement('button');
+            const container = createContainer(backButton, nextButton);
+            const backSpy = jest.spyOn(backButton, 'focus');
+            const nextSpy = jest.spyOn(nextButton, 'focus');
+
+            focusFirstInteractiveElement(container);
+            expect(backSpy).not.toHaveBeenCalled();
+            expect(nextSpy).toHaveBeenCalled();
+        });
+
+        it('should return false when the only focusable element is the back button', () => {
+            const backButton = document.createElement('button');
+            backButton.id = 'backButton';
+            const container = createContainer(backButton);
+
+            expect(focusFirstInteractiveElement(container)).toBe(false);
+        });
+
         it('should skip elements inside an [inert] subtree', () => {
             const inertWrapper = document.createElement('div');
             inertWrapper.setAttribute('inert', '');