diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js index ffd7f65185ce..e194d0870885 100644 --- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js +++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js @@ -566,6 +566,7 @@ function ComposerWithSuggestions({ { - if (shouldBlockCalc.current || selectionEnd < 1) { + if (shouldBlockCalc.current || selectionEnd < 1 || !isComposerFocused) { shouldBlockCalc.current = false; resetSuggestions(); return; @@ -229,7 +230,7 @@ function SuggestionMention({ })); setHighlightedMentionIndex(0); }, - [getMentionOptions, personalDetails, resetSuggestions, setHighlightedMentionIndex, value], + [getMentionOptions, personalDetails, resetSuggestions, setHighlightedMentionIndex, value, isComposerFocused], ); useEffect(() => { diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.js b/src/pages/home/report/ReportActionCompose/Suggestions.js index 60c31efb1446..74e9e79471e7 100644 --- a/src/pages/home/report/ReportActionCompose/Suggestions.js +++ b/src/pages/home/report/ReportActionCompose/Suggestions.js @@ -40,6 +40,7 @@ function Suggestions({ resetKeyboardInput, measureParentContainer, isAutoSuggestionPickerLarge, + isComposerFocused, }) { const suggestionEmojiRef = useRef(null); const suggestionMentionRef = useRef(null); @@ -103,6 +104,7 @@ function Suggestions({ composerHeight, isAutoSuggestionPickerLarge, measureParentContainer, + isComposerFocused, }; return ( diff --git a/src/pages/home/report/ReportActionCompose/suggestionProps.js b/src/pages/home/report/ReportActionCompose/suggestionProps.js index 815a1c5619f5..62c29f3d418e 100644 --- a/src/pages/home/report/ReportActionCompose/suggestionProps.js +++ b/src/pages/home/report/ReportActionCompose/suggestionProps.js @@ -24,6 +24,9 @@ const baseProps = { /** Meaures the parent container's position and dimensions. */ measureParentContainer: PropTypes.func.isRequired, + + /** Report composer focus state */ + isComposerFocused: PropTypes.bool, }; const implementationBaseProps = {