Skip to content

Replace useDelayedAutoFocus with useAutoFocusInput in sub-step forms #105572

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

Merged
NicolasBonet merged 1 commit into from
Nov 2, 2026
+8 −47
Merged

Replace useDelayedAutoFocus with useAutoFocusInput in sub-step forms #105572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/components/SubStepForms/RegistrationNumberStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
import Icon from '@components/Icon';
import type {AnimatedTextInputRef} from '@components/RNTextInput';
import Text from '@components/Text';
import TextInput from '@components/TextInput';
import TextLink from '@components/TextLink';

import useDelayedAutoFocus from '@hooks/useDelayedAutoFocus';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import type {SubPageProps} from '@hooks/useSubPage/types';
Expand All @@ -20,7 +19,7 @@ import CONST from '@src/CONST';
import type {Country} from '@src/CONST';
import type {OnyxFormValuesMapping} from '@src/ONYXKEYS';

import React, {useRef} from 'react';
import React from 'react';
import {View} from 'react-native';

type RegistrationNumberStepProps<TFormID extends keyof OnyxFormValuesMapping> = SubPageProps & {
Expand Down Expand Up @@ -49,8 +48,7 @@ function RegistrationNumberStepImpl({formID, onSubmit, inputID, defaultValue, is
const styles = useThemeStyles();
const theme = useTheme();
const icons = useMemoizedLazyExpensifyIcons(['QuestionMark']);
const internalInputRef = useRef<AnimatedTextInputRef>(null);
useDelayedAutoFocus(internalInputRef, shouldDelayAutoFocus);
const {inputCallbackRef} = useAutoFocusInput();

const helpLink = CONST.REGISTRATION_NUMBER_HELP_URL[country as keyof typeof CONST.REGISTRATION_NUMBER_HELP_URL] ?? CONST.REGISTRATION_NUMBER_HELP_URL.EU;

Expand Down Expand Up @@ -84,7 +82,7 @@ function RegistrationNumberStepImpl({formID, onSubmit, inputID, defaultValue, is
defaultValue={defaultValue}
shouldSaveDraft={!isEditing}
autoFocus={!shouldDelayAutoFocus}
ref={internalInputRef}
ref={shouldDelayAutoFocus ? inputCallbackRef : undefined}
forwardedFSClass={CONST.FULLSTORY.CLASS.MASK}
/>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.mt6]}>
Expand Down
10 changes: 4 additions & 6 deletions src/components/SubStepForms/SingleFieldStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
import PatriotActLink from '@components/PatriotActLink';
import type {AnimatedTextInputRef} from '@components/RNTextInput';
import Text from '@components/Text';
import TextInput from '@components/TextInput';

import useDelayedAutoFocus from '@hooks/useDelayedAutoFocus';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import type {SubPageProps} from '@hooks/useSubPage/types';
import useThemeStyles from '@hooks/useThemeStyles';
Expand All @@ -20,7 +19,7 @@ import type {OnyxFormValuesMapping} from '@src/ONYXKEYS';

import type {InputModeOptions} from 'react-native';

import React, {useRef} from 'react';
import React from 'react';
import {View} from 'react-native';

type SingleFieldStepProps<TFormID extends keyof OnyxFormValuesMapping> = SubPageProps &
Expand Down Expand Up @@ -87,8 +86,7 @@ function SingleFieldStep<TFormID extends keyof OnyxFormValuesMapping>({
}: SingleFieldStepProps<TFormID>) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const internalInputRef = useRef<AnimatedTextInputRef>(null);
useDelayedAutoFocus(internalInputRef, shouldDelayAutoFocus);
const {inputCallbackRef} = useAutoFocusInput();

return (
<FormProvider
Expand Down Expand Up @@ -120,7 +118,7 @@ function SingleFieldStep<TFormID extends keyof OnyxFormValuesMapping>({
disabled={disabled}
placeholder={placeholder}
autoFocus={!shouldDelayAutoFocus}
ref={internalInputRef}
ref={shouldDelayAutoFocus ? inputCallbackRef : undefined}
forwardedFSClass={forwardedFSClass}
/>
</View>
Expand Down
35 changes: 0 additions & 35 deletions src/hooks/useDelayedAutoFocus.ts
View file
Open in desktop

This file was deleted.

Loading