Skip to content

Revert "Merge pull request from Krishna2323/krishna2323/issue/60804" - Fix room name mentions #61964

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

Merged
francoisl merged 1 commit into from
May 13, 2025
Merged

Revert "Merge pull request from Krishna2323/krishna2323/issue/60804" - Fix room name mentions #61964

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
26 changes: 13 additions & 13 deletions src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function SuggestionMention(
// eslint-disable-next-line react-compiler/react-compiler
suggestionValuesRef.current = suggestionValues;

const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: false});
const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);

const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const isMentionSuggestionsMenuVisible = !!suggestionValues.suggestedMentions.length && suggestionValues.shouldShowSuggestionMenu;
Expand Down Expand Up @@ -190,15 +190,6 @@ function SuggestionMention(
[formatLoginPrivateDomain],
);

function getOriginalMentionText(inputValue: string, atSignIndex: number) {
const rest = inputValue.slice(atSignIndex);

const breakerIndex = rest.search(CONST.REGEX.MENTION_BREAKER);

// If no breaker is found, return the entire rest of the string
return breakerIndex === -1 ? rest : rest.slice(0, breakerIndex);
}

/**
* Replace the code of mention and update selection
*/
Expand All @@ -210,8 +201,8 @@ function SuggestionMention(
return;
}
const mentionCode = getMentionCode(mentionObject, suggestionValues.prefixType);
const originalMention = getOriginalMentionText(value, suggestionValues.atSignIndex);
const commentAfterMention = value.slice(suggestionValues.atSignIndex + originalMention.length);
const commentAfterMention = value.slice(suggestionValues.atSignIndex + suggestionValues.mentionPrefix.length + 1);

updateComment(`${commentBeforeAtSign}${mentionCode} ${trimLeadingSpace(commentAfterMention)}`, true);
const selectionPosition = suggestionValues.atSignIndex + mentionCode.length + CONST.SPACE_LENGTH;
setSelection({
Expand All @@ -225,7 +216,16 @@ function SuggestionMention(
shouldShowSuggestionMenu: false,
}));
},
[value, suggestionValues.atSignIndex, suggestionValues.suggestedMentions, suggestionValues.prefixType, getMentionCode, updateComment, setSelection],
[
value,
suggestionValues.atSignIndex,
suggestionValues.suggestedMentions,
suggestionValues.prefixType,
suggestionValues.mentionPrefix.length,
getMentionCode,
updateComment,
setSelection,
],
);

/**
Expand Down