From f0773dc6f37dec90f360f7691df2d755ba57a6b0 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Fri, 1 Nov 2024 17:30:33 +0800
Subject: [PATCH] Fix keyboard shortcuts leaked to multi-column mode
---
src/components/shortcuts.jsx | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/components/shortcuts.jsx b/src/components/shortcuts.jsx
index b06ba9a8..0fea57d7 100644
--- a/src/components/shortcuts.jsx
+++ b/src/components/shortcuts.jsx
@@ -30,10 +30,10 @@ function Shortcuts() {
if (!shortcuts.length) {
return null;
}
- if (
+ const isMultiColumnMode =
settings.shortcutsViewMode === 'multi-column' ||
- (!settings.shortcutsViewMode && settings.shortcutsColumnsMode)
- ) {
+ (!settings.shortcutsViewMode && settings.shortcutsColumnsMode);
+ if (isMultiColumnMode) {
return null;
}
@@ -87,16 +87,22 @@ function Shortcuts() {
.filter(Boolean);
const navigate = useNavigate();
- useHotkeys(['1', '2', '3', '4', '5', '6', '7', '8', '9'], (e, handler) => {
- const index = parseInt(handler.keys[0], 10) - 1;
- if (index < formattedShortcuts.length) {
- const { path } = formattedShortcuts[index];
- if (path) {
- navigate(path);
- menuRef.current?.closeMenu?.();
+ useHotkeys(
+ ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
+ (e, handler) => {
+ const index = parseInt(handler.keys[0], 10) - 1;
+ if (index < formattedShortcuts.length) {
+ const { path } = formattedShortcuts[index];
+ if (path) {
+ navigate(path);
+ menuRef.current?.closeMenu?.();
+ }
}
- }
- });
+ },
+ {
+ enabled: !isMultiColumnMode,
+ },
+ );
const [lists, setLists] = useState([]);