RSSNext
diff --git a/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+14-6Lines changed: 14 additions & 6 deletions b/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+14-6Lines changed: 14 additions & 6 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+17-2Lines changed: 17 additions & 2 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+17-2Lines changed: 17 additions & 2 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx
Copy file name to clipboard
+21-1Lines changed: 21 additions & 1 deletion b/‎apps/desktop/layer/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx
Copy file name to clipboard
+21-1Lines changed: 21 additions & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions b/‎apps/desktop/layer/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/timeline-column/FeedCategory.tsx
Copy file name to clipboard
+7-6Lines changed: 7 additions & 6 deletions b/‎apps/desktop/layer/renderer/src/modules/timeline-column/FeedCategory.tsx
Copy file name to clipboard
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/timeline-column/FeedItem.tsx
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions b/‎apps/desktop/layer/renderer/src/modules/timeline-column/FeedItem.tsx
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions
@@ -8,23 +8,31 @@ type Shortcuts = Record<
 >
 
 const shortcutConfigs = {
-  feeds: {
+  subscriptions: {
     add: {
-      name: tShortcuts("keys.feeds.add"),
+      name: tShortcuts("keys.subscriptions.add"),
       key: "Meta+T",
     },
     switchToView: {
-      name: tShortcuts("keys.feeds.switchToView"),
+      name: tShortcuts("keys.subscriptions.switchToView"),
       key: "1, 2, 3, 4, 5, 6",
     },
     switchNextView: {
-      name: tShortcuts("keys.feeds.switchNextView"),
+      name: tShortcuts("keys.subscriptions.switchNextView"),
       key: "Tab, ArrowRight",
     },
     switchPreviousView: {
-      name: tShortcuts("keys.feeds.switchPreviousView"),
+      name: tShortcuts("keys.subscriptions.switchPreviousView"),
       key: "Shift+Tab, ArrowLeft",
     },
+    nextSubscription: {
+      name: tShortcuts("keys.subscriptions.nextSubscription"),
+      key: "J, ArrowDown",
+    },
+    previousSubscription: {
+      name: tShortcuts("keys.subscriptions.previousSubscription"),
+      key: "K, ArrowUp",
+    },
   },
   layout: {
     toggleSidebar: {
@@ -147,7 +155,7 @@ function transformShortcuts<T extends Shortcuts>(configs: T) {
 export const shortcuts = transformShortcuts(shortcutConfigs) satisfies Shortcuts
 
 export const shortcutsType: { [key in keyof typeof shortcuts]: I18nKeysForShortcuts } = {
-  feeds: "keys.type.feeds",
+  subscriptions: "keys.type.subscriptions",
   layout: "keys.type.layout",
   entries: "keys.type.entries",
   entry: "keys.type.entry",
 
@@ -47,6 +47,7 @@ export const COMMAND_ID = {
   layout: {
     toggleTimelineColumn: "layout:toggle-timeline-column",
     focusToTimeline: "layout:focus-to-timeline",
+    focusToSubscription: "layout:focus-to-subscription",
   },
   timeline: {
     switchToNext: "timeline:switch-to-next",
@@ -69,5 +70,8 @@ export const COMMAND_ID = {
     switchTabToVideo: "subscription:switch-tab-to-video",
     switchTabToAudio: "subscription:switch-tab-to-audio",
     switchTabToNotification: "subscription:switch-tab-to-notification",
+
+    nextSubscription: "subscription:next",
+    previousSubscription: "subscription:previous",
   },
 } as const
@@ -9,6 +9,7 @@ import { COMMAND_ID } from "./id"
 declare module "@follow/utils/event-bus" {
   interface EventBusMap {
     "layout:focus-to-timeline": never
+    "layout:focus-to-subscription": never
   }
 }
 
@@ -28,9 +29,21 @@ export const useRegisterLayoutCommands = () => {
         EventBus.dispatch(COMMAND_ID.layout.focusToTimeline)
       },
     },
+    {
+      id: COMMAND_ID.layout.focusToSubscription,
+      label: "Focus to subscription",
+      run: () => {
+        EventBus.dispatch(COMMAND_ID.layout.focusToSubscription)
+      },
+    },
   ])
 }
 
+export type FocusToSubscriptionCommand = Command<{
+  id: typeof COMMAND_ID.layout.focusToSubscription
+  fn: () => void
+}>
+
 export type ToggleTimelineColumnCommand = Command<{
   id: typeof COMMAND_ID.layout.toggleTimelineColumn
   fn: () => void
@@ -40,5 +53,7 @@ export type FocusToTimelineCommand = Command<{
   id: typeof COMMAND_ID.layout.focusToTimeline
   fn: () => void
 }>
-
-export type LayoutCommand = ToggleTimelineColumnCommand | FocusToTimelineCommand
+export type LayoutCommand =
+  | ToggleTimelineColumnCommand
+  | FocusToTimelineCommand
+  | FocusToSubscriptionCommand
@@ -14,6 +14,9 @@ declare module "@follow/utils/event-bus" {
     "subscription:switch-tab-to-video": never
     "subscription:switch-tab-to-audio": never
     "subscription:switch-tab-to-notification": never
+
+    "subscription:next": never
+    "subscription:previous": never
   }
 }
 const LABEL_PREFIX = "Subscription"
@@ -75,6 +78,20 @@ export const useRegisterSubscriptionCommands = () => {
         EventBus.dispatch(COMMAND_ID.subscription.switchTabToNotification)
       },
     },
+    {
+      id: COMMAND_ID.subscription.nextSubscription,
+      label: `${LABEL_PREFIX}: Next Subscription`,
+      run: () => {
+        EventBus.dispatch(COMMAND_ID.subscription.nextSubscription)
+      },
+    },
+    {
+      id: COMMAND_ID.subscription.previousSubscription,
+      label: `${LABEL_PREFIX}: Previous Subscription`,
+      run: () => {
+        EventBus.dispatch(COMMAND_ID.subscription.previousSubscription)
+      },
+    },
   ])
 }
 
@@ -118,6 +135,16 @@ type SwitchTabToNotificationCommand = Command<{
   fn: () => void
 }>
 
+type NextSubscriptionCommand = Command<{
+  id: typeof COMMAND_ID.subscription.nextSubscription
+  fn: () => void
+}>
+
+type PreviousSubscriptionCommand = Command<{
+  id: typeof COMMAND_ID.subscription.previousSubscription
+  fn: () => void
+}>
+
 export type SubscriptionCommand =
   | SwitchTabToNextCommand
   | SwitchTabToPreviousCommand
@@ -127,3 +154,5 @@ export type SubscriptionCommand =
   | SwitchTabToVideoCommand
   | SwitchTabToAudioCommand
   | SwitchTabToNotificationCommand
+  | NextSubscriptionCommand
+  | PreviousSubscriptionCommand
@@ -21,8 +21,10 @@ const defaultCommandShortcuts = {
 
   [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.subscription.nextSubscription]: shortcuts.subscriptions.nextSubscription.key,
+  [COMMAND_ID.subscription.previousSubscription]: shortcuts.subscriptions.previousSubscription.key,
+  [COMMAND_ID.subscription.switchTabToNext]: shortcuts.subscriptions.switchNextView.key,
+  [COMMAND_ID.subscription.switchTabToPrevious]: shortcuts.subscriptions.switchPreviousView.key,
 
   [COMMAND_ID.global.showShortcuts]: shortcuts.layout.showShortcuts.key,
 
 
@@ -48,6 +48,12 @@ export const EntryColumnShortcutHandler: FC<{
     when,
   })
 
+  useCommandHotkey({
+    commandId: COMMAND_ID.layout.focusToSubscription,
+    shortcut: "Backspace, Escape",
+    when,
+  })
+
   const currentEntryIdRef = useRefValue(useRouteEntryId())
   const navigate = useNavigateEntry()
 
 
@@ -1,12 +1,32 @@
 import { AvatarGroup } from "@follow/components/ui/avatar-group/index.js"
+import { FeedViewType } from "@follow/constants"
 
 import { useWhoami } from "~/atoms/user"
+import { getRouteParams } from "~/hooks/biz/useRouteParams"
 import { useAuthQuery } from "~/hooks/common"
 import { useAppLayoutGridContainerWidth } from "~/providers/app-grid-layout-container-provider"
 import { Queries } from "~/queries"
 import { useEntryReadHistory } from "~/store/entry"
 
-import { EntryUser, getLimit } from "./EntryReadHistory.shared"
+import { EntryUser } from "./EntryReadHistory.shared"
+
+const getLimit = (width: number): number => {
+  const routeParams = getRouteParams()
+  // social media view has four extra buttons
+  if (
+    [FeedViewType.SocialMedia, FeedViewType.Pictures, FeedViewType.Videos].includes(
+      routeParams.view,
+    )
+  ) {
+    if (width > 1100) return 15
+    if (width > 950) return 10
+    if (width > 800) return 5
+    return 3
+  }
+  if (width > 900) return 15
+  if (width > 600) return 10
+  return 5
+}
 
 export const EntryReadHistory: Component<{ entryId: string }> = ({ entryId }) => {
   const me = useWhoami()
 
@@ -1,35 +1,15 @@
 import { Avatar, AvatarFallback, AvatarImage } from "@follow/components/ui/avatar/index.jsx"
 import { TooltipContent, TooltipPortal } from "@follow/components/ui/tooltip/index.jsx"
-import { FeedViewType } from "@follow/constants"
 import { getNameInitials } from "@follow/utils/cjk"
 import { m } from "motion/react"
 import { memo } from "react"
 import { useTranslation } from "react-i18next"
 
-import { getRouteParams } from "~/hooks/biz/useRouteParams"
 import { replaceImgUrlIfNeed } from "~/lib/img-proxy"
 import { useUserById } from "~/store/user"
 
 import { usePresentUserProfileModal } from "../../profile/hooks"
 
-export const getLimit = (width: number): number => {
-  const routeParams = getRouteParams()
-  // social media view has four extra buttons
-  if (
-    [FeedViewType.SocialMedia, FeedViewType.Pictures, FeedViewType.Videos].includes(
-      routeParams.view,
-    )
-  ) {
-    if (width > 1100) return 15
-    if (width > 950) return 10
-    if (width > 800) return 5
-    return 3
-  }
-  if (width > 900) return 15
-  if (width > 600) return 10
-  return 5
-}
-
 export const EntryUser: Component<{
   userId: string
   ref?: React.Ref<HTMLDivElement>
 
@@ -73,15 +73,15 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
   const folderName =
     subscription?.category || (autoGroup ? subscription.defaultCategory : subscription.feedId)
 
-  const showCollapse = sortByUnreadFeedList.length > 1 || !!subscription?.category
+  const isCategory = sortByUnreadFeedList.length > 1 || !!subscription?.category
 
   const open = useMemo(() => {
-    if (!showCollapse) return true
+    if (!isCategory) return true
     if (folderName && typeof categoryOpenStateData[folderName] === "boolean") {
       return categoryOpenStateData[folderName]
     }
     return false
-  }, [categoryOpenStateData, folderName, showCollapse])
+  }, [categoryOpenStateData, folderName, isCategory])
 
   const setOpen = useCallback(
     (next: boolean) => {
@@ -270,7 +270,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
   })
   return (
     <div tabIndex={-1} onClick={stopPropagation}>
-      {!!showCollapse && (
+      {!!isCategory && (
         <div
           ref={setNodeRef}
           data-active={isActive || isContextMenuOpen}
@@ -279,6 +279,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
             "my-px px-2.5",
             feedColumnStyles.item,
           )}
+          data-sub={`feed-category-${folderName}`}
           onClick={(e) => {
             e.stopPropagation()
             if (!isCategoryEditing) {
@@ -335,7 +336,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
             ref={itemsRef}
             className="space-y-px"
             initial={
-              !!showCollapse && {
+              !!isCategory && {
                 height: 0,
                 opacity: 0.01,
               }
@@ -351,7 +352,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
           >
             <SortedFeedItems
               ids={ids}
-              showCollapse={showCollapse as boolean}
+              showCollapse={isCategory as boolean}
               view={view as FeedViewType}
             />
           </m.div>
 
@@ -9,13 +9,11 @@ import {
 } from "@follow/components/ui/tooltip/index.jsx"
 import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js"
 import type { FeedViewType } from "@follow/constants"
-import { nextFrame } from "@follow/utils/dom"
 import { cn, isKeyForMultiSelectPressed } from "@follow/utils/utils"
 import { createElement, memo, use, useCallback, useState } from "react"
 import { useTranslation } from "react-i18next"
 
 import { MenuItemSeparator, MenuItemText, useShowContextMenu } from "~/atoms/context-menu"
-import { getMainContainerElement } from "~/atoms/dom"
 import { useGeneralSettingKey } from "~/atoms/settings/general"
 import { ErrorTooltip } from "~/components/common/ErrorTooltip"
 import { useFeedActions, useInboxActions, useListActions } from "~/hooks/biz/useFeedActions"
@@ -106,10 +104,6 @@ const FeedItemImpl = ({ view, feedId, className, isPreview }: FeedItemProps) =>
         entryId: null,
         view,
       })
-      // focus to main container in order to let keyboard can navigate entry items by arrow keys
-      nextFrame(() => {
-        getMainContainerElement()?.focus()
-      })
     },
     [feedId, navigate, setSelectedFeedIds, view],
   )
@@ -167,6 +161,7 @@ const FeedItemImpl = ({ view, feedId, className, isPreview }: FeedItemProps) =>
     <DraggableItemWrapper
       isInMultipleSelection={isInMultipleSelection}
       data-feed-id={feedId}
+      data-sub={`feed-${feedId}`}
       data-active={
         isMultiSelectingButNotSelected
           ? false
@@ -273,10 +268,6 @@ const ListItemImpl: Component<ListItemProps> = ({
         entryId: null,
         view,
       })
-      // focus to main container in order to let keyboard can navigate entry items by arrow keys
-      nextFrame(() => {
-        getMainContainerElement()?.focus()
-      })
     },
     [listId, navigate, view],
   )
@@ -296,6 +287,7 @@ const ListItemImpl: Component<ListItemProps> = ({
   return (
     <div
       data-list-id={listId}
+      data-sub={`list-${listId}`}
       data-active={isActive || isContextMenuOpen}
       className={cn(feedColumnStyles.item, "py-1 pl-2.5", className)}
       onClick={handleNavigate}
@@ -397,6 +389,7 @@ const InboxItemImpl: Component<InboxItemProps> = ({ view, inboxId, className, ic
   return (
     <div
       data-active={isActive || isContextMenuOpen}
+      data-sub={`inbox-${inboxId}`}
       data-inbox-id={inboxId}
       className={cn(
         "cursor-menu flex w-full items-center justify-between rounded-md pr-2.5 text-base font-medium leading-loose lg:text-sm",