Merge pull request #38978 from nkdengineer/fix/38700

Fix can not focus on the main composer after going back from thread
Expensify · Mar 27, 2024 · f8416e9 · f8416e9
2 parents b27be0f + 240e394
commit f8416e9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/...pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
@@ -653,6 +653,9 @@ function ComposerWithSuggestions(
         const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListener(focusComposerOnKeyPress));
         const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
             KeyDownListener.addKeyDownPressListener(focusComposerOnKeyPress);
+            // The report isn't unmounted and can be focused again after going back from another report so we should update the composerRef again
+            // @ts-expect-error need to reassign this ref
+            ReportActionComposeFocusManager.composerRef.current = textInputRef.current;
             setUpComposeFocusManager();
         });
         KeyDownListener.addKeyDownPressListener(focusComposerOnKeyPress);