Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 2.3k
optimize dropdown search#3768
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.
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
optimize dropdown search #3768
Changes from all commits
7cf893999a1a2a2d24fb8fe470f1bb900e3c0da665File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -23,6 +23,7 @@ export interface SanitizedOptions { | ||
| options: DetailedOption[]; | ||
| indexes: string[]; | ||
| valueSet: Set<OptionValue>; | ||
| search: Search; | ||
| } | ||
| // Single-pass sanitization via sanitizeOptions, plus detection of | ||
| @@ -55,38 +56,48 @@ export function sanitizeDropdownOptions( | ||
| indexes.push('search'); | ||
| } | ||
| return {options: sanitized, indexes, valueSet}; | ||
| } | ||
| export function filterOptions( | ||
| options: SanitizedOptions, | ||
| searchValue?: string, | ||
| search_order?: 'index' | 'original' | ||
| ): DetailedOption[] { | ||
| if (!searchValue) { | ||
| return options.options; | ||
| } | ||
| // Build the search index ONCE during sanitization | ||
| const search = new Search('value'); | ||
| search.searchIndex = new UnorderedSearchIndex(); | ||
| search.indexStrategy = new AllSubstringsIndexStrategy(); | ||
| search.tokenizer = TOKENIZER; | ||
| options.indexes.forEach(index => { | ||
| indexes.forEach(index => { | ||
| search.addIndex(index); | ||
| }); | ||
| if (options.options.length > 0) { | ||
| search.addDocuments(options.options); | ||
| if (sanitized.length > 0) { | ||
| search.addDocuments(sanitized); | ||
| } | ||
| return { | ||
| options: sanitized, | ||
| indexes, | ||
| valueSet, | ||
| search, | ||
| }; | ||
| } | ||
| export function filterOptions( | ||
| options: SanitizedOptions, | ||
| searchValue?: DropdownProps['search_value'], | ||
| searchOrder?: DropdownProps['search_order'] | ||
| ): DetailedOption[] { | ||
| if (!searchValue) { | ||
| return options.options; | ||
| } | ||
| const searchResults = | ||
| (search.search(searchValue) as DetailedOption[]) || []; | ||
| const results = | ||
| (options.search.search(searchValue) as DetailedOption[]) || []; | ||
| if (search_order === 'original') { | ||
| const resultSet = new Set(searchResults); | ||
| return options.options.filter(option => resultSet.has(option)); | ||
| // Preserve original option order | ||
| if (searchOrder === 'original') { | ||
| const resultSet = new Set(results.map(option => option.value)); | ||
Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do you use CollaboratorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The | ||
| return options.options.filter(option => | ||
| resultSet.has(option.value) | ||
| ); | ||
| } | ||
| return searchResults; | ||
| return results; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
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.
Does it matter if the index include here is the same as the
uidFieldNamepassed into the constructor? I ask becauseindexesalways contains'value'and that's the same as theuidFieldNameused in the constructor.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.
'value' in the constructor is only used as the document uid field in js-search. It is not automatically indexed for searching, so we still need search.addIndex('value') here.
This is unchanged from previous version (old line 75-77)