Skip to content

Add a delay to prevent focus from setting before the animation is finished #73153

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
mountiny merged 6 commits into from
Oct 29, 2025
Merged

Add a delay to prevent focus from setting before the animation is finished #73153

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0413c54
Add delay to prevent focus from setting before the animation is finished
OlGierd03 Oct 21, 2025
7d9b4c1
Add comment describing the changes and improve if statement to suit c…
OlGierd03 Oct 22, 2025
8bba871
Merge branch 'main' into @OlGierd03/fix-RHP-animation-flickering
OlGierd03 Oct 22, 2025
8d513e0
Restrict the if statement condition to better match the use case
OlGierd03 Oct 23, 2025
47f5728
Improve comment clarity
OlGierd03 Oct 24, 2025
84cf737
Add useEffect missing dependency: wideRHPRouteKeys.length
OlGierd03 Oct 27, 2025
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
16 changes: 13 additions & 3 deletions src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useFocusEffect} from '@react-navigation/native';
import type {ForwardedRef} from 'react';
import React, {useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
import React, {useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
import {View} from 'react-native';
import type {StyleProp, ViewStyle} from 'react-native';
import Button from '@components/Button';
Expand All @@ -11,6 +11,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
import RenderHTML from '@components/RenderHTML';
import Text from '@components/Text';
import {WideRHPContext} from '@components/WideRHPContextProvider';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
Expand Down Expand Up @@ -108,6 +109,7 @@ function BaseValidateCodeForm({
}: ValidateCodeFormProps) {
const {translate} = useLocalize();
const {isOffline} = useNetwork();
const {wideRHPRouteKeys} = useContext(WideRHPContext);
const theme = useTheme();
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
Expand Down Expand Up @@ -177,8 +179,16 @@ function BaseValidateCodeForm({
if (!validateCodeSent) {
return;
}
inputValidateCodeRef.current?.clear();
}, [validateCodeSent]);
// Delay prevents the input from gaining focus before the RHP slide out animation finishes,
// which would cause the wide RHP to flicker in the background.
if (wideRHPRouteKeys.length > 0 && !isMobileSafari()) {
focusTimeoutRef.current = setTimeout(() => {
inputValidateCodeRef.current?.clear();
}, CONST.ANIMATED_TRANSITION);
} else {
inputValidateCodeRef.current?.clear();
}
}, [validateCodeSent, wideRHPRouteKeys.length]);

useEffect(() => {
if (timeRemaining > 0) {
Expand Down
Loading