Skip to content

perf(web): validate monospace fonts when selected #15642

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
maria-rcks wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

perf(web): validate monospace fonts when selected #15642

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
15 changes: 13 additions & 2 deletions apps/web/src/components/settings/FontFamilyPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ComboboxTrigger,
} from "../ui/combobox";
import { SelectButton } from "../ui/select";
import { stackedThreadToast, toastManager } from "../ui/toast";

const DEFAULT_FONT_VALUE = "__default__";

Expand Down Expand Up @@ -141,8 +142,8 @@ export function FontFamilyPicker({

const families = useMemo(() => {
if (enumeration.status !== "granted") return [];
return requireMonospace ? enumeration.families.filter(isMonospaceFamily) : enumeration.families;
}, [enumeration, requireMonospace]);
return enumeration.families;
}, [enumeration]);

const items = useMemo(() => {
const trimmedQuery = query.trim().toLowerCase();
Expand All @@ -160,6 +161,16 @@ export function FontFamilyPicker({

const handlePick = (value: string) => {
setOpen(false);
if (value !== DEFAULT_FONT_VALUE && requireMonospace && !isMonospaceFamily(value)) {
toastManager.add(
stackedThreadToast({
type: "error",
title: `"${value}" isn't monospace`,
description: "Code and terminal need a fixed-width font, so the current font was kept.",
}),
);
return;
}
onSelect(value === DEFAULT_FONT_VALUE ? "" : value);
};

Expand Down
Loading