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

feat: shift based keyboard shortcuts and save as action

Browse Source
This commit is contained in:
Andrew Bastin
2021-08-21 21:59:55 +05:30
parent 883c787c0b
commit 08fe4ae71f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/http/Request.vue
View File

@@ -413,6 +413,10 @@ export default defineComponent({
defineActionHandler("request.method.next", cycleDownMethod) defineActionHandler("request.method.next", cycleDownMethod)
defineActionHandler("request.method.prev", cycleUpMethod) defineActionHandler("request.method.prev", cycleUpMethod)
defineActionHandler("request.save", saveRequest) defineActionHandler("request.save", saveRequest)
defineActionHandler(
"request.save-as",
() => (showSaveRequestModal.value = true)
)
defineActionHandler("request.method.get", () => updateMethod("GET")) defineActionHandler("request.method.get", () => updateMethod("GET"))
defineActionHandler("request.method.post", () => updateMethod("POST")) defineActionHandler("request.method.post", () => updateMethod("POST"))
defineActionHandler("request.method.put", () => updateMethod("PUT")) defineActionHandler("request.method.put", () => updateMethod("PUT"))

1
helpers/actions.ts
View File

@@ -10,6 +10,7 @@ export type HoppAction =
| "request.reset" // Clear request data | "request.reset" // Clear request data
| "request.copy-link" // Copy Request Link | "request.copy-link" // Copy Request Link
| "request.save" // Save to Collections | "request.save" // Save to Collections
| "request.save-as" // Save As
| "request.method.next" // Select Next Method | "request.method.next" // Select Next Method
| "request.method.prev" // Select Previous Method | "request.method.prev" // Select Previous Method
| "request.method.get" // Select GET Method | "request.method.get" // Select GET Method

13
helpers/keybindings.ts
View File

@@ -14,7 +14,7 @@ let keybindingsEnabled = true
* Alt is also regarded as macOS OPTION (⌥) key * Alt is also regarded as macOS OPTION (⌥) key
* Ctrl is also regarded as macOS COMMAND (⌘) key (NOTE: this differs from HTML Keyboard spec where COMMAND is Meta key!) * Ctrl is also regarded as macOS COMMAND (⌘) key (NOTE: this differs from HTML Keyboard spec where COMMAND is Meta key!)
*/ */
type ModifierKeys = "ctrl" | "alt" type ModifierKeys = "ctrl" | "alt" | "ctrl-shift" | "alt-shift"
/* eslint-disable prettier/prettier */ /* eslint-disable prettier/prettier */
// prettier-ignore // prettier-ignore
@@ -40,6 +40,7 @@ export const bindings: {
"ctrl-i": "request.reset", "ctrl-i": "request.reset",
"ctrl-c": "request.copy-link", "ctrl-c": "request.copy-link",
"ctrl-s": "request.save", "ctrl-s": "request.save",
"ctrl-shift-s": "request.save-as",
"alt-up": "request.method.next", "alt-up": "request.method.next",
"alt-down": "request.method.prev", "alt-down": "request.method.prev",
"alt-g": "request.method.get", "alt-g": "request.method.get",
@@ -136,16 +137,16 @@ function getPressedKey(ev: KeyboardEvent): Key | null {
} }
function getActiveModifier(ev: KeyboardEvent): ModifierKeys | null { function getActiveModifier(ev: KeyboardEvent): ModifierKeys | null {
// Just ignore everything if Shift is pressed (for now) const isShiftKey = ev.shiftKey
if (ev.shiftKey) return null
// We only allow one modifier key to be pressed (for now) // We only allow one modifier key to be pressed (for now)
// Control key (+ Command) gets priority and if Alt is also pressed, it is ignored // Control key (+ Command) gets priority and if Alt is also pressed, it is ignored
if (isAppleDevice() && ev.metaKey) return "ctrl" if (isAppleDevice() && ev.metaKey) return isShiftKey ? "ctrl-shift" : "ctrl"
else if (!isAppleDevice() && ev.ctrlKey) return "ctrl" else if (!isAppleDevice() && ev.ctrlKey)
return isShiftKey ? "ctrl-shift" : "ctrl"
// Test for Alt key // Test for Alt key
if (ev.altKey) return "alt" if (ev.altKey) return isShiftKey ? "alt-shift" : "alt"
return null return null
} }