feat(desktop): hideAllReadSubscriptions option for category

hyoban · hyoban · commit a5d8455f5463 · 2025-05-15T19:35:54.000+08:00
diff --git a/apps/desktop/layer/renderer/src/modules/timeline-column/FeedCategory.tsx b/apps/desktop/layer/renderer/src/modules/timeline-column/FeedCategory.tsx
@@ -18,7 +18,7 @@ import { useEventCallback, useOnClickOutside } from "usehooks-ts"
 
 import type { MenuItemInput } from "~/atoms/context-menu"
 import { MenuItemSeparator, MenuItemText, useShowContextMenu } from "~/atoms/context-menu"
-import { useGeneralSettingSelector } from "~/atoms/settings/general"
+import { useGeneralSettingKey, useGeneralSettingSelector } from "~/atoms/settings/general"
 import { ROUTE_FEED_IN_FOLDER } from "~/constants"
 import { useAddFeedToFeedList } from "~/hooks/biz/useFeedActions"
 import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry"
@@ -362,8 +362,28 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
   )
 }
 
+function FilterReadFeedCategory(props: FeedCategoryProps) {
+  const unread = useFeedUnreadStore(
+    useCallback(
+      (state) => props.data.reduce((acc, feedId) => (state.data[feedId] || 0) + acc, 0),
+      [props.data],
+    ),
+  )
+  if (!unread) return null
+  return <FeedCategoryImpl {...props} />
+}
+
 export const FeedCategory = memo(FeedCategoryImpl)
 
+export function FeedCategoryAutoHideUnread(props: FeedCategoryProps) {
+  const hideAllReadSubscriptions = useGeneralSettingKey("hideAllReadSubscriptions")
+  const unreadOnly = useGeneralSettingKey("unreadOnly")
+  if (hideAllReadSubscriptions && unreadOnly) {
+    return <FilterReadFeedCategory {...props} />
+  }
+  return <FeedCategoryImpl {...props} />
+}
+
 const RenameCategoryForm: FC<{
   currentCategory: string
   onFinished: () => void
diff --git a/apps/desktop/layer/renderer/src/modules/timeline-column/FeedItem.tsx b/apps/desktop/layer/renderer/src/modules/timeline-column/FeedItem.tsx
@@ -230,8 +230,8 @@ export const FeedItem = memo(FeedItemImpl)
 
 export const FeedItemAutoHideUnread: Component<FeedItemProps> = memo((props) => {
   const hideAllReadSubscriptions = useGeneralSettingKey("hideAllReadSubscriptions")
-
-  if (hideAllReadSubscriptions) return createElement(FilterReadFeedItem, props)
+  const unreadOnly = useGeneralSettingKey("unreadOnly")
+  if (hideAllReadSubscriptions && unreadOnly) return createElement(FilterReadFeedItem, props)
   return createElement(FeedItemImpl, props)
 })
 
diff --git a/apps/desktop/layer/renderer/src/modules/timeline-column/sort-by/SortByAlphabeticalList.tsx b/apps/desktop/layer/renderer/src/modules/timeline-column/sort-by/SortByAlphabeticalList.tsx
@@ -6,7 +6,7 @@ import { getPreferredTitle, useFeedStore } from "~/store/feed"
 import { useSubscriptionStore } from "~/store/subscription"
 
 import { useFeedListSortSelector } from "../atom"
-import { FeedCategory } from "../FeedCategory"
+import { FeedCategoryAutoHideUnread } from "../FeedCategory"
 import { InboxItem, ListItemAutoHideUnread } from "../FeedItem"
 import type { FeedListProps, ListListProps } from "./types"
 
@@ -82,7 +82,7 @@ export const SortByAlphabeticalFeedList = ({
   return (
     <Fragment>
       {sortedByAlphabetical.map((category) => (
-        <FeedCategory
+        <FeedCategoryAutoHideUnread
           key={category}
           data={data[category]!}
           view={view}
diff --git a/apps/desktop/layer/renderer/src/modules/timeline-column/sort-by/SortByUnreadList.tsx b/apps/desktop/layer/renderer/src/modules/timeline-column/sort-by/SortByUnreadList.tsx
@@ -3,7 +3,7 @@ import { Fragment, useCallback } from "react"
 import { useFeedUnreadStore } from "~/store/unread"
 
 import { useFeedListSortSelector } from "../atom"
-import { FeedCategory } from "../FeedCategory"
+import { FeedCategoryAutoHideUnread } from "../FeedCategory"
 import type { FeedListProps } from "./types"
 
 export const SortByUnreadFeedList = ({ view, data, categoryOpenStateData }: FeedListProps) => {
@@ -41,7 +41,7 @@ export const SortByUnreadFeedList = ({ view, data, categoryOpenStateData }: Feed
   return (
     <Fragment>
       {sortedByUnread?.map(([category, ids]) => (
-        <FeedCategory
+        <FeedCategoryAutoHideUnread
           key={category}
           data={ids}
           view={view}
