Merge pull request #25981 from rushatgabhane/fix-crash

Don't focus when ref composer is unmounted
Expensify · Aug 28, 2023 · 165e1b8 · 165e1b8
2 parents a14511a + ca245d1
commit 165e1b8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -178,12 +178,19 @@ function ReportActionCompose({
         return translate('reportActionCompose.writeSomething');
     }, [report, blockedFromConcierge, translate, conciergePlaceholderRandomIndex]);
 
+    const focus = () => {
+        if (composerRef === null || composerRef.current === null) {
+            return;
+        }
+        composerRef.current.focus(true);
+    };
+
     const isKeyboardVisibleWhenShowingModalRef = useRef(false);
     const restoreKeyboardState = useCallback(() => {
         if (!isKeyboardVisibleWhenShowingModalRef.current) {
             return;
         }
-        composerRef.current.focus(true);
+        focus();
         isKeyboardVisibleWhenShowingModalRef.current = false;
     }, []);
 
@@ -403,7 +410,7 @@ function ReportActionCompose({
                     {DeviceCapabilities.canUseTouchScreen() && isMediumScreenWidth ? null : (
                         <EmojiPickerButton
                             isDisabled={isBlockedFromConcierge || disabled}
-                            onModalHide={() => composerRef.current.focus(true)}
+                            onModalHide={focus}
                             onEmojiSelected={(...args) => composerRef.current.replaceSelectionWithText(...args)}
                             emojiPickerID={report.reportID}
                         />