From b4d97c0ede34da8a7e4735d199524d76ed48c868 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 1 Sep 2023 14:04:51 +0800 Subject: [PATCH 1/3] Remove section on multi select from reader keyboard commands --- .../web/components/templates/KeyboardShortcutListModal.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/web/components/templates/KeyboardShortcutListModal.tsx b/packages/web/components/templates/KeyboardShortcutListModal.tsx index 3285446d8..79e90b765 100644 --- a/packages/web/components/templates/KeyboardShortcutListModal.tsx +++ b/packages/web/components/templates/KeyboardShortcutListModal.tsx @@ -76,12 +76,6 @@ const readerCommands = () => { shortcutKeyDescription: 'f', callback: () => {}, }, - { - shortcutKeys: ['escape'], - actionDescription: 'End multi select', - shortcutKeyDescription: 'Escape', - callback: () => {}, - }, { actionDescription: 'Return to library', shortcutKeys: ['u'], From 92e654f311d561d10706ac1c394c81bc14a858d1 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 1 Sep 2023 14:07:24 +0800 Subject: [PATCH 2/3] Fix docs link --- packages/web/pages/settings/feeds/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/pages/settings/feeds/index.tsx b/packages/web/pages/settings/feeds/index.tsx index c94a19b0e..cbe310e8c 100644 --- a/packages/web/pages/settings/feeds/index.tsx +++ b/packages/web/pages/settings/feeds/index.tsx @@ -90,7 +90,7 @@ export default function Rss(): JSX.Element { return ( { From a2f339ceed9e10d55e46541655e7f935467be626 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 1 Sep 2023 14:15:48 +0800 Subject: [PATCH 3/3] Fix double registration of navigation commands --- packages/web/lib/keyboardShortcuts/navigationShortcuts.ts | 4 +++- packages/web/pages/[username]/[slug]/index.tsx | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts b/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts index a8f1af0c8..d49b72f61 100644 --- a/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts +++ b/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts @@ -15,7 +15,9 @@ export function navigationCommands( shortcutKeys: ['b'], actionDescription: 'Go back', shortcutKeyDescription: 'b', - callback: () => router?.back(), + callback: () => { + router?.back() + }, }, ] } diff --git a/packages/web/pages/[username]/[slug]/index.tsx b/packages/web/pages/[username]/[slug]/index.tsx index 0bad57608..533bea5db 100644 --- a/packages/web/pages/[username]/[slug]/index.tsx +++ b/packages/web/pages/[username]/[slug]/index.tsx @@ -79,8 +79,6 @@ export default function Home(): JSX.Element { }) }, [articleData?.article.article]) - useKeyboardShortcuts(navigationCommands(router)) - const actionHandler = useCallback( async (action: string, arg?: unknown) => { switch (action) {