Skip to content

Commit 9618ba6

Browse files
authored
Merge pull request Expensify#80219 from TaduJR/fix-Keyboard-Navigation-Landing-Page-The-combobox-of-Language-is-not-focusable-with-Tab-key
fix: Keyboard Navigation: Landing Page: The combobox of Language is not focusable with Tab key
2 parents 76a45ec + 7295a69 commit 9618ba6

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

src/components/Picker/BasePicker.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
1212
import useScrollContext from '@hooks/useScrollContext';
1313
import useTheme from '@hooks/useTheme';
1414
import useThemeStyles from '@hooks/useThemeStyles';
15+
import {isMobile} from '@libs/Browser';
1516
import getOperatingSystem from '@libs/getOperatingSystem';
1617
import CONST from '@src/CONST';
1718
import 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();

0 commit comments

Comments
 (0)