xiaoxue_admin
/
Folo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sort by preferred title, fix #390

This commit is contained in:
Stephen Zhou 2024-09-15 09:22:10 +08:00
parent a116dd4018
commit cc25c6785e
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/src/modules/feed-column/category.tsx
View File

@ -8,7 +8,7 @@ import { stopPropagation } from "@renderer/lib/dom"
import type { FeedViewType } from "@renderer/lib/enum"
import { showNativeMenu } from "@renderer/lib/native-menu"
import { cn, sortByAlphabet } from "@renderer/lib/utils"
import { useFeedStore } from "@renderer/store/feed"
import { getPreferredTitle, useFeedStore } from "@renderer/store/feed"
import { subscriptionActions, useSubscriptionByFeedId } from "@renderer/store/subscription"
import { useFeedUnreadStore } from "@renderer/store/unread"
import { useMutation } from "@tanstack/react-query"
@ -372,8 +372,8 @@ const SortByAlphabeticalList = (props: SortListProps) => {
const isDesc = useFeedListSortSelector((s) => s.order === "desc")
const sortedFeedList = useFeedStore((state) => {
const res = ids.sort((a, b) => {
const feedTitleA = state.feeds[a]?.title || ""
const feedTitleB = state.feeds[b]?.title || ""
const feedTitleA = getPreferredTitle(state.feeds[a]) || ""
const feedTitleB = getPreferredTitle(state.feeds[b]) || ""
return sortByAlphabet(feedTitleA, feedTitleB)
})

4
src/renderer/src/modules/feed-column/list.tsx
View File

@ -10,7 +10,7 @@ import { stopPropagation } from "@renderer/lib/dom"
import type { FeedViewType } from "@renderer/lib/enum"
import { cn, sortByAlphabet } from "@renderer/lib/utils"
import { Queries } from "@renderer/queries"
import { useFeedStore } from "@renderer/store/feed"
import { getPreferredTitle, useFeedStore } from "@renderer/store/feed"
import { getSubscriptionByFeedId, useSubscriptionByView } from "@renderer/store/subscription"
import { useFeedUnreadStore } from "@renderer/store/unread"
import { AnimatePresence, m } from "framer-motion"
@ -305,7 +305,7 @@ const SortByAlphabeticalList = ({ view, expansion, data }: FeedListProps) => {
if (!isSingle || hascategoryNameNotDefault) {
map[categoryName] = categoryName
} else {
map[categoryName] = feed.title!
map[categoryName] = getPreferredTitle(feed)!
}
}
return map