fix: unread all action

Signed-off-by: Innei <i@innei.in>
RSSNext · Jul 4, 2024 · 7f4fc06 · 7f4fc06
1 parent 2ae11fa
commit 7f4fc06
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/renderer/src/lib/shortcuts.ts b/src/renderer/src/lib/shortcuts.ts
@@ -40,7 +40,7 @@ export const shortcuts = {
     },
     markAllAsRead: {
       name: "Mark All as Read",
-      key: "A",
+      key: "Shift+Meta+A",
     },
     toggleUnreadOnly: {
       name: "Toggle Unread Only",
@@ -62,11 +62,11 @@ export const shortcuts = {
     },
     copyLink: {
       name: "Copy Link",
-      key: "Meta+Shift+C",
+      key: "Shift+Meta+C",
     },
     tip: {
       name: "Tip Power",
-      key: "Meta+Shift+T",
+      key: "Shift+Meta+T",
     },
   },
 } as const
diff --git a/src/renderer/src/modules/entry-column/index.tsx b/src/renderer/src/modules/entry-column/index.tsx
@@ -19,7 +19,11 @@ import {
   useRouteParms,
 } from "@renderer/hooks/biz/useRouteParams"
 import { apiClient } from "@renderer/lib/api-fetch"
-import { ROUTE_ENTRY_PENDING, ROUTE_FEED_PENDING, views } from "@renderer/lib/constants"
+import {
+  ROUTE_ENTRY_PENDING,
+  ROUTE_FEED_PENDING,
+  views,
+} from "@renderer/lib/constants"
 import { getStorageNS } from "@renderer/lib/ns"
 import { shortcuts } from "@renderer/lib/shortcuts"
 import { cn, getEntriesParams, getOS, isBizId } from "@renderer/lib/utils"
@@ -270,7 +274,10 @@ const ListHeader: FC<{
       },
     })
 
-    if (typeof routerParams.feedId === "number") {
+    if (
+      typeof routerParams.feedId === "number" ||
+      routerParams.feedId === ROUTE_FEED_PENDING
+    ) {
       subscriptionActions.markReadByView(routerParams.view)
     } else {
       routerParams.feedId?.split(",").forEach((feedId) => {
@@ -319,8 +326,13 @@ const ListHeader: FC<{
         )}
       >
         {!titleAtBottom && titleInfo}
-        <div className="relative z-[1] flex items-center gap-1 self-baseline text-zinc-500" onClick={(e) => e.stopPropagation()}>
-          {views[view].wideMode && entryId && entryId !== ROUTE_ENTRY_PENDING && (
+        <div
+          className="relative z-[1] flex items-center gap-1 self-baseline text-zinc-500"
+          onClick={(e) => e.stopPropagation()}
+        >
+          {views[view].wideMode &&
+            entryId &&
+            entryId !== ROUTE_ENTRY_PENDING && (
             <>
               <EntryHeader view={view} entryId={entryId} />
               <DividerVertical className="w-px" />