btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: keyboard shortcuts now supports different keyboard layouts including Dvorak (#3332)

Browse Source 
* refactor: support mulitple keyboard layouts such as dvorak

* chore: replace redundant variable usage
This commit is contained in:
Joel Jacob Stephen
2023-09-08 22:02:39 +05:30
committed by GitHub
parent f34d896095
commit 1431ecc6d7
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/hoppscotch-common/src/helpers/keybindings.ts
View File

@@ -56,7 +56,7 @@ export const bindings: {
"alt-x": "request.method.delete", "alt-x": "request.method.delete",
"ctrl-k": "modals.search.toggle", "ctrl-k": "modals.search.toggle",
"ctrl-/": "flyouts.keybinds.toggle", "ctrl-/": "flyouts.keybinds.toggle",
"?": "modals.support.toggle", "shift-/": "modals.support.toggle",
"ctrl-m": "modals.share.toggle", "ctrl-m": "modals.share.toggle",
"alt-r": "navigation.jump.rest", "alt-r": "navigation.jump.rest",
"alt-q": "navigation.jump.graphql", "alt-q": "navigation.jump.graphql",
@@ -120,7 +120,8 @@ function generateKeybindingString(ev: KeyboardEvent): ShortcutKey | null {
} }
function getPressedKey(ev: KeyboardEvent): Key | null { function getPressedKey(ev: KeyboardEvent): Key | null {
const val = ev.key.toLowerCase() const val = ev.code.toLowerCase()
// Check arrow keys // Check arrow keys
if (val === "arrowup") return "up" if (val === "arrowup") return "up"
else if (val === "arrowdown") return "down" else if (val === "arrowdown") return "down"
@@ -128,21 +129,20 @@ function getPressedKey(ev: KeyboardEvent): Key | null {
else if (val === "arrowright") return "right" else if (val === "arrowright") return "right"
// Check letter keys // Check letter keys
const isLetter = ev.code.toLowerCase().startsWith("key") const isLetter = val.startsWith("key")
if (isLetter) return ev.code.toLowerCase().substring(3) as Key if (isLetter) return val.substring(3) as Key
// Check if number keys // Check if number keys
if (val.length === 1 && !isNaN(val as any)) return val as Key const isDigit = val.startsWith("digit")
if (isDigit) return val.substring(5) as Key
// Check if question mark // Check if slash
if (val === "?") return "?" if (val === "slash") return "/"
// Check if question mark
if (val === "/") return "/"
// Check if period // Check if period
if (val === ".") return "." if (val === "period") return "."
// Check if enter
if (val === "enter") return "enter" if (val === "enter") return "enter"
// If no other cases match, this is not a valid key // If no other cases match, this is not a valid key