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

[CP Staging] Revert "Prevent Lottie from running in the background after navigating to other pages" #48283

Merged
merged 1 commit into from
Aug 29, 2024
Merged

[CP Staging] Revert "Prevent Lottie from running in the background after navigating to other pages" #48283

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
26 changes: 1 addition & 25 deletions src/components/Lottie/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {useNavigation} from '@react-navigation/native';
import type {AnimationObject, LottieViewProps} from 'lottie-react-native';
import LottieView from 'lottie-react-native';
import type {ForwardedRef} from 'react';
Expand All @@ -9,7 +8,6 @@ import useAppState from '@hooks/useAppState';
import useNetwork from '@hooks/useNetwork';
import useSplashScreen from '@hooks/useSplashScreen';
import useThemeStyles from '@hooks/useThemeStyles';
import NAVIGATORS from '@src/NAVIGATORS';

type Props = {
source: DotLottieAnimation;
Expand All @@ -20,8 +18,6 @@ function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef<LottieVie
const {isSplashHidden} = useSplashScreen();
const styles = useThemeStyles();
const [isError, setIsError] = React.useState(false);
const [isHidden, setIsHidden] = React.useState(false);
const navigation = useNavigation();

useNetwork({onReconnect: () => setIsError(false)});

Expand All @@ -31,33 +27,13 @@ function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef<LottieVie
setAnimationFile(source.file);
}, [setAnimationFile, source.file]);

useEffect(() => {
const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
setIsHidden(false);
});
return unsubscribeNavigationFocus;
}, [navigation]);

// Prevent the animation from running in the background after navigating to other pages.
// See https://github.com/Expensify/App/issues/47273
useEffect(() => {
const unsubscribeNavigationBlur = navigation.addListener('blur', () => {
const state = navigation.getState();
const targetRouteName = state?.routes?.[state?.index ?? 0]?.name;
if (targetRouteName !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
setIsHidden(true);
}
});
return unsubscribeNavigationBlur;
}, [navigation]);

const aspectRatioStyle = styles.aspectRatioLottie(source);

// If the image fails to load, app is in background state, animation file isn't ready, or the splash screen isn't hidden yet,
// we'll just render an empty view as the fallback to prevent
// 1. memory leak, see issue: https://github.com/Expensify/App/issues/36645
// 2. heavy rendering, see issue: https://github.com/Expensify/App/issues/34696
if (isError || isHidden || appState.isBackground || !animationFile || !isSplashHidden) {
if (isError || appState.isBackground || !animationFile || !isSplashHidden) {
return <View style={[aspectRatioStyle, props.style]} />;
}

Expand Down
Loading