Skip to content

[pull] master from monkeytypegame:master #768

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

Merged
pull merged 4 commits into from
Jan 15, 2026
Merged

[pull] master from monkeytypegame:master #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8e25a5
chore: explicitly define formatter
Miodec Jan 15, 2026
ea3a545
fix(tags): Update tags after deletion (@Leonabcd123) (#7338)
Leonabcd123 Jan 15, 2026
a6cd53c
refactor(modals): remove jquery in ts/modals (@fcasibu) (#7292)
fcasibu Jan 15, 2026
9896c18
refactor: move event handlers from simple-modals to respective files …
biplavbarua Jan 15, 2026
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
9 changes: 9 additions & 0 deletions frontend/src/ts/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,15 @@ export async function saveLocalTagPB<M extends Mode>(
return;
}

export function deleteLocalTag(tagId: string): void {
getSnapshot()?.results?.forEach((result) => {
const tagIndex = result.tags.indexOf(tagId);
if (tagIndex > -1) {
result.tags.splice(tagIndex, 1);
}
});
}

export async function updateLocalTagPB<M extends Mode>(
tagId: string,
mode: M,
Expand Down
30 changes: 21 additions & 9 deletions frontend/src/ts/modals/custom-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,14 @@ export async function show(showOptions?: ShowOptions): Promise<void> {
}

function applyPreset(): void {
const presetName = $("#customGeneratorModal .presetInput").val() as string;
const modalEl = modal.getModal();
const presetName = modalEl.qs<HTMLSelectElement>(".presetInput")?.getValue();

if (presetName !== undefined && presetName !== "" && presets[presetName]) {
const preset = presets[presetName];
$("#customGeneratorModal .characterInput").val(preset.characters.join(" "));
modalEl
.qsr<HTMLInputElement>(".characterInput")
.setValue(preset.characters.join(" "));
}
}

Expand All @@ -106,17 +110,25 @@ function hide(hideOptions?: HideOptions<OutgoingData>): void {
}

function generateWords(): string[] {
const characterInput = $(
"#customGeneratorModal .characterInput",
).val() as string;
const modalEl = modal.getModal();
const characterInput = modalEl
.qs<HTMLInputElement>(".characterInput")
?.getValue();

const minLength =
parseInt($("#customGeneratorModal .minLengthInput").val() as string) || 2;
parseInt(
modalEl.qs<HTMLInputElement>(".minLengthInput")?.getValue() as string,
) || 2;
const maxLength =
parseInt($("#customGeneratorModal .maxLengthInput").val() as string) || 5;
parseInt(
modalEl.qs<HTMLInputElement>(".maxLengthInput")?.getValue() as string,
) || 5;
const wordCount =
parseInt($("#customGeneratorModal .wordCountInput").val() as string) || 100;
parseInt(
modalEl.qs<HTMLInputElement>(".wordCountInput")?.getValue() as string,
) || 100;

if (!characterInput || characterInput.trim() === "") {
if (characterInput === undefined || characterInput.trim() === "") {
Notifications.add("Character set cannot be empty", 0);
return [];
}
Expand Down
9 changes: 6 additions & 3 deletions frontend/src/ts/modals/custom-test-duration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ function format(duration: number): string {
}

function previewDuration(): void {
const input = $("#customTestDurationModal input").val() as string;
const modalEl = modal.getModal();
const input = modalEl.qsr<HTMLInputElement>("input").getValue() as string;
const duration = parseInput(input);
let formattedDuration = "";

Expand All @@ -66,7 +67,7 @@ function previewDuration(): void {
formattedDuration = format(duration);
}

$("#customTestDurationModal .preview").text(formattedDuration);
modalEl.qs(".preview")?.setText(formattedDuration);
}

export function show(showOptions?: ShowOptions): void {
Expand All @@ -87,7 +88,9 @@ function hide(clearChain = false): void {
}

function apply(): void {
const val = parseInput($("#customTestDurationModal input").val() as string);
const val = parseInput(
modal.getModal().qsr<HTMLInputElement>("input").getValue() as string,
);

if (val !== null && !isNaN(val) && val >= 0 && isFinite(val)) {
setConfig("time", val);
Expand Down
201 changes: 106 additions & 95 deletions frontend/src/ts/modals/custom-text.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ElementWithUtils } from "../utils/dom";
import * as CustomText from "../test/custom-text";
import * as CustomTextState from "../states/custom-text-name";
import * as ManualRestart from "../test/manual-restart-tracker";
Expand All @@ -14,8 +13,7 @@ import * as SavedTextsPopup from "./saved-texts";
import * as SaveCustomTextPopup from "./save-custom-text";
import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
import { CustomTextMode } from "@monkeytype/schemas/util";

const popup = "#customTextModal .modal";
import { qs, ElementWithUtils } from "../utils/dom";

type State = {
textarea: string;
Expand Down Expand Up @@ -55,114 +53,127 @@ const state: State = {
};

function updateUI(): void {
$(`${popup} .inputs .group[data-id="mode"] button`).removeClass("active");
$(
`${popup} .inputs .group[data-id="mode"] button[value="${state.customTextMode}"]`,
).addClass("active");

$(`${popup} .inputs .group[data-id="limit"] input.words`).addClass("hidden");
$(`${popup} .inputs .group[data-id="limit"] input.sections`).addClass(
"hidden",
);

$(`${popup} .inputs .group[data-id="limit"] input.words`).val(
state.customTextLimits.word,
);
$(`${popup} .inputs .group[data-id="limit"] input.time`).val(
state.customTextLimits.time,
);
$(`${popup} .inputs .group[data-id="limit"] input.sections`).val(
state.customTextLimits.section,
);
const modalEl = modal.getModal();
modalEl.qsa(`.inputs .group[data-id="mode"] button`)?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="mode"] button[value="${state.customTextMode}"]`,
)
?.addClass("active");

modalEl.qs(`.inputs .group[data-id="limit"] input.words`)?.hide();
modalEl.qs(`.inputs .group[data-id="limit"] input.sections`)?.hide();

modalEl
.qs<HTMLInputElement>(`.inputs .group[data-id="limit"] input.words`)
?.setValue(state.customTextLimits.word);
modalEl
.qs<HTMLInputElement>(`.inputs .group[data-id="limit"] input.time`)
?.setValue(state.customTextLimits.time);
modalEl
.qs<HTMLInputElement>(`.inputs .group[data-id="limit"] input.sections`)
?.setValue(state.customTextLimits.section);
if (state.customTextLimits.word !== "") {
$(`${popup} .inputs .group[data-id="limit"] input.words`).removeClass(
"hidden",
);
modalEl.qs(`.inputs .group[data-id="limit"] input.words`)?.show();
}
if (state.customTextLimits.section !== "") {
$(`${popup} .inputs .group[data-id="limit"] input.sections`).removeClass(
"hidden",
);
modalEl.qs(`.inputs .group[data-id="limit"] input.sections`)?.show();
}

if (state.customTextPipeDelimiter) {
$(`${popup} .inputs .group[data-id="limit"] input.sections`).removeClass(
"hidden",
);
$(`${popup} .inputs .group[data-id="limit"] input.words`).addClass(
"hidden",
);
modalEl.qs(`.inputs .group[data-id="limit"] input.sections`)?.show();
modalEl.qs(`.inputs .group[data-id="limit"] input.words`)?.hide();
} else {
$(`${popup} .inputs .group[data-id="limit"] input.words`).removeClass(
"hidden",
);
$(`${popup} .inputs .group[data-id="limit"] input.sections`).addClass(
"hidden",
);
modalEl.qs(`.inputs .group[data-id="limit"] input.words`)?.show();
modalEl.qs(`.inputs .group[data-id="limit"] input.sections`)?.hide();
}

if (state.customTextMode === "simple") {
$(`${popup} .inputs .group[data-id="limit"]`).addClass("disabled");
$(`${popup} .inputs .group[data-id="limit"] input`).val("");
$(`${popup} .inputs .group[data-id="limit"] input`).prop("disabled", true);
modalEl.qs(`.inputs .group[data-id="limit"]`)?.addClass("disabled");
modalEl
.qsa<HTMLInputElement>(`.inputs .group[data-id="limit"] input`)
?.setValue("");
modalEl.qsa(`.inputs .group[data-id="limit"] input`)?.disable();
} else {
$(`${popup} .inputs .group[data-id="limit"]`).removeClass("disabled");
$(`${popup} .inputs .group[data-id="limit"] input`).prop("disabled", false);
modalEl.qs(`.inputs .group[data-id="limit"]`)?.removeClass("disabled");
modalEl.qsa(`.inputs .group[data-id="limit"] input`)?.enable();
}

$(`${popup} .inputs .group[data-id="fancy"] button`).removeClass("active");
$(
`${popup} .inputs .group[data-id="fancy"] button[value="${state.removeFancyTypographyEnabled}"]`,
).addClass("active");

$(`${popup} .inputs .group[data-id="control"] button`).removeClass("active");
$(
`${popup} .inputs .group[data-id="control"] button[value="${state.replaceControlCharactersEnabled}"]`,
).addClass("active");

$(`${popup} .inputs .group[data-id="zeroWidth"] button`).removeClass(
"active",
);
$(
`${popup} .inputs .group[data-id="zeroWidth"] button[value="${state.removeZeroWidthCharactersEnabled}"]`,
).addClass("active");

$(`${popup} .inputs .group[data-id="delimiter"] button`).removeClass(
"active",
);
$(
`${popup} .inputs .group[data-id="delimiter"] button[value="${state.customTextPipeDelimiter}"]`,
).addClass("active");

$(`${popup} .inputs .group[data-id="newlines"] button`).removeClass("active");
$(
`${popup} .inputs .group[data-id="newlines"] button[value="${state.replaceNewlines}"]`,
).addClass("active");

$(`${popup} textarea`).val(state.textarea);
modalEl.qsa(`.inputs .group[data-id="fancy"] button`)?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="fancy"] button[value="${state.removeFancyTypographyEnabled}"]`,
)
?.addClass("active");

modalEl
.qsa(`.inputs .group[data-id="control"] button`)
?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="control"] button[value="${state.replaceControlCharactersEnabled}"]`,
)
?.addClass("active");

modalEl
.qsa(`.inputs .group[data-id="zeroWidth"] button`)
?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="zeroWidth"] button[value="${state.removeZeroWidthCharactersEnabled}"]`,
)
?.addClass("active");

modalEl
.qsa(`.inputs .group[data-id="delimiter"] button`)
?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="delimiter"] button[value="${state.customTextPipeDelimiter}"]`,
)
?.addClass("active");

modalEl
.qsa(`.inputs .group[data-id="newlines"] button`)
?.removeClass("active");
modalEl
.qs(
`.inputs .group[data-id="newlines"] button[value="${state.replaceNewlines}"]`,
)
?.addClass("active");

modalEl.qs<HTMLTextAreaElement>(`textarea`)?.setValue(state.textarea);

if (state.longCustomTextWarning) {
$(`${popup} .longCustomTextWarning`).removeClass("hidden");
$(`${popup} .randomWordsCheckbox input`).prop("checked", false);
$(`${popup} .delimiterCheck input`).prop("checked", false);
$(`${popup} .typographyCheck`).prop("checked", true);
$(`${popup} .replaceNewlineWithSpace input`).prop("checked", false);
$(`${popup} .inputs`).addClass("disabled");
modalEl.qs(`.longCustomTextWarning`)?.show();
modalEl
.qs<HTMLInputElement>(`.randomWordsCheckbox input`)
?.setChecked(false);
modalEl.qs<HTMLInputElement>(`.delimiterCheck input`)?.setChecked(false);
modalEl.qs<HTMLInputElement>(`.typographyCheck`)?.setChecked(true);
modalEl
.qs<HTMLInputElement>(`.replaceNewlineWithSpace input`)
?.setChecked(false);
modalEl.qs(`.inputs`)?.addClass("disabled");
} else {
$(`${popup} .longCustomTextWarning`).addClass("hidden");
$(`${popup} .inputs`).removeClass("disabled");
modalEl.qs(`.longCustomTextWarning`)?.hide();
modalEl.qs(`.inputs`)?.removeClass("disabled");
}

if (state.challengeWarning) {
$(`${popup} .challengeWarning`).removeClass("hidden");
$(`${popup} .randomWordsCheckbox input`).prop("checked", false);
$(`${popup} .delimiterCheck input`).prop("checked", false);
$(`${popup} .typographyCheck`).prop("checked", true);
$(`${popup} .replaceNewlineWithSpace input`).prop("checked", false);
$(`${popup} .inputs`).addClass("disabled");
modalEl.qs(`.challengeWarning`)?.show();
modalEl
.qs<HTMLInputElement>(`.randomWordsCheckbox input`)
?.setChecked(false);
modalEl.qs<HTMLInputElement>(`.delimiterCheck input`)?.setChecked(false);
modalEl.qs<HTMLInputElement>(`.typographyCheck`)?.setChecked(true);
modalEl
.qs<HTMLInputElement>(`.replaceNewlineWithSpace input`)
?.setChecked(false);
modalEl.qs(`.inputs`)?.addClass("disabled");
} else {
$(`${popup} .challengeWarning`).addClass("hidden");
$(`${popup} .inputs`).removeClass("disabled");
modalEl.qs(`.challengeWarning`)?.hide();
modalEl.qs(`.inputs`)?.removeClass("disabled");
}
}

Expand Down Expand Up @@ -219,7 +230,7 @@ async function beforeAnimation(

async function afterAnimation(): Promise<void> {
if (!state.challengeWarning && !state.longCustomTextWarning) {
$(`${popup} textarea`).trigger("focus");
modal.getModal().qs(`textarea`)?.focus();
}
}

Expand All @@ -239,7 +250,7 @@ function hide(): void {
}

function handleFileOpen(): void {
const file = ($(`#fileInput`)[0] as HTMLInputElement).files?.[0];
const file = qs<HTMLInputElement>("#fileInput")?.native.files?.[0];
if (file) {
if (file.type !== "text/plain") {
Notifications.add("File is not a text file", -1, {
Expand All @@ -255,7 +266,7 @@ function handleFileOpen(): void {
const content = readerEvent.target?.result as string;
state.textarea = content;
updateUI();
$(`#fileInput`).val("");
qs<HTMLInputElement>(`#fileInput`)?.setValue("");
};
reader.onerror = (): void => {
Notifications.add("Failed to read file", -1, {
Expand Down Expand Up @@ -522,7 +533,7 @@ async function setup(modalEl: ElementWithUtils): Promise<void> {
return;
}
if (e.code === "Enter" && e.ctrlKey) {
$(`${popup} .button.apply`).trigger("click");
modal.getModal().qs(`.button.apply`)?.dispatch("click");
}
if (
CustomTextState.isCustomTextLong() &&
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ts/modals/dev-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { toggleUserFakeChartData } from "../test/result";
import { toggleCaretDebug } from "../utils/caret";
import { getInputElement } from "../input/input-element";
import { disableSlowTimerFail } from "../test/test-timer";
import { ElementWithUtils } from "../utils/dom";
import { ElementWithUtils, qsr } from "../utils/dom";

let mediaQueryDebugLevel = 0;

Expand Down Expand Up @@ -102,7 +102,7 @@ const modal = new AnimatedModal({
});

export function appendButton(): void {
$("body").prepend(
qsr("body").prependHtml(
`
<div id="devButtons">
<a class='button configureAPI' href='${envConfig.backendUrl}/configure/' target='_blank' aria-label="Configure API" data-balloon-pos="right"><i class="fas fa-fw fa-server"></i></a>
Expand Down
Loading
Loading