Merge pull request #34495 from callstack-internal/fix/start-chat-tabs…

…-transition Fix StartChat screen transition stuttering
Expensify · Feb 2, 2024 · d9fd412 · d9fd412
2 parents cc64ab0 + d6029f2
commit d9fd412
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/hooks/useAutoFocusInput.ts b/src/hooks/useAutoFocusInput.ts
@@ -23,10 +23,14 @@ export default function useAutoFocusInput(): UseAutoFocusInput {
         if (!isScreenTransitionEnded || !isInputInitialized || !inputRef.current || !isSplashHidden) {
             return;
         }
-        InteractionManager.runAfterInteractions(() => {
+        const focusTaskHandle = InteractionManager.runAfterInteractions(() => {
             inputRef.current?.focus();
             setIsScreenTransitionEnded(false);
         });
+
+        return () => {
+            focusTaskHandle.cancel();
+        };
     }, [isScreenTransitionEnded, isInputInitialized, isSplashHidden]);
 
     useFocusEffect(
@@ -35,12 +39,12 @@ export default function useAutoFocusInput(): UseAutoFocusInput {
                 setIsScreenTransitionEnded(true);
             }, CONST.ANIMATED_TRANSITION);
             return () => {
+                setIsScreenTransitionEnded(false);
                 if (!focusTimeoutRef.current) {
                     return;
                 }
                 clearTimeout(focusTimeoutRef.current);
             };
-            // eslint-disable-next-line react-hooks/exhaustive-deps
         }, []),
     );