danvics/Handy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: keybinding changes failing silently due to incorrect key ordering (#524)

Browse source 
* fix: enhance error handling for shortcut bindings and settings persistence

Signed-off-by: Noorain Panjwani <noorain.panjwani@gmail.com>

* Oops. This wasn't needed

Signed-off-by: Noorain Panjwani <noorain.panjwani@gmail.com>

* style

* format

---------

Signed-off-by: Noorain Panjwani <noorain.panjwani@gmail.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
This commit is contained in:
Noorain Panjwani 2026-01-09 20:31:10 -08:00 committed by GitHub
parent 5da495157f
commit bfbeb32c2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 56 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src-tauri/src/shortcut.rs
View file

@ -624,10 +624,13 @@ pub fn change_app_language_setting(app: AppHandle, language: String) -> Result<(
Ok(())
}
/// Determine whether a shortcut string contains at least one non-modifier key.
/// We allow single non-modifier keys (e.g. "f5" or "space") but disallow
/// modifier-only combos (e.g. "ctrl" or "ctrl+shift").
/// Validate that a shortcut contains at least one non-modifier key.
/// The tauri-plugin-global-shortcut library requires at least one main key.
fn validate_shortcut_string(raw: &str) -> Result<(), String> {
if raw.trim().is_empty() {
return Err("Shortcut cannot be empty".into());
}
let modifiers = [
"ctrl", "control", "shift", "alt", "option", "meta", "command", "cmd", "super", "win",
"windows",
@ -635,10 +638,11 @@ fn validate_shortcut_string(raw: &str) -> Result<(), String> {
let has_non_modifier = raw
.split('+')
.any(|part| !modifiers.contains(&part.trim().to_lowercase().as_str()));
if has_non_modifier {
Ok(())
} else {
Err("Shortcut must contain at least one non-modifier key".into())
Err("Shortcut must include a main key (letter, number, F-key, etc.) in addition to modifiers".into())
}
}

13
src/App.tsx
View file

@ -75,7 +75,18 @@ function App() {
return (
<div className="h-screen flex flex-col select-none cursor-default">
<Toaster />
<Toaster
theme="system"
toastOptions={{
unstyled: true,
classNames: {
toast:
"bg-background border border-mid-gray/20 rounded-lg shadow-lg px-4 py-3 flex items-center gap-3 text-sm",
title: "font-medium",
description: "text-mid-gray",
},
}}
/>
{/* Main content area that takes remaining space */}
<div className="flex-1 flex overflow-hidden">
<Sidebar

36
src/components/settings/HandyShortcut.tsx
View file

@ -86,9 +86,6 @@ export const HandyShortcut: React.FC<HandyShortcutProps> = ({
if (editingShortcutId && originalBinding) {
try {
await updateBinding(editingShortcutId, originalBinding);
await commands
.resumeBinding(editingShortcutId)
.catch(console.error);
} catch (error) {
console.error("Failed to restore original binding:", error);
toast.error(t("settings.general.shortcut.errors.restore"));
@ -132,15 +129,32 @@ export const HandyShortcut: React.FC<HandyShortcutProps> = ({
const updatedKeyPressed = keyPressed.filter((k) => k !== key);
if (updatedKeyPressed.length === 0 && recordedKeys.length > 0) {
// Create the shortcut string from all recorded keys
const newShortcut = recordedKeys.join("+");
// Sort keys so modifiers come first, then the main key
const modifiers = [
"ctrl",
"control",
"shift",
"alt",
"option",
"meta",
"command",
"cmd",
"super",
"win",
"windows",
];
const sortedKeys = recordedKeys.sort((a, b) => {
const aIsModifier = modifiers.includes(a.toLowerCase());
const bIsModifier = modifiers.includes(b.toLowerCase());
if (aIsModifier && !bIsModifier) return -1;
if (!aIsModifier && bIsModifier) return 1;
return 0;
});
const newShortcut = sortedKeys.join("+");
if (editingShortcutId && bindings[editingShortcutId]) {
try {
await updateBinding(editingShortcutId, newShortcut);
// Re-register the shortcut now that recording is finished
await commands
.resumeBinding(editingShortcutId)
.catch(console.error);
} catch (error) {
console.error("Failed to change binding:", error);
toast.error(
@ -153,9 +167,6 @@ export const HandyShortcut: React.FC<HandyShortcutProps> = ({
if (originalBinding) {
try {
await updateBinding(editingShortcutId, originalBinding);
await commands
.resumeBinding(editingShortcutId)
.catch(console.error);
} catch (resetError) {
console.error("Failed to reset binding:", resetError);
toast.error(t("settings.general.shortcut.errors.reset"));
@ -181,9 +192,6 @@ export const HandyShortcut: React.FC<HandyShortcutProps> = ({
if (editingShortcutId && originalBinding) {
try {
await updateBinding(editingShortcutId, originalBinding);
await commands
.resumeBinding(editingShortcutId)
.catch(console.error);
} catch (error) {
console.error("Failed to restore original binding:", error);
toast.error(t("settings.general.shortcut.errors.restore"));

15
src/stores/settingsStore.ts
View file

@ -307,7 +307,17 @@ export const useSettingsStore = create<SettingsStore>()(
: null,
}));
await commands.changeBinding(id, binding);
const result = await commands.changeBinding(id, binding);
// Check if the command executed successfully
if (result.status === "error") {
throw new Error(result.error);
}
// Check if the binding change was successful
if (!result.data.success) {
throw new Error(result.data.error || "Failed to update binding");
}
} catch (error) {
console.error(`Failed to update binding ${id}:`, error);
@ -328,6 +338,9 @@ export const useSettingsStore = create<SettingsStore>()(
: null,
}));
}
// Re-throw to let the caller know it failed
throw error;
} finally {
setUpdating(updateKey, false);
}