fix composer focus regain

Expensify · Nov 29, 2024 · bb9318f · bb9318f
1 parent 64eaf2f
commit bb9318f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/libs/focusComposerWithDelay/index.ts b/src/libs/focusComposerWithDelay/index.ts
@@ -1,3 +1,4 @@
+import {InteractionManager} from 'react-native';
 import ComposerFocusManager from '@libs/ComposerFocusManager';
 import isWindowReadyToFocus from '@libs/isWindowReadyToFocus';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
@@ -31,7 +32,8 @@ function focusComposerWithDelay(textInput: InputType | null): FocusComposerWithD
             if (!textInput) {
                 return;
             }
-            textInput.focus();
+            // When the closing modal has a focused text input focus() needs a delay to properly work.
+            InteractionManager.runAfterInteractions(() => textInput.focus());
             if (forcedSelectionRange) {
                 setTextInputSelection(textInput, forcedSelectionRange);
             }

diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx b/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
@@ -462,6 +462,12 @@ function ReportActionCompose({
                                             raiseIsScrollLikelyLayoutTriggered={raiseIsScrollLikelyLayoutTriggered}
                                             onAddActionPressed={onAddActionPressed}
                                             onItemSelected={onItemSelected}
+                                            onCanceledAttachmentPicker={() => {
+                                                if (!shouldFocusInputOnScreenFocus) {
+                                                    return;
+                                                }
+                                                focus();
+                                            }}
                                             actionButtonRef={actionButtonRef}
                                             shouldDisableAttachmentItem={hasExceededMaxCommentLength}
                                         />