RSSNext
diff --git a/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions b/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/entry-render.tsx
Copy file name to clipboard
+39-3Lines changed: 39 additions & 3 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/entry-render.tsx
Copy file name to clipboard
+39-3Lines changed: 39 additions & 3 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
+40Lines changed: 40 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
+40Lines changed: 40 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
Copy file name to clipboard
+24-10Lines changed: 24 additions & 10 deletions b/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
Copy file name to clipboard
+24-10Lines changed: 24 additions & 10 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx
Copy file name to clipboard
+6-9Lines changed: 6 additions & 9 deletions b/‎apps/desktop/layer/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx
Copy file name to clipboard
+6-9Lines changed: 6 additions & 9 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-content/actions/header-actions.tsx
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions b/‎apps/desktop/layer/renderer/src/modules/entry-content/actions/header-actions.tsx
Copy file name to clipboard
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx
Copy file name to clipboard
+1-18Lines changed: 1 addition & 18 deletions b/‎apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx
Copy file name to clipboard
+1-18Lines changed: 1 addition & 18 deletions
@@ -32,15 +32,14 @@ import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
 import { DeclarativeModal } from "~/components/ui/modal/stacked/declarative-modal"
 import { HotkeyScope } from "~/constants"
 import { ROOT_CONTAINER_ID } from "~/constants/dom"
-import { shortcuts } from "~/constants/shortcuts"
 import { useDailyTask } from "~/hooks/biz/useDailyTask"
 import { useBatchUpdateSubscription } from "~/hooks/biz/useSubscriptionActions"
 import { useI18n } from "~/hooks/common"
 import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator"
 import { NetworkStatusIndicator } from "~/modules/app/NetworkStatusIndicator"
 import { LoginModalContent } from "~/modules/auth/LoginModalContent"
 import { COMMAND_ID } from "~/modules/command/commands/id"
-import { useCommandHotkey } from "~/modules/command/hooks/use-register-hotkey"
+import { useCommandBinding } from "~/modules/command/hooks/use-register-hotkey"
 import { DebugRegistry } from "~/modules/debug/registry"
 import { CmdF } from "~/modules/panel/cmdf"
 import { SearchCmdK } from "~/modules/panel/cmdk"
@@ -244,9 +243,8 @@ const FeedResponsiveResizerContainer = ({
 
   const activeScopes = useHotkeyScope()
 
-  useCommandHotkey({
+  useCommandBinding({
     commandId: COMMAND_ID.layout.toggleTimelineColumn,
-    shortcut: shortcuts.layout.toggleSidebar.key,
     when: activeScopes.includes(HotkeyScope.Home),
   })
 
 
@@ -8,27 +8,49 @@ declare module "@follow/utils/event-bus" {
   interface EventBusMap {
     "entry-render:scroll-down": never
     "entry-render:scroll-up": never
+    "entry-render:next-entry": never
+    "entry-render:previous-entry": never
   }
 }
 const LABEL_PREFIX = "Entry Render"
+
+const category = "follow:entry-render"
 export const useRegisterEntryRenderCommand = () => {
   useRegisterCommandEffect([
     {
       id: COMMAND_ID.entryRender.scrollDown,
       run: () => {
         EventBus.dispatch(COMMAND_ID.entryRender.scrollDown)
       },
-      category: "follow:entry-render",
+      category,
       label: `${LABEL_PREFIX}: Scroll down`,
     },
     {
       id: COMMAND_ID.entryRender.scrollUp,
       run: () => {
         EventBus.dispatch(COMMAND_ID.entryRender.scrollUp)
       },
-      category: "follow:entry-render",
+      category,
       label: `${LABEL_PREFIX}: Scroll up`,
     },
+    {
+      id: COMMAND_ID.entryRender.nextEntry,
+      run: () => {
+        EventBus.dispatch(COMMAND_ID.timeline.switchToNext)
+        EventBus.dispatch(COMMAND_ID.entryRender.nextEntry)
+      },
+      category,
+      label: `${LABEL_PREFIX}: Next entry`,
+    },
+    {
+      id: COMMAND_ID.entryRender.previousEntry,
+      run: () => {
+        EventBus.dispatch(COMMAND_ID.timeline.switchToPrevious)
+        EventBus.dispatch(COMMAND_ID.entryRender.previousEntry)
+      },
+      category,
+      label: `${LABEL_PREFIX}: Previous entry`,
+    },
   ])
 }
 
@@ -42,4 +64,18 @@ type EntryScrollUpCommand = Command<{
   fn: () => void
 }>
 
-export type EntryRenderCommand = EntryScrollDownCommand | EntryScrollUpCommand
+type EntryNextEntryCommand = Command<{
+  id: typeof COMMAND_ID.entryRender.nextEntry
+  fn: () => void
+}>
+
+type EntryPreviousEntryCommand = Command<{
+  id: typeof COMMAND_ID.entryRender.previousEntry
+  fn: () => void
+}>
+
+export type EntryRenderCommand =
+  | EntryScrollDownCommand
+  | EntryScrollUpCommand
+  | EntryNextEntryCommand
+  | EntryPreviousEntryCommand
@@ -55,6 +55,8 @@ export const COMMAND_ID = {
   entryRender: {
     scrollDown: "entry-render:scroll-down",
     scrollUp: "entry-render:scroll-up",
+    nextEntry: "entry-render:next-entry",
+    previousEntry: "entry-render:previous-entry",
   },
   subscription: {
     switchTabToNext: "subscription:switch-tab-to-next",
 
@@ -0,0 +1,40 @@
+import { shortcuts } from "~/constants/shortcuts"
+
+import { COMMAND_ID } from "../commands/id"
+
+const defaultCommandShortcuts = {
+  [COMMAND_ID.entry.read]: shortcuts.entry.toggleRead.key,
+  [COMMAND_ID.entry.openInBrowser]: shortcuts.entry.openInBrowser.key,
+  [COMMAND_ID.entry.star]: shortcuts.entry.toggleStarred.key,
+  [COMMAND_ID.entry.copyLink]: shortcuts.entry.copyLink.key,
+  [COMMAND_ID.entry.copyTitle]: shortcuts.entry.copyTitle.key,
+  [COMMAND_ID.entry.tts]: shortcuts.entry.tts.key,
+  [COMMAND_ID.entry.tip]: shortcuts.entry.tip.key,
+  [COMMAND_ID.entry.share]: shortcuts.entry.share.key,
+
+  [COMMAND_ID.entryRender.scrollUp]: shortcuts.entry.scrollUp.key,
+  [COMMAND_ID.entryRender.scrollDown]: shortcuts.entry.scrollDown.key,
+
+  [COMMAND_ID.timeline.switchToNext]: shortcuts.entries.next.key,
+  [COMMAND_ID.timeline.switchToPrevious]: shortcuts.entries.previous.key,
+  [COMMAND_ID.timeline.refetch]: shortcuts.entries.refetch.key,
+
+  [COMMAND_ID.layout.toggleTimelineColumn]: shortcuts.layout.toggleSidebar.key,
+
+  [COMMAND_ID.subscription.switchTabToNext]: shortcuts.feeds.switchNextView.key,
+  [COMMAND_ID.subscription.switchTabToPrevious]: shortcuts.feeds.switchPreviousView.key,
+
+  [COMMAND_ID.global.showShortcuts]: shortcuts.layout.showShortcuts.key,
+
+  [COMMAND_ID.entryRender.nextEntry]: shortcuts.entry.nextEntry.key,
+  [COMMAND_ID.entryRender.previousEntry]: shortcuts.entry.previousEntry.key,
+} as const
+
+export type BindingCommandId = keyof typeof defaultCommandShortcuts
+
+// eslint-disable-next-line @eslint-react/hooks-extra/no-unnecessary-use-prefix, @eslint-react/hooks-extra/ensure-custom-hooks-using-other-hooks
+export const useCommandShortcut = (commandId: BindingCommandId): string => {
+  const commandShortcut = defaultCommandShortcuts[commandId]
+
+  return commandShortcut
+}
@@ -1,8 +1,10 @@
-import { useEffect, useRef } from "react"
+import { useEffect } from "react"
 import { tinykeys } from "tinykeys"
 
 import type { FollowCommand, FollowCommandId } from "../types"
 import { getCommand } from "./use-command"
+import type { BindingCommandId } from "./use-command-shortcut"
+import { useCommandShortcut } from "./use-command-shortcut"
 
 interface RegisterHotkeyOptions<T extends FollowCommandId> {
   shortcut: string
@@ -14,14 +16,15 @@ interface RegisterHotkeyOptions<T extends FollowCommandId> {
 export const useCommandHotkey = <T extends FollowCommandId>({
   shortcut,
   commandId,
-  when = true,
+  when,
   args,
 }: RegisterHotkeyOptions<T>) => {
-  const unsubscribeRef = useRef<() => void>(void 0)
-
   useEffect(() => {
     if (!when) {
-      unsubscribeRef.current?.()
+      return
+    }
+
+    if (!shortcut) {
       return
     }
 
@@ -55,10 +58,21 @@ export const useCommandHotkey = <T extends FollowCommandId>({
       }
     })
 
-    unsubscribeRef.current = tinykeys(document.documentElement, keyMap)
-
-    return () => {
-      unsubscribeRef.current?.()
-    }
+    return tinykeys(document.documentElement, keyMap)
   }, [shortcut, commandId, when, args])
 }
+
+export const useCommandBinding = <T extends BindingCommandId>({
+  commandId,
+  when = true,
+  args,
+}: Omit<RegisterHotkeyOptions<T>, "shortcut">) => {
+  const commandShortcut = useCommandShortcut(commandId)
+
+  return useCommandHotkey({
+    shortcut: commandShortcut,
+    commandId,
+    when,
+    args,
+  })
+}
@@ -5,14 +5,13 @@ import { memo, useEffect, useLayoutEffect, useState } from "react"
 
 import { useMainContainerElement } from "~/atoms/dom"
 import { HotkeyScope } from "~/constants"
-import { shortcuts } from "~/constants/shortcuts"
 import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry"
 import { useRouteEntryId } from "~/hooks/biz/useRouteParams"
 import { useConditionalHotkeyScope } from "~/hooks/common"
 import { useHotkeyScope } from "~/providers/hotkey-provider"
 
 import { COMMAND_ID } from "../command/commands/id"
-import { useCommandHotkey } from "../command/hooks/use-register-hotkey"
+import { useCommandBinding } from "../command/hooks/use-register-hotkey"
 
 export const EntryColumnShortcutHandler: FC<{
   refetch: () => void
@@ -26,26 +25,24 @@ export const EntryColumnShortcutHandler: FC<{
   const when =
     activeScope.includes(HotkeyScope.Timeline) && !activeScope.includes(HotkeyScope.EntryRender)
 
-  useCommandHotkey({
-    shortcut: shortcuts.entries.next.key,
+  useCommandBinding({
     commandId: COMMAND_ID.timeline.switchToNext,
     when,
   })
 
-  useCommandHotkey({
-    shortcut: shortcuts.entries.previous.key,
+  useCommandBinding({
     commandId: COMMAND_ID.timeline.switchToPrevious,
     when,
   })
 
-  useCommandHotkey({
-    shortcut: shortcuts.entries.refetch.key,
+  useCommandBinding({
     commandId: COMMAND_ID.timeline.refetch,
     when,
   })
 
   const currentEntryIdRef = useRefValue(useRouteEntryId())
   const navigate = useNavigateEntry()
+
   useEffect(() => {
     return EventBus.subscribe(COMMAND_ID.timeline.switchToNext, () => {
       const data = dataRef.current
@@ -60,7 +57,7 @@ export const EntryColumnShortcutHandler: FC<{
         entryId: nextId,
       })
     })
-  }, [currentEntryIdRef, dataRef, handleScrollTo, navigate])
+  }, [currentEntryIdRef, dataRef, handleScrollTo, navigate, when])
 
   useEffect(() => {
     return EventBus.subscribe(COMMAND_ID.timeline.switchToPrevious, () => {
 
@@ -3,10 +3,9 @@ import type { FeedViewType } from "@follow/constants"
 import { MenuItemText } from "~/atoms/context-menu"
 import { CommandActionButton } from "~/components/ui/button/CommandActionButton"
 import { useHasModal } from "~/components/ui/modal/stacked/hooks"
-import { shortcuts } from "~/constants/shortcuts"
 import { useSortedEntryActions } from "~/hooks/biz/useEntryActions"
 import { COMMAND_ID } from "~/modules/command/commands/id"
-import { useCommandHotkey } from "~/modules/command/hooks/use-register-hotkey"
+import { useCommandBinding } from "~/modules/command/hooks/use-register-hotkey"
 import { useEntry } from "~/store/entry/hooks"
 
 export const EntryHeaderActions = ({
@@ -23,9 +22,8 @@ export const EntryHeaderActions = ({
 
   const hasModal = useHasModal()
 
-  useCommandHotkey({
+  useCommandBinding({
     when: !!entry?.entries.url && !hasModal,
-    shortcut: shortcuts.entry.openInBrowser.key,
     commandId: COMMAND_ID.entry.openInBrowser,
     args: [{ entryId }],
   })
 
@@ -1,29 +1,12 @@
 import { tracker } from "@follow/tracker"
-import { EventBus } from "@follow/utils/event-bus"
-import { createElement, useCallback, useEffect } from "react"
+import { createElement, useCallback } from "react"
 import { useTranslation } from "react-i18next"
 import { toast } from "sonner"
 
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 
 import { ImageGalleryContent } from "./components/ImageGalleryContent"
 
-declare module "@follow/utils/event-bus" {
-  export interface CustomEvent {
-    FOCUS_ENTRY_CONTAINER: never
-  }
-}
-
-export const useFocusEntryContainerSubscriptions = (
-  ref: React.RefObject<HTMLDivElement | null>,
-) => {
-  useEffect(() => {
-    return EventBus.subscribe("FOCUS_ENTRY_CONTAINER", () => {
-      ref.current?.focus()
-    })
-  }, [ref])
-}
-
 export const useGalleryModal = () => {
   const { present } = useModalStack()
   const { t } = useTranslation()