Merge pull request #47596 from bernhardoj/fix/46095-composer-selectio…

…n-is-at-start

Fix composer selection is at start after when copying link to a message

src/components/Composer/index.tsx

@@ -19,6 +19,7 @@ import * as Browser from '@libs/Browser';
 import updateIsFullComposerAvailable from '@libs/ComposerUtils/updateIsFullComposerAvailable';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
+import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import isEnterWhileComposition from '@libs/KeyboardShortcut/isEnterWhileComposition';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import CONST from '@src/CONST';
@@ -413,7 +414,7 @@ function Composer(
                             return;
                         }
 
-                        textInput.current.focus();
+                        focusComposerWithDelay(textInput.current)(true);
                     });
 
                     props.onFocus?.(e);

src/components/Modal/BaseModal.tsx

@@ -256,7 +256,10 @@ function BaseModal(
                     avoidKeyboard={avoidKeyboard}
                     customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
                 >
-                    <ModalContent onDismiss={handleDismissModal}>
+                    <ModalContent
+                        onModalWillShow={saveFocusState}
+                        onDismiss={handleDismissModal}
+                    >
                         <PortalHost name="modal" />
                         <FocusTrapForModal
                             active={isVisible}

src/components/Modal/ModalContent.tsx

@@ -11,11 +11,17 @@ type ModalContentProps = {
      * such as closing the attachment modal through the browser's back button.
      * */
     onDismiss: () => void;
+
+    /** Callback method fired after modal content is mounted. */
+    onModalWillShow: () => void;
 };
 
-function ModalContent({children, onDismiss = () => {}}: ModalContentProps) {
-    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    React.useEffect(() => () => onDismiss?.(), []);
+function ModalContent({children, onDismiss = () => {}, onModalWillShow = () => {}}: ModalContentProps) {
+    React.useEffect(() => {
+        onModalWillShow();
+        return onDismiss;
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
     return children;
 }
 ModalContent.displayName = 'ModalContent';

src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx

@@ -292,7 +292,7 @@ function ComposerWithSuggestions(
     const valueRef = useRef(value);
     valueRef.current = value;
 
-    const [selection, setSelection] = useState<TextSelection>(() => ({start: 0, end: 0, positionX: 0, positionY: 0}));
+    const [selection, setSelection] = useState<TextSelection>(() => ({start: value.length, end: value.length, positionX: 0, positionY: 0}));
 
     const [composerHeight, setComposerHeight] = useState(0);
 
@@ -562,7 +562,7 @@ function ComposerWithSuggestions(
                 return;
             }
 
-            focus(false);
+            focus(true);
         }, true);
     }, [focus, isFocused]);