Skip to content

fix(custom-font): make schema used in modal stricter (@Leonabcd123) #8131

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
Leonabcd123 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −4
Open

fix(custom-font): make schema used in modal stricter (@Leonabcd123) #8131

Show file tree
Hide file tree
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
11 changes: 8 additions & 3 deletions frontend/src/ts/commandline/lists/font-family.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Command } from "../types";
import { FontNameSchema } from "@monkeytype/schemas/fonts";
import { Command, withValidation } from "../types";
import { buildCommandForConfigKey } from "../util";
import FileStorage from "../../utils/file-storage";

import { showNoticeNotification } from "../../states/notifications";
import { Config } from "../../config/store";
import { setConfig } from "../../config/setters";
import { applyFontFamily } from "../../ui";

const fromMeta = buildCommandForConfigKey("fontFamily");

if (fromMeta.subgroup) {
Expand All @@ -17,12 +19,15 @@ if (fromMeta.subgroup) {
subgroup: {
title: "Custom font...",
list: [
{
withValidation({
id: "customFontName",
display: "Custom name...",
icon: "fa-font",
alias: "custom font name",
input: true,
validation: {
schema: FontNameSchema,
},
defaultValue: (): string => {
return Config.fontFamily.replace(/_/g, " ");
},
Expand All @@ -31,7 +36,7 @@ if (fromMeta.subgroup) {
const fontName = input.replaceAll(/ /g, "_");
setConfig("fontFamily", fontName);
},
},
}),
{
id: "customLocalFont",
display: "Local font...",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/ts/components/pages/settings/custom-setting/FontFamily.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ConfigSchema } from "@monkeytype/schemas/configs";
import { FontNameSchema } from "@monkeytype/schemas/fonts";
import { createResource, For, JSXElement, Show } from "solid-js";
import { z } from "zod";

Expand Down Expand Up @@ -170,7 +171,7 @@ export function FontFamily(): JSXElement {
text: "Make sure you have the font installed on your computer before applying",
buttonText: "apply",
schema: z.object({
fontName: z.string(),
fontName: FontNameSchema,
}),
inputs: {
fontName: {
Expand Down
Loading