From 5540b3bd3d98895f908e15575e42019b79eb6208 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 22 Jan 2026 13:30:45 +0300 Subject: [PATCH 1/3] fix: Keyboard Navigation: Landing Page: The combobox of Language is not focusable with Tab key --- src/components/Picker/BasePicker.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx index 462646b49123..20a0dfa9174a 100644 --- a/src/components/Picker/BasePicker.tsx +++ b/src/components/Picker/BasePicker.tsx @@ -159,6 +159,10 @@ function BasePicker({ const hasError = !!errorText; + const currentOS = getOperatingSystem(); + const isMobileOS = currentOS === CONST.OS.IOS || currentOS === CONST.OS.ANDROID; + const pickerTabIndex = isMobileOS ? -1 : 0; + if (isDisabled && shouldShowOnlyTextWhenDisabled) { return ( @@ -207,7 +211,7 @@ function BasePicker({ }} pickerProps={{ ref: picker, - tabIndex: -1, + tabIndex: pickerTabIndex, onFocus: enableHighlight, onBlur: () => { disableHighlight(); From 0c558b6dd7cf9c48f2d3fb1b0a3c2d07f03257b2 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 22 Jan 2026 16:07:41 +0300 Subject: [PATCH 2/3] chore: use isMobile() for picker tabIndex to correctly detect iPad --- src/components/Picker/BasePicker.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx index 20a0dfa9174a..9ca6a35da579 100644 --- a/src/components/Picker/BasePicker.tsx +++ b/src/components/Picker/BasePicker.tsx @@ -12,6 +12,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useScrollContext from '@hooks/useScrollContext'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; +import {isMobile} from '@libs/Browser'; import getOperatingSystem from '@libs/getOperatingSystem'; import CONST from '@src/CONST'; import type {BasePickerProps} from './types'; @@ -159,9 +160,7 @@ function BasePicker({ const hasError = !!errorText; - const currentOS = getOperatingSystem(); - const isMobileOS = currentOS === CONST.OS.IOS || currentOS === CONST.OS.ANDROID; - const pickerTabIndex = isMobileOS ? -1 : 0; + const pickerTabIndex = isMobile() ? -1 : 0; if (isDisabled && shouldShowOnlyTextWhenDisabled) { return ( From 7295a69cc54a675e03d9e35e19dea0228f40e580 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Sat, 31 Jan 2026 11:42:20 +0300 Subject: [PATCH 3/3] fix: add comment explaining pickerTabIndex logic --- src/components/Picker/BasePicker.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx index 9ca6a35da579..a5059bbc1b89 100644 --- a/src/components/Picker/BasePicker.tsx +++ b/src/components/Picker/BasePicker.tsx @@ -160,6 +160,7 @@ function BasePicker({ const hasError = !!errorText; + // Disable Tab focus on mobile to prevent soft keyboard navigation jumping to picker (#25759) const pickerTabIndex = isMobile() ? -1 : 0; if (isDisabled && shouldShowOnlyTextWhenDisabled) {