Skip to content

[CP Staging] Fix the main composer not regaining focus after action is deleted #28456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ospfranco wants to merge 1 commit into from
Closed

[CP Staging] Fix the main composer not regaining focus after action is deleted #28456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/pages/home/report/ReportActionItemMessageEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ function ReportActionItemMessageEdit(props) {
const [hasExceededMaxCommentLength, setHasExceededMaxCommentLength] = useState(false);

const textInputRef = useRef(null);
const isFocusedRef = useRef(false);
const insertedEmojis = useRef([]);

useEffect(() => {
Expand All @@ -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(() => {
Expand Down