toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-11-23 05:02:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: give content match a lower score (#4499)

Browse Source
This commit is contained in:
Peng Xiao 2023-09-26 11:15:40 +08:00 committed by GitHub
parent 1bdc402b7b
commit eb728f7ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/core/src/components/pure/cmdk/data.tsx
View File

@ -176,6 +176,8 @@ export const pageToCommand = (
};
};
const contentMatchedMagicString = '__$$content_matched$$__';
export const usePageCommands = () => {
// todo: considering collections for searching pages
// const { savedCollections } = useCollectionManager(currentCollectionsAtom);
@ -221,7 +223,7 @@ export const usePageCommands = () => {
if (pageIds.includes(page.id)) {
// hack to make the page always showing in the search result
command.value += query;
command.value += contentMatchedMagicString;
}
return command;
@ -372,11 +374,24 @@ export const useCMDKCommandGroups = () => {
export const customCommandFilter = (value: string, search: string) => {
// strip off the part between __>>> and <<<__
const label = value.replace(
let label = value.replace(
new RegExp(valueWrapperStart + '.*' + valueWrapperEnd, 'g'),
''
);
return commandScore(label, search);
const pageContentMatched = label.includes(contentMatchedMagicString);
if (pageContentMatched) {
label = label.replace(contentMatchedMagicString, '');
}
const originalScore = commandScore(label, search);
// if the command has matched the content but not the label,
// we should give it a higher score, but not too high
if (originalScore < 0.01 && pageContentMatched) {
return 0.3;
}
return originalScore;
};
export const useCommandFilteredStatus = (

4
packages/cmdk/src/index.tsx
View File

@ -365,8 +365,8 @@ const Command = React.forwardRef<HTMLDivElement, CommandProps>(
// Sort the items
getValidItems()
.sort((a, b) => {
const valueA = a.getAttribute(VALUE_ATTR);
const valueB = b.getAttribute(VALUE_ATTR);
const valueA = a.getAttribute('id');
const valueB = b.getAttribute('id');
return (scores.get(valueB) ?? 0) - (scores.get(valueA) ?? 0);
})
.forEach(item => {