Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix(web): keep blurred memo content out of the detail sidebar (#6494)

Johnny28719a925fb2
diff --git a/web/src/components/AppSidebar/AppSidebar.tsx b/web/src/components/AppSidebar/AppSidebar.tsx
index 5b409410c..ae368bcc2 100644
--- a/web/src/components/AppSidebar/AppSidebar.tsx
+++ b/web/src/components/AppSidebar/AppSidebar.tsx
@@ -241,6 +241,7 @@ const MemoDetailSidebarContent = () => {
parentPage={memoDetail.from}
commentCount={memoDetail.commentCount}
forceReadonly={memoDetail.readonly}
+ contentHidden={memoDetail.contentHidden}
onEdit={runAndClose(memoDetail.onEdit)}
onCommentsOpen={runAndClose(memoDetail.onCommentsOpen)}
onCommentCreate={runAndClose(memoDetail.onCommentCreate)}
diff --git a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx
index 980609c1a..609a6a4a8 100644
--- a/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx
+++ b/web/src/components/MemoDetailSidebar/MemoDetailSidebar.tsx
@@ -20,10 +20,12 @@ import { useResolvedRelationMemos } from "@/components/MemoMetadata/Relation/use
import MemoParentPlaceholder, { type MemoParentStatus } from "@/components/MemoParentPlaceholder";
import { createMemoNavigationState } from "@/components/MemoView/navigation";
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { useAuth } from "@/contexts/AuthContext";
import { useInstance } from "@/contexts/InstanceContext";
import { useOverflowTitle } from "@/hooks";
import useCurrentUser from "@/hooks/useCurrentUser";
import { MEMO_COMMENTS_ANCHOR_ID } from "@/lib/memo-comments";
+import { isMemoBlurred } from "@/lib/tag";
import { cn } from "@/lib/utils";
import { State } from "@/types/proto/api/common_pb";
import { Memo, type MemoRelation, Visibility } from "@/types/proto/api/memo_service_pb";
@@ -45,6 +47,8 @@ interface Props {
onCommentCreate?: () => void;
onShareImageOpen?: () => void;
forceReadonly?: boolean;
+ /** The memo body is tag-blurred and not yet revealed; its outline would leak the headings. */
+ contentHidden?: boolean;
}
const normalizeSnippet = (value: string): string => value.replace(/\s+/g, " ").trim();
@@ -96,11 +100,13 @@ const MemoDetailSidebar = ({
onCommentCreate,
onShareImageOpen,
forceReadonly = false,
+ contentHidden = false,
}: Props) => {
const t = useTranslate();
const location = useLocation();
const currentUser = useCurrentUser();
const { profile } = useInstance();
+ const { userTagsSetting } = useAuth();
const [sharePanelOpen, setSharePanelOpen] = useState(false);
const readonly = forceReadonly || !canManageMemo(memo, currentUser);
@@ -113,7 +119,7 @@ const MemoDetailSidebar = ({
memo.state === State.NORMAL &&
memo.visibility !== Visibility.SPACE;
- const headings = useMemo(() => extractHeadings(memo.content), [memo.content]);
+ const headings = useMemo(() => (contentHidden ? [] : extractHeadings(memo.content)), [contentHidden, memo.content]);
const { referenced } = useMemo(() => getRelationBuckets(memo.relations, memo.name), [memo.relations, memo.name]);
const backlinkMemoNames = useMemo(
() =>
@@ -135,7 +141,8 @@ const MemoDetailSidebar = ({
return normalizeSnippet(relatedMemo.snippet || resolvedMemos[relatedMemo.name]?.snippet || relatedMemo.name);
};
- const parentSnippet = parentMemo ? normalizeSnippet(parentMemo.snippet || parentMemo.content || parentMemo.name) : "";
+ const parentBlurred = !!parentMemo && isMemoBlurred(parentMemo, userTagsSetting);
+ const parentSnippet = parentMemo && !parentBlurred ? normalizeSnippet(parentMemo.snippet || parentMemo.content || parentMemo.name) : "";
const showComments = !forceReadonly && commentCount !== undefined && commentCount > 0;
const showOnThisMemo = headings.length > 1 || showComments;
const showConnections = !forceReadonly && (!!parentMemo || !!parentStatus || referenced.length > 0);
@@ -175,15 +182,15 @@ const MemoDetailSidebar = ({
{parentStatus && <MemoParentPlaceholder status={parentStatus} onRetry={onParentRetry} />}
{!parentStatus && parentMemo && (
<Link
- aria-label={`${t("memo.parent-memo")}: ${parentSnippet}`}
+ aria-label={parentSnippet ? `${t("memo.parent-memo")}: ${parentSnippet}` : t("memo.parent-memo")}
className={cn(SIDEBAR_ROW_CLASSES, "text-muted-foreground hover:bg-sidebar-accent/65 hover:text-foreground")}
to={`/${parentMemo.name}`}
state={parentPage ? createMemoNavigationState(parentPage) : undefined}
- title={parentSnippet}
+ title={parentSnippet || undefined}
viewTransition
>
<SidebarRowIconSlot icon={CornerUpLeftIcon} />
- <span className="min-w-0 flex-1 truncate text-start">{parentSnippet}</span>
+ <span className="min-w-0 flex-1 truncate text-start">{parentSnippet || t("memo.parent-memo")}</span>
</Link>
)}
{referenced.map((relation) => {
diff --git a/web/src/components/MemoView/MemoView.tsx b/web/src/components/MemoView/MemoView.tsx
index 5ee970ed4..40986baa7 100644
--- a/web/src/components/MemoView/MemoView.tsx
+++ b/web/src/components/MemoView/MemoView.tsx
@@ -50,9 +50,19 @@ const MemoView = forwardRef<MemoViewHandle, MemoViewProps>((props, ref) => {
});
// Blur content when any tag has blur_content enabled in the current user's tag settings.
- const [showBlurredContent, setShowBlurredContent] = useState(false);
+ // The detail page controls the reveal so the sidebar outline can follow it.
+ const [localShowBlurredContent, setLocalShowBlurredContent] = useState(false);
+ const blurControlled = props.showBlurredContent !== undefined;
+ const showBlurredContent = props.showBlurredContent ?? localShowBlurredContent;
+ const onShowBlurredContentChange = props.onShowBlurredContentChange;
const blurred = isMemoBlurred(memoData, userTagsSetting);
- const toggleBlurVisibility = useCallback(() => setShowBlurredContent((prev) => !prev), []);
+ const toggleBlurVisibility = useCallback(() => {
+ const next = !showBlurredContent;
+ if (!blurControlled) {
+ setLocalShowBlurredContent(next);
+ }
+ onShowBlurredContentChange?.(next);
+ }, [blurControlled, onShowBlurredContentChange, showBlurredContent]);
const { previewState, openPreview, setPreviewOpen } = useImagePreview();
diff --git a/web/src/components/MemoView/types.ts b/web/src/components/MemoView/types.ts
index cb5f387c7..b512db767 100644
--- a/web/src/components/MemoView/types.ts
+++ b/web/src/components/MemoView/types.ts
@@ -15,6 +15,9 @@ export interface MemoViewProps {
parentPage?: string;
shareImageDialogOpen?: boolean;
onShareImageDialogOpenChange?: (open: boolean) => void;
+ /** Controls whether tag-blurred content is revealed; uncontrolled when omitted. */
+ showBlurredContent?: boolean;
+ onShowBlurredContentChange?: (show: boolean) => void;
}
export interface MemoViewHandle {
diff --git a/web/src/contexts/AppSidebarContext.tsx b/web/src/contexts/AppSidebarContext.tsx
index 07565896b..511376a40 100644
--- a/web/src/contexts/AppSidebarContext.tsx
+++ b/web/src/contexts/AppSidebarContext.tsx
@@ -14,6 +14,8 @@ export interface MemoDetailSidebarDescriptor {
from?: string;
commentCount?: number;
readonly?: boolean;
+ /** The memo body is tag-blurred and not yet revealed, so its outline stays hidden. */
+ contentHidden?: boolean;
onEdit?: () => void;
onCommentsOpen?: () => void;
onCommentCreate?: () => void;
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index 81ba600af..6873f2b39 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -16,10 +16,12 @@ import { useInfiniteMemoComments, useMemo } from "@/hooks/useMemoQueries";
import { useSharedMemo, withShareAttachmentLinks } from "@/hooks/useMemoShareQueries";
import { LEGACY_MEMO_COMMENTS_ANCHOR_ID, MEMO_COMMENTS_ANCHOR_ID } from "@/lib/memo-comments";
import { memoNamePrefix } from "@/lib/resource-names";
+import { isMemoBlurred } from "@/lib/tag";
import { ROUTES } from "@/router/routes";
import type { Attachment } from "@/types/proto/api/attachment_service_pb";
import { State } from "@/types/proto/api/common_pb";
import type { Memo } from "@/types/proto/api/memo_service_pb";
+import { useTranslate } from "@/utils/i18n";
import { findMemoAnchorTarget } from "@/utils/markdown-manipulation";
const MemoSidebarRegistration = ({
@@ -30,6 +32,7 @@ const MemoSidebarRegistration = ({
from,
commentCount,
readonly,
+ contentHidden,
onEdit,
onCommentsOpen,
onCommentCreate,
@@ -42,6 +45,7 @@ const MemoSidebarRegistration = ({
from: string;
commentCount?: number;
readonly: boolean;
+ contentHidden: boolean;
onEdit: () => void;
onCommentsOpen: () => void;
onCommentCreate: () => void;
@@ -58,6 +62,7 @@ const MemoSidebarRegistration = ({
from,
commentCount,
readonly,
+ contentHidden,
onEdit,
onCommentsOpen,
onCommentCreate,
@@ -65,6 +70,7 @@ const MemoSidebarRegistration = ({
});
}, [
commentCount,
+ contentHidden,
from,
memo,
onCommentCreate,
@@ -84,7 +90,8 @@ const MemoSidebarRegistration = ({
};
const MemoDetail = () => {
- const { currentUser, isInitialized: authInitialized } = useAuth();
+ const t = useTranslate();
+ const { currentUser, isInitialized: authInitialized, userTagsSetting } = useAuth();
const { isInitialized: instanceInitialized } = useInstance();
const [shareImageDialogOpen, setShareImageDialogOpen] = useState(false);
const params = useParams();
@@ -118,6 +125,11 @@ const MemoDetail = () => {
const resolvedOrigin = resolveMemoDetailOrigin(locationState, { memoArchived: memo?.state === State.ARCHIVED });
const parentPage = !hasExplicitOrigin && !currentUser && memo?.state !== State.ARCHIVED ? ROUTES.EXPLORE : resolvedOrigin;
const memoName = memo?.name ?? memoNameFromParams;
+ // Keyed by memo so another memo never renders revealed; cleared on leave so returning blurs again.
+ const [blurRevealedMemoName, setBlurRevealedMemoName] = useState<string>();
+ const showBlurredContent = blurRevealedMemoName === memoName;
+ const handleShowBlurredContentChange = useCallback((show: boolean) => setBlurRevealedMemoName(show ? memoName : undefined), [memoName]);
+ useEffect(() => setBlurRevealedMemoName(undefined), [memoName]);
const displayMemo = useReactMemo(() => {
if (!memo) return undefined;
if (!isShareMode) return memo;
@@ -216,6 +228,8 @@ const MemoDetail = () => {
if (isLoading || !memo || !displayMemo || !authInitialized || !instanceInitialized) {
return null;
}
+ const contentHidden = isMemoBlurred(displayMemo, userTagsSetting) && !showBlurredContent;
+ const parentBlurred = !!parentMemo && isMemoBlurred(parentMemo, userTagsSetting);
const mentionResolutionContents = [displayMemo.content, ...comments.map((comment) => comment.content)];
const userResolutionNames = Array.from(
new Set([displayMemo, ...comments].flatMap((item) => [item.creator, ...(item.reactions ?? []).map((reaction) => reaction.creator)])),
@@ -231,6 +245,7 @@ const MemoDetail = () => {
from={parentPage}
commentCount={isShareMode ? undefined : commentCount}
readonly={isShareMode}
+ contentHidden={contentHidden}
onEdit={handleEdit}
onCommentsOpen={handleCommentsOpen}
onCommentCreate={handleCommentCreate}
@@ -252,7 +267,7 @@ const MemoDetail = () => {
viewTransition
>
<ArrowUpLeftFromCircleIcon className="w-4 h-auto shrink-0 opacity-60 mr-2" />
- <span className="truncate">{parentMemo.content}</span>
+ <span className="truncate">{parentBlurred ? t("memo.parent-memo") : parentMemo.content}</span>
</Link>
</div>
)}
@@ -263,6 +278,8 @@ const MemoDetail = () => {
compact={false}
parentPage={parentPage}
shareImageDialogOpen={shareImageDialogOpen}
+ showBlurredContent={showBlurredContent}
+ onShowBlurredContentChange={handleShowBlurredContentChange}
showCreator
showVisibility
showPinned
diff --git a/web/tests/memo-detail-sidebar.test.tsx b/web/tests/memo-detail-sidebar.test.tsx
index 5fabc54a6..6831da6d6 100644
--- a/web/tests/memo-detail-sidebar.test.tsx
+++ b/web/tests/memo-detail-sidebar.test.tsx
@@ -13,9 +13,15 @@ import {
MemoSchema,
Visibility,
} from "@/types/proto/api/memo_service_pb";
+import {
+ UserSetting_TagMetadataSchema,
+ type UserSetting_TagsSetting,
+ UserSetting_TagsSettingSchema,
+} from "@/types/proto/api/user_service_pb";
const copyToClipboard = vi.hoisted(() => vi.fn());
const currentUserState = vi.hoisted(() => ({ value: { name: "users/alice" } as { name: string } | undefined }));
+const authState = vi.hoisted(() => ({ tagsSetting: undefined as UserSetting_TagsSetting | undefined }));
vi.mock("copy-to-clipboard", () => ({ default: copyToClipboard }));
vi.mock("react-hot-toast", () => ({ default: { success: vi.fn() } }));
@@ -24,6 +30,7 @@ vi.mock("@/components/MemoDetailSidebar/MemoOutline", () => ({
}));
vi.mock("@/components/MemoDetailSidebar/MemoSharePanel", () => ({ default: () => <div data-testid="share-panel" /> }));
vi.mock("@/components/MemoMetadata/Relation/useResolvedRelationMemos", () => ({ useResolvedRelationMemos: () => ({}) }));
+vi.mock("@/contexts/AuthContext", () => ({ useAuth: () => ({ userTagsSetting: authState.tagsSetting }) }));
vi.mock("@/contexts/InstanceContext", () => ({ useInstance: () => ({ profile: { instanceUrl: "https://memos.example/" } }) }));
vi.mock("@/hooks/useCurrentUser", () => ({ default: () => currentUserState.value }));
vi.mock("@/utils/i18n", () => ({
@@ -44,6 +51,34 @@ describe("MemoDetailSidebar", () => {
beforeEach(() => {
copyToClipboard.mockReset();
currentUserState.value = { name: "users/alice" };
+ authState.tagsSetting = undefined;
+ });
+
+ it("keeps a blurred memo's headings and a blurred parent's text out of the sidebar", () => {
+ authState.tagsSetting = create(UserSetting_TagsSettingSchema, {
+ tags: { secret: create(UserSetting_TagMetadataSchema, { blurContent: true }) },
+ });
+ const memo = create(MemoSchema, {
+ name: "memos/detail",
+ state: State.NORMAL,
+ content: "# Secret plan\n\n## Step one",
+ tags: ["secret"],
+ });
+ const parentMemo = create(MemoSchema, { name: "memos/parent", content: "Secret parent", tags: ["secret"] });
+
+ const { rerender } = renderSidebar(<MemoDetailSidebar memo={memo} parentMemo={parentMemo} contentHidden />);
+
+ expect(screen.queryByTestId("outline")).not.toBeInTheDocument();
+ expect(screen.queryByText("memo.on-this-memo")).not.toBeInTheDocument();
+ expect(screen.queryByText("Secret parent")).not.toBeInTheDocument();
+ expect(screen.getByRole("link", { name: "memo.parent-memo" })).toHaveAttribute("href", "/memos/parent");
+
+ rerender(
+ <MemoryRouter initialEntries={["/memos/detail"]}>
+ <MemoDetailSidebar memo={memo} parentMemo={parentMemo} contentHidden={false} />
+ </MemoryRouter>,
+ );
+ expect(screen.getByTestId("outline")).toHaveTextContent("2");
});
it("leaves returning to the origin to browser back and the app navigation", () => {