From 295813001e0df15826e311c731fe9390deb16733 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Mon, 17 Jun 2024 15:31:25 +0200 Subject: [PATCH 1/2] Do not trap focus on troubleshoot and save the world pages --- src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts index 5f10a7293457..9add10463a95 100644 --- a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts +++ b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts @@ -32,6 +32,8 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [ SCREENS.WORKSPACE.TAXES, SCREENS.WORKSPACE.DISTANCE_RATES, SCREENS.SEARCH.CENTRAL_PANE, + SCREENS.SETTINGS.TROUBLESHOOT, + SCREENS.SETTINGS.SAVE_THE_WORLD, ]; export default WIDE_LAYOUT_INACTIVE_SCREENS; From 2cbb33094b9a91a86aa67ae20a75fd4e37636ba5 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Tue, 18 Jun 2024 09:44:08 +0200 Subject: [PATCH 2/2] Fix focus when clicking on input itself --- src/components/FocusTrap/FocusTrapForModal/index.web.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx index b06044404ee2..90787a1afc96 100644 --- 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, }} >