Skip to content

Commit 727a322

Browse files
committed
fix: composer not highlighted after deleting edited message
1 parent 62909f5 commit 727a322

5 files changed

Lines changed: 5 additions & 22 deletions

File tree

src/libs/focusEditAfterCancelDelete/index.native.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/libs/focusEditAfterCancelDelete/index.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/libs/focusEditAfterCancelDelete/types.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,10 @@ function ComposerWithSuggestions({
328328
focusComposerWithDelay(composerRef.current, delay)(shouldDelay, forcedSelectionRange, forceKeyboardIfAlreadyFocused).catch(() => {});
329329
}, []);
330330

331-
const handleEditFocus = useCallback(() => focus(true, undefined, true), [focus]);
331+
const handleEditFocus = useCallback(() => {
332+
focus(true, undefined, true);
333+
onFocus();
334+
}, [focus, onFocus]);
332335

333336
const handleEditValueChange = useCallback(
334337
(nextValue: string) => {

src/pages/inbox/report/ReportActionCompose/useEditMessage.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import useOnyx from '@hooks/useOnyx';
88
import useReportIsArchived from '@hooks/useReportIsArchived';
99
import useReportScrollManager from '@hooks/useReportScrollManager';
1010
import {clearAllReportActionDrafts, editReportComment} from '@libs/actions/Report';
11-
import focusEditAfterCancelDelete from '@libs/focusEditAfterCancelDelete';
1211
import {getOriginalReportID} from '@libs/ReportUtils';
1312
import * as ReportActionContextMenu from '@pages/inbox/report/ContextMenu/ReportActionContextMenu';
1413
import {useReportActionActiveEditActions} from '@pages/inbox/report/ReportActionEditMessageContext';
@@ -83,7 +82,7 @@ function useEditMessage({reportID, originalReportID, reportAction, shouldScrollT
8382
// When user tries to save the empty message, it will delete it. Prompt the user to confirm deleting.
8483
if (!trimmedNewDraft) {
8584
composerRef.current?.blur();
86-
ReportActionContextMenu.showDeleteModal(actionOwnerReportID, reportAction, true, deleteDraft, () => focusEditAfterCancelDelete(composerRef.current));
85+
ReportActionContextMenu.showDeleteModal(actionOwnerReportID, reportAction, true, deleteDraft, () => requestIdleCallback(() => composerRef.current?.focus()));
8786
return;
8887
}
8988

0 commit comments

Comments
 (0)