Skip to content

Fix quicklinks search: treat "&" and multilingual "and" equivalents as the same token #425

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
digitalby wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix quicklinks search: treat "&" and multilingual "and" equivalents as the same token #425

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
21 changes: 16 additions & 5 deletions app/(navigation)/quicklinks/[[...slug]]/quicklinks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ import { toast } from "@/components/toast";
import { Input, InputSlot } from "@/components/input";
import { getRaycastFlavor } from "@/app/RaycastFlavor";

const AND_TOKENS = new Set(["&", "and", "adn", "und", "oraz", "и", "e", "i"]);

function normalizeSearch(str: string): string {
return str
.toLowerCase()
.split(/\s+/)
.map((token) => (AND_TOKENS.has(token) ? "&" : token))
.join(" ")
.trim();
}

export function Quicklinks() {
const [enableViewObserver, setEnableViewObserver] = React.useState(false);
useSectionInViewObserver({ headerHeight: 50, enabled: enableViewObserver });
Expand Down Expand Up @@ -88,7 +99,7 @@ export function Quicklinks() {
};

const filteredQuicklinks = categories.flatMap((category) => {
return category.quicklinks.filter((quicklink) => quicklink.name.toLowerCase().includes(search.toLowerCase()));
return category.quicklinks.filter((quicklink) => normalizeSearch(quicklink.name).includes(normalizeSearch(search)));
});

const [selectedQuicklinkIds, setSelectedQuicklinkIds] = React.useState<string[]>([]);
Expand Down Expand Up @@ -217,7 +228,7 @@ export function Quicklinks() {

const filteredCategories = categories.filter((c) => {
if (!search) return true;
return c.quicklinks.some((q) => q.name.toLowerCase().includes(search.toLowerCase()));
return c.quicklinks.some((q) => normalizeSearch(q.name).includes(normalizeSearch(search)));
});

return (
Expand Down Expand Up @@ -296,7 +307,7 @@ export function Quicklinks() {
const categoryWithFilteredQuicklinks = {
...category,
quicklinks: category.quicklinks.filter((q) =>
q.name.toLowerCase().includes(search.toLowerCase()),
normalizeSearch(q.name).includes(normalizeSearch(search)),
),
};

Expand Down Expand Up @@ -382,7 +393,7 @@ export function Quicklinks() {
{categories
.filter((c) => {
if (!search) return true;
return c.quicklinks.some((q) => q.name.toLowerCase().includes(search.toLowerCase()));
return c.quicklinks.some((q) => normalizeSearch(q.name).includes(normalizeSearch(search)));
})
.map((category) => {
return (
Expand All @@ -401,7 +412,7 @@ export function Quicklinks() {
{category.quicklinks
.filter((q) => {
if (!search) return true;
return q.name.toLowerCase().includes(search.toLowerCase());
return normalizeSearch(q.name).includes(normalizeSearch(search));
})
.map((quicklink, index) => {
const isSelected = selectedQuicklinkIds.includes(quicklink.id);
Expand Down