monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-02-27 00:04:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(layout emulator): not returning default char if no alt char was defined

Browse source 
closes #4922
This commit is contained in:
Miodec 2024-01-15 13:19:30 +01:00
parent 77b47a7609
commit b64dc497be
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/ts/test/layout-emulator.ts
View file

@ -9,10 +9,10 @@ const isPunctuationPattern = /\p{P}/u;
export async function getCharFromEvent(
event: JQuery.KeyDownEvent
): Promise<string | null> {
function emulatedLayoutGetVariantIndex(
function emulatedLayoutGetVariant(
event: JQuery.KeyDownEvent,
keyVariants: string
): number {
): string | undefined {
let isCapitalized = event.shiftKey;
const altGrIndex = isAltGrPressed && keyVariants.length > 2 ? 2 : 0;
const isNotPunctuation = !isPunctuationPattern.test(
@ -21,7 +21,12 @@ export async function getCharFromEvent(
if (capsState && isNotPunctuation) {
isCapitalized = !event.shiftKey;
}
return (isCapitalized ? 1 : 0) + altGrIndex;
const altVersion = keyVariants[(isCapitalized ? 1 : 0) + altGrIndex];
const nonAltVersion = keyVariants[isCapitalized ? 1 : 0];
const defaultVersion = keyVariants[0];
return altVersion || nonAltVersion || defaultVersion;
}
let layout;
@ -193,6 +198,10 @@ export async function getCharFromEvent(
];
}
if (!keyEventCodes.includes(event.code)) {
return null;
}
const layoutKeys = layout.keys;
const layoutMap = layoutKeys["row1"]
@ -209,10 +218,9 @@ export async function getCharFromEvent(
return null;
}
}
const variant = emulatedLayoutGetVariantIndex(event, layoutMap[mapIndex]);
const char = layoutMap[mapIndex][variant];
if (char) {
return char;
const charVariant = emulatedLayoutGetVariant(event, layoutMap[mapIndex]);
if (charVariant !== undefined) {
return charVariant;
} else {
return null;
}