reset emoji index, fix crash

Expensify · Aug 15, 2023 · e209754 · e209754
1 parent 8554863
commit e209754
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -301,7 +301,7 @@ function ReportActionCompose({
     const isEmojiSuggestionsMenuVisible = !_.isEmpty(suggestionValues.suggestedEmojis) && suggestionValues.shouldShowEmojiSuggestionMenu;
     const isMentionSuggestionsMenuVisible = !_.isEmpty(suggestionValues.suggestedMentions) && suggestionValues.shouldShowMentionSuggestionMenu;
 
-    const [highlightedEmojiIndex] = useArrowKeyFocusManager({
+    const [highlightedEmojiIndex, setHighlightedEmojiIndex] = useArrowKeyFocusManager({
         isActive: isEmojiSuggestionsMenuVisible,
         maxIndex: getMaxArrowIndex(suggestionValues.suggestedEmojis.length, suggestionValues.isAutoSuggestionPickerLarge),
         shouldExcludeTextAreaNodes: false,
@@ -532,8 +532,9 @@ function ReportActionCompose({
             }
 
             setSuggestionValues((prevState) => ({...prevState, ...nextState}));
+            setHighlightedEmojiIndex(0);
         },
-        [value, windowHeight, isSmallScreenWidth, preferredLocale, composerHeight],
+        [value, windowHeight, composerHeight, isSmallScreenWidth, preferredLocale, setHighlightedEmojiIndex],
     );
 
     const getMentionOptions = useCallback(