monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-10-15 10:06:10 +08:00
Code Issues Projects Releases Packages Wiki Activity

impr(tab navigation): improve tab navigation

Browse source 
allow tab when quick restart is disabled and when its set to enter
allow pressing enter to trigger buttons even when quick restart is set to enter
This commit is contained in:
Miodec 2024-03-03 20:25:44 +01:00
parent b9092bf362
commit e093b51553
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/ts/controllers/input-controller.ts
View file

@ -802,7 +802,7 @@ function handleTab(event: JQuery.KeyDownEvent, popupVisible: boolean): void {
const modalVisible: boolean =
Misc.isPopupVisible("commandLineWrapper") || popupVisible;
if (Config.quickRestart === "esc" || Config.quickRestart === "enter") {
if (Config.quickRestart === "esc") {
// dont do anything special
if (modalVisible) return;
@ -863,9 +863,9 @@ function handleTab(event: JQuery.KeyDownEvent, popupVisible: boolean): void {
return;
}
//
event.preventDefault();
$("#restartTestButton").trigger("focus");
if (document.activeElement?.id !== "wordsInput") {
Focus.set(false);
}
}
}
@ -931,7 +931,7 @@ $(document).on("keydown", async (event) => {
if (
allowTyping &&
!wordsFocused &&
!["Enter", ...ModifierKeys].includes(event.key)
!["Enter", "Tab", ...ModifierKeys].includes(event.key)
) {
TestUI.focusWords();
if (Config.showOutOfFocusWarning) {
@ -972,6 +972,17 @@ $(document).on("keydown", async (event) => {
//enter
if (event.key === "Enter" && Config.quickRestart === "enter") {
//check if active element is a button, anchor, or has class button, or textButton
const activeElement: HTMLElement | null =
document.activeElement as HTMLElement;
const activeElementIsButton: boolean =
activeElement?.tagName === "BUTTON" ||
activeElement?.tagName === "A" ||
activeElement?.classList.contains("button") ||
activeElement?.classList.contains("textButton");
if (activeElementIsButton) return;
const modalVisible: boolean =
Misc.isPopupVisible("commandLineWrapper") || popupVisible;