diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx index 462646b49123..a5059bbc1b89 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,6 +160,9 @@ 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) { return ( @@ -207,7 +211,7 @@ function BasePicker({ }} pickerProps={{ ref: picker, - tabIndex: -1, + tabIndex: pickerTabIndex, onFocus: enableHighlight, onBlur: () => { disableHighlight();