优化归档页、图标

This commit is contained in:
anian
2026-07-04 16:56:31 +08:00
parent adb151dc53
commit 70ab5ef059
6 changed files with 34 additions and 42 deletions
@@ -1,7 +1,7 @@
import { BookmarkIcon } from "lucide-react";
import { ArchiveIcon, BookmarkIcon } from "lucide-react";
import { useCallback, useState } from "react";
import { Link } from "react-router-dom";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import useNavigateTo from "@/hooks/useNavigateTo";
import i18n from "@/i18n";
import { cn } from "@/lib/utils";
@@ -12,7 +12,6 @@ import MemoActionMenu from "../../MemoActionMenu";
import { ReactionSelector } from "../../MemoReactionListView";
import UserAvatar from "../../UserAvatar";
import VisibilityIcon from "../../VisibilityIcon";
import { useMemoActions } from "../hooks";
import { useMemoViewContext, useMemoViewDerived } from "../MemoViewContext";
import type { MemoHeaderProps } from "../types";
@@ -28,8 +27,6 @@ const MemoHeader: React.FC<MemoHeaderProps> = ({ showCreator, showVisibility, sh
navigateTo(`/${memo.name}`, { state: { from: parentPage } });
}, [memo.name, parentPage, navigateTo]);
const { unpinMemo } = useMemoActions(memo);
const timeValue = isArchived ? (
memoDisplayTime?.toLocaleString(i18n.language)
) : (
@@ -58,7 +55,7 @@ const MemoHeader: React.FC<MemoHeaderProps> = ({ showCreator, showVisibility, sh
</div>
<div className="flex flex-row justify-end items-center select-none shrink-0 gap-2">
{currentUser && !isArchived && (
{currentUser && (
<ReactionSelector
className={cn("border-none w-auto h-auto", reactionSelectorOpen && "block!", "block sm:hidden sm:group-hover:block")}
memo={memo}
@@ -66,6 +63,32 @@ const MemoHeader: React.FC<MemoHeaderProps> = ({ showCreator, showVisibility, sh
/>
)}
{showPinned && memo.pinned && (
<Tooltip>
<TooltipTrigger asChild>
<span className="flex justify-center items-center rounded-md">
<BookmarkIcon className="w-4 h-auto text-muted-foreground" />
</span>
</TooltipTrigger>
<TooltipContent>
<p>{t("common.pinned")}</p>
</TooltipContent>
</Tooltip>
)}
{isArchived && (
<Tooltip>
<TooltipTrigger asChild>
<span className="flex justify-center items-center rounded-md">
<ArchiveIcon className="w-4 h-auto text-muted-foreground" />
</span>
</TooltipTrigger>
<TooltipContent>
<p>{t("common.archived")}</p>
</TooltipContent>
</Tooltip>
)}
{showVisibility && (
<Tooltip>
<TooltipTrigger>
@@ -79,21 +102,6 @@ const MemoHeader: React.FC<MemoHeaderProps> = ({ showCreator, showVisibility, sh
</Tooltip>
)}
{showPinned && memo.pinned && (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<span className="cursor-pointer">
<BookmarkIcon className="w-4 h-auto text-primary" onClick={unpinMemo} />
</span>
</TooltipTrigger>
<TooltipContent>
<p>{t("common.unpin")}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
)}
<MemoActionMenu memo={memo} readonly={readonly} onEdit={openEditor} />
</div>
</div>
@@ -1,3 +1,2 @@
export { useImagePreview } from "./useImagePreview";
export { useMemoActions } from "./useMemoActions";
export { useMemoHandlers } from "./useMemoHandlers";
@@ -1,13 +0,0 @@
import { useUpdateMemo } from "@/hooks/useMemoQueries";
import type { Memo } from "@/types/proto/api/v1/memo_service_pb";
export const useMemoActions = (memo: Memo) => {
const { mutateAsync: updateMemo } = useUpdateMemo();
const unpinMemo = async () => {
if (!memo.pinned) return;
await updateMemo({ update: { name: memo.name, pinned: false }, updateMask: ["pinned"] });
};
return { unpinMemo };
};