From 735dd1fe4be5387e174b887858f9a539eebf84bd Mon Sep 17 00:00:00 2001 From: Johnny Date: Tue, 23 Dec 2025 19:05:29 +0800 Subject: [PATCH] style(MemoView): restore comments and formatting - Add back descriptive comments removed by editor refactoring commit - Restore original timestamp calculation format in MemoHeader - Improve code readability with section comments --- .../MemoView/components/MemoBody.tsx | 5 ++++- .../MemoView/components/MemoHeader.tsx | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/web/src/components/MemoView/components/MemoBody.tsx b/web/src/components/MemoView/components/MemoBody.tsx index 615feec43..d17d16080 100644 --- a/web/src/components/MemoView/components/MemoBody.tsx +++ b/web/src/components/MemoView/components/MemoBody.tsx @@ -15,6 +15,8 @@ interface Props { const MemoBody: React.FC = ({ compact, onContentClick, onContentDoubleClick, onToggleNsfwVisibility }) => { const t = useTranslate(); + + // Get shared state from context const { memo, readonly, parentPage, nsfw, showNSFWContent } = useMemoViewContext(); const referencedMemos = memo.relations.filter((relation) => relation.type === MemoRelation_Type.REFERENCE); @@ -34,7 +36,7 @@ const MemoBody: React.FC = ({ compact, onContentClick, onContentDoubleCli readonly={readonly} onClick={onContentClick} onDoubleClick={onContentDoubleClick} - compact={memo.pinned ? false : compact} + compact={memo.pinned ? false : compact} // Always show full content when pinned parentPage={parentPage} /> {memo.location && } @@ -43,6 +45,7 @@ const MemoBody: React.FC = ({ compact, onContentClick, onContentDoubleCli + {/* NSFW content overlay */} {nsfw && !showNSFWContent && ( <>
diff --git a/web/src/components/MemoView/components/MemoHeader.tsx b/web/src/components/MemoView/components/MemoHeader.tsx index 411270398..bb3a782bb 100644 --- a/web/src/components/MemoView/components/MemoHeader.tsx +++ b/web/src/components/MemoView/components/MemoHeader.tsx @@ -38,18 +38,24 @@ const MemoHeader: React.FC = ({ onReactionSelectorOpenChange, }) => { const t = useTranslate(); + + // Get shared state from context const { memo, creator, isArchived, commentAmount, isInMemoDetailPage, parentPage, readonly, relativeTimeFormat, nsfw, showNSFWContent } = useMemoViewContext(); - const timestamp = memo.displayTime ? timestampDate(memo.displayTime) : undefined; const displayTime = isArchived ? ( - timestamp?.toLocaleString(i18n.language) + (memo.displayTime ? timestampDate(memo.displayTime) : undefined)?.toLocaleString(i18n.language) ) : ( - + ); return (
+ {/* Left section: Creator info or time */}
{showCreator && creator ? ( @@ -58,7 +64,9 @@ const MemoHeader: React.FC = ({ )}
+ {/* Right section: Actions */}
+ {/* Reaction selector */} {!isArchived && ( = ({ /> )} + {/* Comment count link */} {!isInMemoDetailPage && ( = ({ )} + {/* Visibility icon */} {showVisibility && memo.visibility !== Visibility.PRIVATE && ( @@ -95,6 +105,7 @@ const MemoHeader: React.FC = ({ )} + {/* Pinned indicator */} {showPinned && memo.pinned && ( @@ -110,12 +121,14 @@ const MemoHeader: React.FC = ({ )} + {/* NSFW hide button */} {nsfw && showNSFWContent && onToggleNsfwVisibility && ( )} + {/* Action menu */}