Merge pull request #43832 from software-mansion-labs/fix-focus-on-com…

…poser Do not trap focus on troubleshoot and save the world pages
Expensify · Jun 24, 2024 · c693917 · c693917
2 parents 7489847 + 2cbb330
commit c693917
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
@@ -9,7 +9,7 @@ function FocusTrapForModal({children, active}: FocusTrapForModalProps) {
             active={active}
             focusTrapOptions={{
                 trapStack: sharedTrapStack,
-                allowOutsideClick: true,
+                clickOutsideDeactivates: true,
                 initialFocus: false,
                 fallbackFocus: document.body,
             }}

diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
@@ -33,6 +33,8 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
     SCREENS.WORKSPACE.REPORT_FIELDS,
     SCREENS.WORKSPACE.DISTANCE_RATES,
     SCREENS.SEARCH.CENTRAL_PANE,
+    SCREENS.SETTINGS.TROUBLESHOOT,
+    SCREENS.SETTINGS.SAVE_THE_WORLD,
 ];
 
 export default WIDE_LAYOUT_INACTIVE_SCREENS;