Skip to content

refactor: optimize filterOptions to reduce allocations #4205

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

Open
TrevorBurnham wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: optimize filterOptions to reduce allocations #4205

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
16 changes: 7 additions & 9 deletions src/internal/components/option/utils/filter-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ type SearchableField = 'value' | 'label' | 'description' | 'labelTag';
type SearchableTagField = 'tags' | 'filteringTags';

const searchableFields: SearchableField[] = ['value', 'label', 'description', 'labelTag'];
const searchableTagFieldsStrict: SearchableTagField[] = ['tags'];
const searchableTagFieldsNonStrict: SearchableTagField[] = ['tags', 'filteringTags'];

export const matchesString = (value: string | undefined, searchText: string, strictMatching: boolean): boolean => {
if (!value) {
Expand All @@ -15,18 +17,13 @@ export const matchesString = (value: string | undefined, searchText: string, str
return strictMatching ? index === 0 : index > -1;
};

const matchesSingleOption = (dropdownOption: DropdownOption, text: string, strictMatching: boolean): boolean => {
const searchText = text.toLowerCase();

const matchesSingleOption = (dropdownOption: DropdownOption, searchText: string, strictMatching: boolean): boolean => {
const option: OptionDefinition = dropdownOption.option;
const searchStrFields = (attr: SearchableField) => matchesString(option[attr], searchText, strictMatching);
const searchTagsFields = (attr: SearchableTagField) =>
option[attr]?.some(value => matchesString(value, searchText, strictMatching));

const searchableTagFields: SearchableTagField[] = ['tags'];
if (!strictMatching) {
searchableTagFields.push('filteringTags');
}
const searchableTagFields = strictMatching ? searchableTagFieldsStrict : searchableTagFieldsNonStrict;

return searchableFields.some(searchStrFields) || searchableTagFields.some(searchTagsFields);
};
Expand All @@ -40,13 +37,14 @@ export const filterOptions = (
return options;
}

const normalizedSearchText = searchText.toLowerCase();
let currentGroup: DropdownOption | null = null;
let parentMatched = false;
return options.reduce<DropdownOption[]>((acc, option) => {
if (option.type === 'parent') {
parentMatched = false;
currentGroup = option;
if (matchesSingleOption(option, searchText, strictMatching)) {
if (matchesSingleOption(option, normalizedSearchText, strictMatching)) {
parentMatched = true;
acc.push(currentGroup);
}
Expand All @@ -58,7 +56,7 @@ export const filterOptions = (
}
if (parentMatched) {
acc.push(option);
} else if (matchesSingleOption(option, searchText, strictMatching)) {
} else if (matchesSingleOption(option, normalizedSearchText, strictMatching)) {
if (currentGroup) {
acc.push(currentGroup);
currentGroup = null;
Expand Down