Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix android input focus in the search router component #51064

Merged
merged 4 commits into from
Oct 18, 2024
Merged

Fix android input focus in the search router component #51064

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bb216e
Fix android input focus in the search router component
abzokhattab Oct 17, 2024
d274a9f
Minor: Renaming TextInputRef to RNTextInput
abzokhattab Oct 17, 2024
3a816d9
Merge remote-tracking branch 'origin/main' into fix-android-focus-in-…
abzokhattab Oct 17, 2024
131d20f
using shouldDelayFocus instead of the useAutoFocusInput hook
abzokhattab Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/components/Search/SearchRouter/SearchRouterInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React, {useState} from 'react';
import type {ReactNode, RefObject} from 'react';
import React, {useState} from 'react';
import type {TextInput as RNTextInput, StyleProp, ViewStyle} from 'react-native';
import {View} from 'react-native';
import type {StyleProp, ViewStyle} from 'react-native';
import FormHelpMessage from '@components/FormHelpMessage';
import type {SelectionListHandle} from '@components/SelectionList/types';
import TextInput from '@components/TextInput';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -75,6 +76,7 @@ function SearchRouterInput({
const {translate} = useLocalize();
const [isFocused, setIsFocused] = useState<boolean>(false);
const {isOffline} = useNetwork();
const {inputCallbackRef} = useAutoFocusInput();
const offlineMessage: string = isOffline && shouldShowOfflineMessage ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : '';

const onChangeText = (text: string) => {
Expand All @@ -89,10 +91,15 @@ function SearchRouterInput({
<View style={[styles.flexRow, styles.alignItemsCenter, wrapperStyle ?? styles.searchRouterTextInputContainer, isFocused && wrapperFocusedStyle]}>
<View style={styles.flex1}>
<TextInput
ref={(textInputRef) => {
if (!autoFocus) {
return;
}
inputCallbackRef(textInputRef as RNTextInput | null);
}}
testID="search-router-text-input"
value={value}
onChangeText={onChangeText}
autoFocus={autoFocus}
loadingSpinnerStyle={[styles.mt0, styles.mr2]}
role={CONST.ROLE.PRESENTATION}
placeholder={translate('search.searchPlaceholder')}
Expand Down
Loading