fix: lists date group

This commit is contained in:
DIYgod 2024-09-23 18:32:17 +08:00
parent 36fbbddc6d
commit b57f43fbcc
No known key found for this signature in database
2 changed files with 14 additions and 4 deletions

View File

@ -9,9 +9,11 @@ import { ActionButton } from "~/components/ui/button"
import { RelativeDay } from "~/components/ui/datetime"
import { useScrollViewElement } from "~/components/ui/scroll-area/hooks"
import { IconScaleTransition } from "~/components/ux/transition/icon"
import { useRouteParams } from "~/hooks/biz/useRouteParams"
import { stopPropagation } from "~/lib/dom"
import { FeedViewType } from "~/lib/enum"
import { cn } from "~/lib/utils"
import { isListSubscription } from "~/store/subscription"
import { useMarkAllByRoute } from "../hooks/useMarkAll"
@ -103,6 +105,9 @@ const DateItemInner: FC<{
const timerRef = useRef<any>()
const W = Wrapper ?? SafeFragment
const { feedId } = useRouteParams()
const isList = isListSubscription(feedId)
return (
<div
className={cn(className, isSticky && "border-b")}
@ -131,7 +136,7 @@ const DateItemInner: FC<{
setConfirmMark(true)
}
}}
className="size-7 text-base"
className={cn("size-7 text-base", isList && "pointer-events-none opacity-0")}
>
<IconScaleTransition
icon1="i-mgc-check-filled text-green-600"

View File

@ -9,8 +9,9 @@ import { useGeneralSettingKey } from "~/atoms/settings/general"
import { m } from "~/components/common/Motion"
import { EmptyIcon } from "~/components/icons/empty"
import { ReactVirtuosoItemPlaceholder } from "~/components/ui/placeholder"
import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams"
import { useRouteParams } from "~/hooks/biz/useRouteParams"
import { useEntry } from "~/store/entry"
import { isListSubscription } from "~/store/subscription"
import { DateItem } from "./components/DateItem"
import { EntryColumnShortcutHandler } from "./EntryColumnShortcutHandler"
@ -132,10 +133,14 @@ const EntryHeadDateItem: FC<{
}> = memo(({ entryId }) => {
const entry = useEntry(entryId)
const view = useRouteParamsSelector((s) => s.view)
const routeParams = useRouteParams()
const { feedId, view } = routeParams
const isList = isListSubscription(feedId)
if (!entry) return <ReactVirtuosoItemPlaceholder />
const date = new Date(entry.entries.publishedAt).toDateString()
const date = new Date(
isList ? entry.entries.insertedAt : entry.entries.publishedAt,
).toDateString()
return <DateItem date={date} view={view} />
})