diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 13fbda2c4812..799754aad9c7 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1632,6 +1632,7 @@ const CONST = { TRIE_INITIALIZATION: 'trie_initialization', COMMENT_LENGTH_DEBOUNCE_TIME: 1500, SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300, + MENTION_SUGGESTION_DEBOUNCE_TIME: 100, RESIZE_DEBOUNCE_TIME: 100, UNREAD_UPDATE_DEBOUNCE_TIME: 300, SEARCH_FILTER_OPTIONS: 'search_filter_options', diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx index f1ddbe81897d..9b243eac6f7e 100644 --- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx +++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx @@ -3,7 +3,6 @@ import lodashMapValues from 'lodash/mapValues'; import lodashSortBy from 'lodash/sortBy'; import React, {useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react'; import type {OnyxCollection} from 'react-native-onyx'; -import * as Expensicons from '@components/Icon/Expensicons'; import type {Mention} from '@components/MentionSuggestions'; import MentionSuggestions from '@components/MentionSuggestions'; import {usePersonalDetails} from '@components/OnyxListItemProvider'; @@ -11,6 +10,7 @@ import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager'; import useCurrentReportID from '@hooks/useCurrentReportID'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useDebounce from '@hooks/useDebounce'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; @@ -81,6 +81,8 @@ function SuggestionMention({ const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const isMentionSuggestionsMenuVisible = !!suggestionValues.suggestedMentions.length && suggestionValues.shouldShowSuggestionMenu; + const expensifyIcons = useMemoizedLazyExpensifyIcons(['Megaphone', 'FallbackAvatar'] as const); + const currentReportID = useCurrentReportID(); const currentReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${currentReportID?.currentReportID}`]; // Smaller weight means higher order in suggestion list @@ -270,7 +272,7 @@ function SuggestionMention({ alternateText: translate('mentionSuggestions.hereAlternateText'), icons: [ { - source: Expensicons.Megaphone, + source: expensifyIcons.Megaphone, type: CONST.ICON_TYPE_AVATAR, }, ], @@ -321,7 +323,7 @@ function SuggestionMention({ icons: [ { name: detail?.login, - source: detail?.avatar ?? Expensicons.FallbackAvatar, + source: detail?.avatar ?? expensifyIcons.FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, fallbackIcon: detail?.fallbackIcon, id: detail?.accountID, @@ -332,7 +334,7 @@ function SuggestionMention({ return suggestions; }, - [translate, formatPhoneNumber, formatLoginPrivateDomain, localeCompare], + [localeCompare, translate, expensifyIcons.Megaphone, expensifyIcons.FallbackAvatar, formatPhoneNumber, formatLoginPrivateDomain], ); const getRoomMentionOptions = useCallback( @@ -429,9 +431,19 @@ function SuggestionMention({ [isComposerFocused, isGroupPolicyReport, setHighlightedMentionIndex, resetSuggestions, getUserMentionOptions, weightedPersonalDetails, getRoomMentionOptions, reports], ); + const debouncedCalculateMentionSuggestion = useDebounce( + useCallback( + (newValue: string, selectionStart?: number, selectionEnd?: number) => { + calculateMentionSuggestion(newValue, selectionStart, selectionEnd); + }, + [calculateMentionSuggestion], + ), + CONST.TIMING.MENTION_SUGGESTION_DEBOUNCE_TIME, + ); + useEffect(() => { - calculateMentionSuggestion(value, selection.start, selection.end); - }, [value, selection, calculateMentionSuggestion]); + debouncedCalculateMentionSuggestion(value, selection.start, selection.end); + }, [value, selection.start, selection.end, debouncedCalculateMentionSuggestion]); useEffect(() => { debouncedSearchInServer();