Merge pull request #31421 from s-alves10/fix/issue-22447

fix:: not focus the composer when file picker is opened
Expensify · Dec 4, 2023 · 65a6e23 · 65a6e23
2 parents 84aa647 + c7bbdd3
commit 65a6e23
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -189,8 +189,9 @@ function ReportActionCompose({
     };
 
     const isKeyboardVisibleWhenShowingModalRef = useRef(false);
+    const isNextModalWillOpenRef = useRef(false);
     const restoreKeyboardState = useCallback(() => {
-        if (!isKeyboardVisibleWhenShowingModalRef.current) {
+        if (!isKeyboardVisibleWhenShowingModalRef.current || isNextModalWillOpenRef.current) {
             return;
         }
         focus();
@@ -265,13 +266,7 @@ function ReportActionCompose({
         [onSubmit],
     );
 
-    const isNextModalWillOpenRef = useRef(false);
     const onTriggerAttachmentPicker = useCallback(() => {
-        // Set a flag to block suggestion calculation until we're finished using the file picker,
-        // which will stop any flickering as the file picker opens on non-native devices.
-        if (willBlurTextInputOnTapOutside) {
-            suggestionsRef.current.setShouldBlockSuggestionCalc(true);
-        }
         isNextModalWillOpenRef.current = true;
         isKeyboardVisibleWhenShowingModalRef.current = true;
     }, []);
@@ -379,7 +374,10 @@ function ReportActionCompose({
                                         setMenuVisibility={setMenuVisibility}
                                         isMenuVisible={isMenuVisible}
                                         onTriggerAttachmentPicker={onTriggerAttachmentPicker}
-                                        onCanceledAttachmentPicker={restoreKeyboardState}
+                                        onCanceledAttachmentPicker={() => {
+                                            isNextModalWillOpenRef.current = false;
+                                            restoreKeyboardState();
+                                        }}
                                         onMenuClosed={restoreKeyboardState}
                                         onAddActionPressed={onAddActionPressed}
                                         onItemSelected={onItemSelected}