Merge pull request #36792 from dukenv0307/fix/35518

jasperhuangg · web-flow · commit 64572e939c4c · 2024-02-20T13:08:51.000-08:00
fix: The list of users in mentions does not disappear when using the Shift+Enter
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.js b/src/pages/home/report/ReportActionCompose/SuggestionMention.js
@@ -203,7 +203,8 @@ function SuggestionMention({
                 suggestionEndIndex = indexOfFirstSpecialCharOrEmojiAfterTheCursor + selectionEnd;
             }
 
-            const leftString = value.substring(0, suggestionEndIndex);
+            const newLineIndex = value.lastIndexOf('\n', selectionEnd - 1);
+            const leftString = value.substring(newLineIndex + 1, suggestionEndIndex);
             const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);
             const lastWord = _.last(words);
             const secondToLastWord = words[words.length - 3];

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,8 @@ function SuggestionMention({`
`203`	`203`	`suggestionEndIndex = indexOfFirstSpecialCharOrEmojiAfterTheCursor + selectionEnd;`
`204`	`204`	`}`
`205`	`205`
`206`		`- const leftString = value.substring(0, suggestionEndIndex);`
	`206`	`+ const newLineIndex = value.lastIndexOf('\n', selectionEnd - 1);`
	`207`	`+ const leftString = value.substring(newLineIndex + 1, suggestionEndIndex);`
`207`	`208`	`const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);`
`208`	`209`	`const lastWord = _.last(words);`
`209`	`210`	`const secondToLastWord = words[words.length - 3];`