Merge pull request #53328 from FitseTLT/fix-focus-regain-of-composer

Fix - The Composer isn't getting focus again after the attachment modal is dismissed

Author: grgia

src/libs/focusComposerWithDelay/index.ts

@@ -31,7 +31,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.
+            setTimeout(() => textInput.focus(), 0);
             if (forcedSelectionRange) {
                 setTextInputSelection(textInput, forcedSelectionRange);
             }

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}
                                         />