Skip to content

[pull] master from monkeytypegame:master #607

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
merged 2 commits into from
Aug 4, 2025
Merged

[pull] master from monkeytypegame:master #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7519931
fix: move time setting before mode
Miodec Aug 4, 2025
3f72e31
fix(test config): sometimes showing too many elements at once
Miodec Aug 4, 2025
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
2 changes: 1 addition & 1 deletion frontend/src/ts/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,10 +812,10 @@ const lastConfigsToApply: Set<keyof Config> = new Set([
"paceCaret",
"quoteLength", //quote length sets mode,
"words",
"time",
"mode", // mode sets punctuation and numbers
"numbers",
"punctuation",
"time",
"funbox",
]);

Expand Down
70 changes: 47 additions & 23 deletions frontend/src/ts/test/test-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export async function instantUpdate(): Promise<void> {
);

$("#testConfig .puncAndNum").addClass("hidden");
$("#testConfig .spacer").addClass("scrolled");
$("#testConfig .spacer").css("transition", "none").addClass("scrolled");
$("#testConfig .time").addClass("hidden");
$("#testConfig .wordCount").addClass("hidden");
$("#testConfig .customText").addClass("hidden");
Expand All @@ -36,34 +36,49 @@ export async function instantUpdate(): Promise<void> {
$("#testConfig .rightSpacer").removeClass("scrolled");
$("#testConfig .time").removeClass("hidden");

updateExtras("time", Config.time);
updateActiveExtraButtons("time", Config.time);
} else if (Config.mode === "words") {
$("#testConfig .puncAndNum").removeClass("hidden");
$("#testConfig .leftSpacer").removeClass("scrolled");
$("#testConfig .rightSpacer").removeClass("scrolled");
$("#testConfig .wordCount").removeClass("hidden");

updateExtras("words", Config.words);
updateActiveExtraButtons("words", Config.words);
} else if (Config.mode === "quote") {
$("#testConfig .rightSpacer").removeClass("scrolled");
$("#testConfig .quoteLength").removeClass("hidden");

updateExtras("quoteLength", Config.quoteLength);
updateActiveExtraButtons("quoteLength", Config.quoteLength);
} else if (Config.mode === "custom") {
$("#testConfig .puncAndNum").removeClass("hidden");
$("#testConfig .leftSpacer").removeClass("scrolled");
$("#testConfig .rightSpacer").removeClass("scrolled");
$("#testConfig .customText").removeClass("hidden");
}

updateExtras("numbers", Config.numbers);
updateExtras("punctuation", Config.punctuation);
updateActiveExtraButtons("numbers", Config.numbers);
updateActiveExtraButtons("punctuation", Config.punctuation);

setTimeout(() => {
$("#testConfig .spacer").css("transition", "");
}, 125);
}

export async function update(previous: Mode, current: Mode): Promise<void> {
async function update(previous: Mode, current: Mode): Promise<void> {
if (previous === current) return;
$("#testConfig .mode .textButton").removeClass("active");
$("#testConfig .mode .textButton[mode='" + current + "']").addClass("active");
updateActiveModeButtons(current);

let m2;

if (Config.mode === "time") {
m2 = Config.time;
} else if (Config.mode === "words") {
m2 = Config.words;
} else if (Config.mode === "quote") {
m2 = Config.quoteLength;
}

if (m2 !== undefined) updateActiveExtraButtons(Config.mode, m2);

const submenu = {
time: "time",
Expand Down Expand Up @@ -202,7 +217,12 @@ export async function update(previous: Mode, current: Mode): Promise<void> {
);
}

export function updateExtras(key: string, value: ConfigValue): void {
function updateActiveModeButtons(mode: Mode): void {
$("#testConfig .mode .textButton").removeClass("active");
$("#testConfig .mode .textButton[mode='" + mode + "']").addClass("active");
}

function updateActiveExtraButtons(key: string, value: ConfigValue): void {
if (key === "time") {
$("#testConfig .time .textButton").removeClass("active");
const timeCustom = ![15, 30, 60, 120].includes(value as number)
Expand Down Expand Up @@ -258,27 +278,31 @@ export function hideFavoriteQuoteLength(): void {
$("#testConfig .quoteLength .favorite").addClass("hidden");
}

let ignoreConfigEvent = false;

ConfigEvent.subscribe((eventKey, eventValue, _nosave, eventPreviousValue) => {
if (ActivePage.get() !== "test") return;
if (eventKey === "mode") {
void update(eventPreviousValue as Mode, eventValue as Mode);
if (eventKey === "fullConfigChange") {
ignoreConfigEvent = true;
}
if (eventKey === "fullConfigChangeFinished") {
ignoreConfigEvent = false;

let m2;
void instantUpdate();
}

if (Config.mode === "time") {
m2 = Config.time;
} else if (Config.mode === "words") {
m2 = Config.words;
} else if (Config.mode === "quote") {
m2 = Config.quoteLength;
}
// this is here to prevent calling set / preview multiple times during a full config loading
// once the full config is loaded, we can apply everything once
if (ignoreConfigEvent) return;

if (m2 !== undefined) updateExtras(Config.mode, m2);
if (ActivePage.get() !== "test") return;
if (eventKey === "mode") {
void update(eventPreviousValue as Mode, eventValue as Mode);
} else if (
["time", "quoteLength", "words", "numbers", "punctuation"].includes(
eventKey
)
) {
if (eventValue !== undefined) updateExtras(eventKey, eventValue);
if (eventValue !== undefined)
updateActiveExtraButtons(eventKey, eventValue);
}
});
Loading