Revert "Add keycode table and switch to event.code in select places" (#224)

Using code instead of key is strongly warned against at MDN and causes issues with nonstandard layouts:
https://developer.mozilla.org/en-US/docs/Web/API/Element/keydown_event#keyboardevent.code

This also fixes ScriptEditorRoot.tsx, where some code snuck in that
wasn't using *any* of the constants.

This reverts commit 016a9a873f.
This commit is contained in:
David Walker
2022-11-26 05:51:09 -08:00
committed by GitHub
parent f70a25d755
commit 70fadde222
4 changed files with 33 additions and 96 deletions
+13 -13
View File
@@ -7,7 +7,7 @@ import Paper from "@mui/material/Paper";
import Popper from "@mui/material/Popper";
import TextField from "@mui/material/TextField";
import { KEY, KEYCODE } from "../../utils/helpers/keyCodes";
import { KEY } from "../../utils/helpers/keyCodes";
import { Terminal } from "../../Terminal";
import { Player } from "@player";
import { determineAllPossibilitiesForTabCompletion } from "../determineAllPossibilitiesForTabCompletion";
@@ -316,63 +316,63 @@ export function TerminalInput(): React.ReactElement {
// Extra Bash Emulation Hotkeys, must be enabled through options
if (Settings.EnableBashHotkeys) {
if (event.code === KEYCODE.C && event.ctrlKey && ref && ref.selectionStart === ref.selectionEnd) {
if (event.key === KEY.C && event.ctrlKey && ref && ref.selectionStart === ref.selectionEnd) {
event.preventDefault();
Terminal.print(`[${Player.getCurrentServer().hostname} ~${Terminal.cwd()}]> ${value}`);
modifyInput("clearall");
}
if (event.code === KEYCODE.A && event.ctrlKey) {
if (event.key === KEY.A && event.ctrlKey) {
event.preventDefault();
moveTextCursor("home");
}
if (event.code === KEYCODE.E && event.ctrlKey) {
if (event.key === KEY.E && event.ctrlKey) {
event.preventDefault();
moveTextCursor("end");
}
if (event.code === KEYCODE.B && event.ctrlKey) {
if (event.key === KEY.B && event.ctrlKey) {
event.preventDefault();
moveTextCursor("prevchar");
}
if (event.code === KEYCODE.B && event.altKey) {
if (event.key === KEY.B && event.altKey) {
event.preventDefault();
moveTextCursor("prevword");
}
if (event.code === KEYCODE.F && event.ctrlKey) {
if (event.key === KEY.F && event.ctrlKey) {
event.preventDefault();
moveTextCursor("nextchar");
}
if (event.code === KEYCODE.F && event.altKey) {
if (event.key === KEY.F && event.altKey) {
event.preventDefault();
moveTextCursor("nextword");
}
if ((event.code === KEYCODE.H || event.code === KEYCODE.D) && event.ctrlKey) {
if ((event.key === KEY.H || event.key === KEY.D) && event.ctrlKey) {
modifyInput("backspace");
event.preventDefault();
}
if (event.code === KEYCODE.W && event.ctrlKey) {
if (event.key === KEY.W && event.ctrlKey) {
event.preventDefault();
modifyInput("deletewordbefore");
}
if (event.code === KEYCODE.D && event.altKey) {
if (event.key === KEY.D && event.altKey) {
event.preventDefault();
modifyInput("deletewordafter");
}
if (event.code === KEYCODE.U && event.ctrlKey) {
if (event.key === KEY.U && event.ctrlKey) {
event.preventDefault();
modifyInput("clearbefore");
}
if (event.code === KEYCODE.K && event.ctrlKey) {
if (event.key === KEY.K && event.ctrlKey) {
event.preventDefault();
modifyInput("clearafter");
}