From 94be73b50eaca919ab71339dc39783d22061587b Mon Sep 17 00:00:00 2001 From: Oscar Franco Date: Fri, 29 Sep 2023 11:42:45 +0200 Subject: [PATCH] Fix the main composer not regaining focus after action is deleted --- src/pages/home/report/ReportActionItemMessageEdit.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index 3ceaf69b52f5..a0f3d48d173a 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -109,7 +109,6 @@ function ReportActionItemMessageEdit(props) { const [hasExceededMaxCommentLength, setHasExceededMaxCommentLength] = useState(false); const textInputRef = useRef(null); - const isFocusedRef = useRef(false); const insertedEmojis = useRef([]); useEffect(() => { @@ -119,15 +118,10 @@ function ReportActionItemMessageEdit(props) { setDraft(Str.htmlDecode(props.draftMessage)); }, [props.draftMessage, props.action]); - useEffect(() => { - // required for keeping last state of isFocused variable - isFocusedRef.current = isFocused; - }, [isFocused]); - // We consider the report action active if it's focused, its emoji picker is open or its context menu is open const isActive = useCallback( - () => isFocusedRef.current || EmojiPickerAction.isActive(props.action.reportActionID) || ReportActionContextMenu.isActiveReportAction(props.action.reportActionID), - [props.action.reportActionID], + () => isFocused || EmojiPickerAction.isActive(props.action.reportActionID) || ReportActionContextMenu.isActiveReportAction(props.action.reportActionID), + [props.action.reportActionID, isFocused], ); useEffect(() => {