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.

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

Fix input not auto-focused on mWeb #55823

Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/components/Lottie/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type DotLottieAnimation from '@components/LottieAnimations/types';
import useAppState from '@hooks/useAppState';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import * as Browser from '@libs/Browser';
import {getBrowser, isMobile} from '@libs/Browser';
import isSideModalNavigator from '@libs/Navigation/isSideModalNavigator';
import CONST from '@src/CONST';
import {useSplashScreenStateContext} from '@src/SplashScreenStateContext';
Expand Down Expand Up @@ -51,7 +51,7 @@ function Lottie({source, webStyle, shouldLoadAfterInteractions, ...props}: Props

const aspectRatioStyle = styles.aspectRatioLottie(source);

const browser = Browser.getBrowser();
const browser = getBrowser();
const [hasNavigatedAway, setHasNavigatedAway] = React.useState(false);
const navigationContainerRef = useContext(NavigationContainerRefContext);
const navigator = useContext(NavigationContext);
Expand All @@ -74,7 +74,7 @@ function Lottie({source, webStyle, shouldLoadAfterInteractions, ...props}: Props
const unsubscribeNavigationBlur = navigator.addListener('blur', () => {
const state = navigationContainerRef.getRootState();
const targetRouteName = state?.routes?.[state?.index ?? 0]?.name;
if (!isSideModalNavigator(targetRouteName)) {
if (!isSideModalNavigator(targetRouteName) || isMobile()) {
setHasNavigatedAway(true);
}
});
Expand Down
Loading