Refactor searchMatchUtils out from optionsListUtils #86982
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| import {translateLocal} from '@libs/Localize'; | ||
| import CONST from '@src/CONST'; | ||
| import type {SearchOptionData} from './types'; | ||
|
|
||
| type SearchMatchConfig = { | ||
| /** Use toLocaleLowerCase() instead of toLowerCase(). Default: false */ | ||
| useLocaleLowerCase?: boolean; | ||
|
|
||
| /** | ||
| * Optional callback to transform the concatenated search terms before matching. | ||
| * Receives the joined terms string (already lowercased). | ||
| * Return the final string to match against. | ||
| */ | ||
| transformSearchText?: (concatenatedSearchTerms: string) => string; | ||
| }; | ||
|
|
||
| function getCurrentUserSearchTerms(item: Partial<SearchOptionData>) { | ||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| return [item.text ?? item.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? '', translateLocal('common.you'), translateLocal('common.me')]; | ||
| } | ||
|
|
||
| function getPersonalDetailSearchTerms(item: Partial<SearchOptionData>, currentUserAccountID: number) { | ||
| if (item.accountID === currentUserAccountID) { | ||
| return getCurrentUserSearchTerms(item); | ||
| } | ||
| return [item.participantsList?.[0]?.displayName ?? item.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? '']; | ||
| } | ||
|
|
||
| /** | ||
| * Checks whether a personal detail option matches a single search term | ||
| * by comparing against the option's searchable fields (displayName, login, etc.). | ||
| * | ||
| * Expects `searchTerm` to already be lowercased and trimmed. | ||
| */ | ||
| function isPersonalDetailMatchingSearchTerm( | ||
| item: Partial<SearchOptionData>, | ||
| currentUserAccountID: number, | ||
| searchTerm: string, | ||
| {useLocaleLowerCase = false, transformSearchText}: SearchMatchConfig = {}, | ||
| ): boolean { | ||
| const terms = getPersonalDetailSearchTerms(item, currentUserAccountID).join(' '); | ||
| let searchText = useLocaleLowerCase ? terms.toLocaleLowerCase() : terms.toLowerCase(); | ||
|
|
||
| if (transformSearchText) { | ||
| searchText = transformSearchText(searchText); | ||
| } | ||
|
|
||
| return searchText.includes(searchTerm); | ||
| } | ||
|
|
||
| export {getCurrentUserSearchTerms, getPersonalDetailSearchTerms, isPersonalDetailMatchingSearchTerm}; | ||
| export type {SearchMatchConfig}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This callback appends
personalDetail.textafterisPersonalDetailMatchingSearchTerm()has already lowercased the base terms, so any uppercase characters inpersonalDetail.textare now matched case-sensitively. Before this refactor, the whole concatenated string (terms + text) was lowercased first, so lowercase queries would still match. In cases where the relevant token exists only intext(not inparticipantsList/displayName/login), search can now miss valid results.Useful? React with 👍 / 👎.