File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
1212import useScrollContext from '@hooks/useScrollContext' ;
1313import useTheme from '@hooks/useTheme' ;
1414import useThemeStyles from '@hooks/useThemeStyles' ;
15+ import { isMobile } from '@libs/Browser' ;
1516import getOperatingSystem from '@libs/getOperatingSystem' ;
1617import CONST from '@src/CONST' ;
1718import type { BasePickerProps } from './types' ;
@@ -159,6 +160,9 @@ function BasePicker<TPickerValue>({
159160
160161 const hasError = ! ! errorText ;
161162
163+ // Disable Tab focus on mobile to prevent soft keyboard navigation jumping to picker (#25759)
164+ const pickerTabIndex = isMobile ( ) ? - 1 : 0 ;
165+
162166 if ( isDisabled && shouldShowOnlyTextWhenDisabled ) {
163167 return (
164168 < View >
@@ -207,7 +211,7 @@ function BasePicker<TPickerValue>({
207211 } }
208212 pickerProps = { {
209213 ref : picker ,
210- tabIndex : - 1 ,
214+ tabIndex : pickerTabIndex ,
211215 onFocus : enableHighlight ,
212216 onBlur : ( ) => {
213217 disableHighlight ( ) ;
You can’t perform that action at this time.
0 commit comments