Skip to content
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

Mention search with last name #31435

Merged
merged 11 commits into from
Nov 28, 2023
Merged

Mention search with last name #31435

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8f44f99
Merge pull request #1 from Expensify/main
graylewis Oct 12, 2023
6a66f0b
Merge pull request #2 from Expensify/main
graylewis Oct 14, 2023
38ea8a2
Merge pull request #3 from Expensify/main
graylewis Oct 20, 2023
7a560a4
Merge pull request #4 from Expensify/main
graylewis Oct 27, 2023
b62ba06
Merge pull request #5 from Expensify/main
graylewis Nov 2, 2023
2d578dd
Merge pull request #6 from Expensify/main
graylewis Nov 8, 2023
96893ad
WIP
graylewis Nov 8, 2023
26fb266
ready for PR
graylewis Nov 16, 2023
0573c6a
Update SuggestionMention.js
graylewis Nov 16, 2023
fa01cf2
linted
graylewis Nov 16, 2023
9433f5c
reverting changes to this file
graylewis Nov 20, 2023
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
6 changes: 3 additions & 3 deletions ios/Podfile.lock
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to commit this.

Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ PODS:
- libwebp/demux
- libwebp/webp (1.2.4)
- lottie-ios (4.3.3)
- lottie-react-native (6.3.1):
- lottie-ios (~> 4.3.0)
- lottie-react-native (6.4.0):
- lottie-ios (~> 4.3.3)
- React-Core
- MapboxCommon (23.6.0)
- MapboxCoreMaps (10.14.0):
Expand Down Expand Up @@ -1203,7 +1203,7 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
lottie-ios: 25e7b2675dad5c3ddad369ac9baab03560c5bfdd
lottie-react-native: c9f1db4f4124dcce9f8159e65d8dc6e8bcb11fb4
lottie-react-native: 3a3084faddd3891c276f23fd6e797b83f2021bbc
MapboxCommon: 4a0251dd470ee37e7fadda8e285c01921a5e1eb0
MapboxCoreMaps: eb07203bbb0b1509395db5ab89cd3ad6c2e3c04c
MapboxMaps: af50ec61a7eb3b032c3f7962c6bd671d93d2a209
Expand Down
22 changes: 18 additions & 4 deletions src/pages/home/report/ReportActionCompose/SuggestionMention.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,24 +198,38 @@ function SuggestionMention({
const leftString = value.substring(0, suggestionEndIndex);
const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);
const lastWord = _.last(words);
const secondToLastWord = words[words.length - 3];

let atSignIndex;
let suggestionWord;
let prefix;

// Detect if the last two words contain a mention (two words are needed to detect a mention with a space in it)
if (lastWord.startsWith('@')) {
atSignIndex = leftString.lastIndexOf(lastWord);
}
suggestionWord = lastWord;

prefix = suggestionWord.substring(1);
} else if (secondToLastWord && secondToLastWord.startsWith('@') && secondToLastWord.length > 1) {
atSignIndex = leftString.lastIndexOf(secondToLastWord);
suggestionWord = `${secondToLastWord} ${lastWord}`;

const prefix = lastWord.substring(1);
prefix = suggestionWord.substring(1);
} else {
prefix = lastWord.substring(1);
}

const nextState = {
suggestedMentions: [],
atSignIndex,
mentionPrefix: prefix,
};

const isCursorBeforeTheMention = valueAfterTheCursor.startsWith(lastWord);
const isCursorBeforeTheMention = valueAfterTheCursor.startsWith(suggestionWord);

if (!isCursorBeforeTheMention && isMentionCode(lastWord)) {
if (!isCursorBeforeTheMention && isMentionCode(suggestionWord)) {
const suggestions = getMentionOptions(personalDetails, prefix);

nextState.suggestedMentions = suggestions;
nextState.shouldShowSuggestionMenu = !_.isEmpty(suggestions);
}
Expand Down
Loading