separate the condition check to prevent initial focus

Expensify · Jul 18, 2024 · d675642 · d675642
1 parent 7007d3c
commit d675642
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
@@ -43,8 +43,12 @@ function FocusTrapForScreen({children}: FocusTrapProps) {
                 fallbackFocus: document.body,
                 delayInitialFocus: CONST.ANIMATED_TRANSITION,
                 initialFocus: (focusTrapContainers) => {
+                    if (!canFocusInputOnScreenFocus()) {
+                        return false;
+                    }
+
                     const isFocusedElementInsideContainer = focusTrapContainers?.some((container) => container.contains(document.activeElement));
-                    if (!canFocusInputOnScreenFocus() || isFocusedElementInsideContainer) {
+                    if (isFocusedElementInsideContainer) {
                         return false;
                     }
                     return undefined;