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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: move memo-metadata components to MemoView and MemoEditor
Johnnye761ef868420
diff --git a/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx b/web/src/components/MemoEditor/Toolbar/InsertMenu.tsxindex f36aa5640..02d3ed893 100644--- a/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx+++ b/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx@@ -4,7 +4,6 @@ import { FileIcon, LinkIcon, LoaderIcon, MapPinIcon, Maximize2Icon, MoreHorizontimport { useEffect, useState } from "react";import { useDebounce } from "react-use";import { useReverseGeocoding } from "@/components/map";-import type { LocalFile } from "@/components/memo-metadata";import { Button } from "@/components/ui/button";import {DropdownMenu,@@ -22,6 +21,7 @@ import { LinkMemoDialog, LocationDialog } from "../components";import { useFileUpload, useLinkMemo, useLocation } from "../hooks";import { useEditorContext } from "../state";import type { InsertMenuProps } from "../types";+import type { LocalFile } from "../types/attachment";const InsertMenu = (props: InsertMenuProps) => {const t = useTranslate();diff --git a/web/src/components/MemoEditor/components/AttachmentList.tsx b/web/src/components/MemoEditor/components/AttachmentList.tsxindex 55f7a4666..240bba8eb 100644--- a/web/src/components/MemoEditor/components/AttachmentList.tsx+++ b/web/src/components/MemoEditor/components/AttachmentList.tsx@@ -1,10 +1,10 @@import { ChevronDownIcon, ChevronUpIcon, FileIcon, Loader2Icon, PaperclipIcon, XIcon } from "lucide-react";import type { FC } from "react";-import type { LocalFile } from "@/components/memo-metadata/types";-import { toAttachmentItems } from "@/components/memo-metadata/types";import { cn } from "@/lib/utils";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import { formatFileSize, getFileTypeLabel } from "@/utils/format";+import type { LocalFile } from "../types/attachment";+import { toAttachmentItems } from "../types/attachment";interface AttachmentListProps {attachments: Attachment[];diff --git a/web/src/components/MemoEditor/components/EditorContent.tsx b/web/src/components/MemoEditor/components/EditorContent.tsxindex e371dd600..6abd22ab8 100644--- a/web/src/components/MemoEditor/components/EditorContent.tsx+++ b/web/src/components/MemoEditor/components/EditorContent.tsx@@ -1,9 +1,9 @@import { forwardRef } from "react";-import type { LocalFile } from "@/components/memo-metadata";import Editor, { type EditorRefActions } from "../Editor";import { useBlobUrls, useDragAndDrop } from "../hooks";import { useEditorContext } from "../state";import type { EditorContentProps } from "../types";+import type { LocalFile } from "../types/attachment";export const EditorContent = forwardRef<EditorRefActions, EditorContentProps>(({ placeholder }, ref) => {const { state, actions, dispatch } = useEditorContext();diff --git a/web/src/components/MemoEditor/hooks/useFileUpload.ts b/web/src/components/MemoEditor/hooks/useFileUpload.tsindex 2778da0b7..66bda31c9 100644--- a/web/src/components/MemoEditor/hooks/useFileUpload.ts+++ b/web/src/components/MemoEditor/hooks/useFileUpload.ts@@ -1,5 +1,5 @@import { useRef } from "react";-import type { LocalFile } from "@/components/memo-metadata";+import type { LocalFile } from "../types/attachment";export const useFileUpload = (onFilesSelected: (localFiles: LocalFile[]) => void) => {const fileInputRef = useRef<HTMLInputElement>(null);diff --git a/web/src/components/MemoEditor/services/uploadService.ts b/web/src/components/MemoEditor/services/uploadService.tsindex d579c92db..6c466f66d 100644--- a/web/src/components/MemoEditor/services/uploadService.ts+++ b/web/src/components/MemoEditor/services/uploadService.ts@@ -1,8 +1,8 @@import { create } from "@bufbuild/protobuf";-import type { LocalFile } from "@/components/memo-metadata";import { attachmentServiceClient } from "@/connect";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import { AttachmentSchema } from "@/types/proto/api/v1/attachment_service_pb";+import type { LocalFile } from "../types/attachment";export const uploadService = {async uploadFiles(localFiles: LocalFile[]): Promise<Attachment[]> {diff --git a/web/src/components/MemoEditor/state/actions.ts b/web/src/components/MemoEditor/state/actions.tsindex 89296f7da..ec46bd05a 100644--- a/web/src/components/MemoEditor/state/actions.ts+++ b/web/src/components/MemoEditor/state/actions.ts@@ -1,6 +1,6 @@-import type { LocalFile } from "@/components/memo-metadata";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import type { MemoRelation } from "@/types/proto/api/v1/memo_service_pb";+import type { LocalFile } from "../types/attachment";import type { EditorAction, EditorState, LoadingKey } from "./types";export const editorActions = {diff --git a/web/src/components/MemoEditor/state/types.ts b/web/src/components/MemoEditor/state/types.tsindex a0bd33380..48289b210 100644--- a/web/src/components/MemoEditor/state/types.ts+++ b/web/src/components/MemoEditor/state/types.ts@@ -1,7 +1,7 @@-import type { LocalFile } from "@/components/memo-metadata";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import type { Location, MemoRelation } from "@/types/proto/api/v1/memo_service_pb";import { Visibility } from "@/types/proto/api/v1/memo_service_pb";+import type { LocalFile } from "../types/attachment";export type LoadingKey = "saving" | "uploading" | "loading";diff --git a/web/src/components/memo-metadata/types.ts b/web/src/components/MemoEditor/types/attachment.tssimilarity index 89%rename from web/src/components/memo-metadata/types.tsrename to web/src/components/MemoEditor/types/attachment.tsindex 1e7a6bf90..78dd984ce 100644--- a/web/src/components/memo-metadata/types.ts+++ b/web/src/components/MemoEditor/types/attachment.ts@@ -1,16 +1,9 @@import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import { getAttachmentThumbnailUrl, getAttachmentType, getAttachmentUrl } from "@/utils/attachment";-export type DisplayMode = "edit" | "view";--export interface BaseMetadataProps {- mode: DisplayMode;- className?: string;-}-export type FileCategory = "image" | "video" | "document";-// Pure view model for rendering attachments and local files+// Unified view model for rendering attachments and local filesexport interface AttachmentItem {readonly id: string;readonly filename: string;@@ -22,6 +15,12 @@ export interface AttachmentItem {readonly isLocal: boolean;}+// For MemoEditor: local files being uploaded+export interface LocalFile {+ readonly file: File;+ readonly previewUrl: string;+}+function categorizeFile(mimeType: string): FileCategory {if (mimeType.startsWith("image/")) return "image";if (mimeType.startsWith("video/")) return "video";@@ -46,7 +45,7 @@ export function attachmentToItem(attachment: Attachment): AttachmentItem {export function fileToItem(file: File, blobUrl: string): AttachmentItem {return {- id: blobUrl, // Use blob URL as unique ID since we don't have a server ID yet+ id: blobUrl,filename: file.name,category: categorizeFile(file.type),mimeType: file.type,@@ -57,11 +56,6 @@ export function fileToItem(file: File, blobUrl: string): AttachmentItem {};}-export interface LocalFile {- readonly file: File;- readonly previewUrl: string;-}-export function toAttachmentItems(attachments: Attachment[], localFiles: LocalFile[] = []): AttachmentItem[] {return [...attachments.map(attachmentToItem), ...localFiles.map(({ file, previewUrl }) => fileToItem(file, previewUrl))];}diff --git a/web/src/components/MemoEditor/types/context.ts b/web/src/components/MemoEditor/types/context.tsindex 582d78545..456a9fdee 100644--- a/web/src/components/MemoEditor/types/context.ts+++ b/web/src/components/MemoEditor/types/context.ts@@ -1,7 +1,7 @@import { createContext } from "react";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import type { MemoRelation } from "@/types/proto/api/v1/memo_service_pb";-import type { LocalFile } from "../../memo-metadata";+import type { LocalFile } from "./attachment";export interface MemoEditorContextValue {attachmentList: Attachment[];diff --git a/web/src/components/MemoView/components/MemoBody.tsx b/web/src/components/MemoView/components/MemoBody.tsxindex 7e7eb4207..66c92fc4f 100644--- a/web/src/components/MemoView/components/MemoBody.tsx+++ b/web/src/components/MemoView/components/MemoBody.tsx@@ -3,9 +3,9 @@ import { MemoRelation_Type } from "@/types/proto/api/v1/memo_service_pb";import { useTranslate } from "@/utils/i18n";import MemoContent from "../../MemoContent";import { MemoReactionListView } from "../../MemoReactionListView";-import { AttachmentList, LocationDisplay, RelationList } from "../../memo-metadata";import { useMemoViewContext } from "../MemoViewContext";import type { MemoBodyProps } from "../types";+import { AttachmentList, LocationDisplay, RelationList } from "./metadata";const MemoBody: React.FC<MemoBodyProps> = ({ compact, onContentClick, onContentDoubleClick, onToggleNsfwVisibility }) => {const t = useTranslate();diff --git a/web/src/components/memo-metadata/AttachmentCard.tsx b/web/src/components/MemoView/components/metadata/AttachmentCard.tsxsimilarity index 51%rename from web/src/components/memo-metadata/AttachmentCard.tsxrename to web/src/components/MemoView/components/metadata/AttachmentCard.tsxindex baff7cb66..2aadfb76c 100644--- a/web/src/components/memo-metadata/AttachmentCard.tsx+++ b/web/src/components/MemoView/components/metadata/AttachmentCard.tsx@@ -1,21 +1,22 @@import { cn } from "@/lib/utils";-import type { AttachmentItem } from "./types";+import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";+import { getAttachmentType, getAttachmentUrl } from "@/utils/attachment";interface AttachmentCardProps {- item: AttachmentItem;- mode: "view";+ attachment: Attachment;onClick?: () => void;className?: string;}-const AttachmentCard = ({ item, onClick, className }: AttachmentCardProps) => {- const { category, filename, sourceUrl } = item;+const AttachmentCard = ({ attachment, onClick, className }: AttachmentCardProps) => {+ const attachmentType = getAttachmentType(attachment);+ const sourceUrl = getAttachmentUrl(attachment);- if (category === "image") {+ if (attachmentType === "image/*") {return (<imgsrc={sourceUrl}- alt={filename}+ alt={attachment.filename}className={cn("w-full h-full object-cover rounded-lg cursor-pointer", className)}onClick={onClick}loading="lazy"@@ -23,7 +24,7 @@ const AttachmentCard = ({ item, onClick, className }: AttachmentCardProps) => {);}- if (category === "video") {+ if (attachmentType === "video/*") {return <video src={sourceUrl} className={cn("w-full h-full object-cover rounded-lg", className)} controls preload="metadata" />;}diff --git a/web/src/components/memo-metadata/AttachmentList.tsx b/web/src/components/MemoView/components/metadata/AttachmentList.tsxsimilarity index 60%rename from web/src/components/memo-metadata/AttachmentList.tsxrename to web/src/components/MemoView/components/metadata/AttachmentList.tsxindex fa30d0b53..a5b793e1e 100644--- a/web/src/components/memo-metadata/AttachmentList.tsx+++ b/web/src/components/MemoView/components/metadata/AttachmentList.tsx@@ -1,15 +1,30 @@import { useState } from "react";import type { Attachment } from "@/types/proto/api/v1/attachment_service_pb";import { getAttachmentType, getAttachmentUrl } from "@/utils/attachment";-import MemoAttachment from "../MemoAttachment";-import PreviewImageDialog from "../PreviewImageDialog";+import MemoAttachment from "../../../MemoAttachment";+import PreviewImageDialog from "../../../PreviewImageDialog";import AttachmentCard from "./AttachmentCard";-import { separateMediaAndDocs, toAttachmentItems } from "./types";interface AttachmentListProps {attachments: Attachment[];}+function separateMediaAndDocs(attachments: Attachment[]): { media: Attachment[]; docs: Attachment[] } {+ const media: Attachment[] = [];+ const docs: Attachment[] = [];++ for (const attachment of attachments) {+ const attachmentType = getAttachmentType(attachment);+ if (attachmentType === "image/*" || attachmentType === "video/*") {+ media.push(attachment);+ } else {+ docs.push(attachment);+ }+ }++ return { media, docs };+}+const AttachmentList = ({ attachments }: AttachmentListProps) => {const [previewImage, setPreviewImage] = useState<{ open: boolean; urls: string[]; index: number }>({open: false,@@ -25,8 +40,7 @@ const AttachmentList = ({ attachments }: AttachmentListProps) => {setPreviewImage({ open: true, urls: imgUrls, index });};- const items = toAttachmentItems(attachments, []);- const { media: mediaItems, docs: docItems } = separateMediaAndDocs(items);+ const { media: mediaItems, docs: docItems } = separateMediaAndDocs(attachments);if (attachments.length === 0) {return null;@@ -36,13 +50,12 @@ const AttachmentList = ({ attachments }: AttachmentListProps) => {<>{mediaItems.length > 0 && (<div className="w-full flex flex-row justify-start overflow-auto gap-2">- {mediaItems.map((item) => (- <div key={item.id} className="max-w-[60%] w-fit flex flex-col justify-start items-start shrink-0">+ {mediaItems.map((attachment) => (+ <div key={attachment.name} className="max-w-[60%] w-fit flex flex-col justify-start items-start shrink-0"><AttachmentCard- item={item}- mode="view"+ attachment={attachment}onClick={() => {- handleImageClick(item.sourceUrl, attachments);+ handleImageClick(getAttachmentUrl(attachment), mediaItems);}}className="max-h-64 grow"/>@@ -53,16 +66,15 @@ const AttachmentList = ({ attachments }: AttachmentListProps) => {{docItems.length > 0 && (<div className="w-full flex flex-row justify-start overflow-auto gap-2">- {docItems.map((item) => {- const attachment = attachments.find((a) => a.name === item.id);- return attachment ? <MemoAttachment key={item.id} attachment={attachment} /> : null;- })}+ {docItems.map((attachment) => (+ <MemoAttachment key={attachment.name} attachment={attachment} />+ ))}</div>)}<PreviewImageDialogopen={previewImage.open}- onOpenChange={(open) => setPreviewImage((prev) => ({ ...prev, open }))}+ onOpenChange={(open: boolean) => setPreviewImage((prev) => ({ ...prev, open }))}imgUrls={previewImage.urls}initialIndex={previewImage.index}/>diff --git a/web/src/components/memo-metadata/LocationDisplay.tsx b/web/src/components/MemoView/components/metadata/LocationDisplay.tsxsimilarity index 95%rename from web/src/components/memo-metadata/LocationDisplay.tsxrename to web/src/components/MemoView/components/metadata/LocationDisplay.tsxindex 242f18066..991d254ca 100644--- a/web/src/components/memo-metadata/LocationDisplay.tsx+++ b/web/src/components/MemoView/components/metadata/LocationDisplay.tsx@@ -4,7 +4,7 @@ import { useState } from "react";import { LocationPicker } from "@/components/map";import { cn } from "@/lib/utils";import type { Location } from "@/types/proto/api/v1/memo_service_pb";-import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";+import { Popover, PopoverContent, PopoverTrigger } from "../../../ui/popover";interface LocationDisplayProps {location?: Location;diff --git a/web/src/components/memo-metadata/MetadataCard.tsx b/web/src/components/MemoView/components/metadata/MetadataCard.tsxsimilarity index 100%rename from web/src/components/memo-metadata/MetadataCard.tsxrename to web/src/components/MemoView/components/metadata/MetadataCard.tsxdiff --git a/web/src/components/memo-metadata/RelationCard.tsx b/web/src/components/MemoView/components/metadata/RelationCard.tsxsimilarity index 100%rename from web/src/components/memo-metadata/RelationCard.tsxrename to web/src/components/MemoView/components/metadata/RelationCard.tsxdiff --git a/web/src/components/memo-metadata/RelationList.tsx b/web/src/components/MemoView/components/metadata/RelationList.tsxsimilarity index 100%rename from web/src/components/memo-metadata/RelationList.tsxrename to web/src/components/MemoView/components/metadata/RelationList.tsxdiff --git a/web/src/components/memo-metadata/index.ts b/web/src/components/MemoView/components/metadata/index.tssimilarity index 53%rename from web/src/components/memo-metadata/index.tsrename to web/src/components/MemoView/components/metadata/index.tsindex 0ee65ef11..69a27257f 100644--- a/web/src/components/memo-metadata/index.ts+++ b/web/src/components/MemoView/components/metadata/index.ts@@ -1,11 +1,6 @@+export { default as AttachmentCard } from "./AttachmentCard";export { default as AttachmentList } from "./AttachmentList";export { default as LocationDisplay } from "./LocationDisplay";--// Base components (can be used for other metadata types)export { default as MetadataCard } from "./MetadataCard";export { default as RelationCard } from "./RelationCard";export { default as RelationList } from "./RelationList";--// Types-export type { AttachmentItem, FileCategory, LocalFile } from "./types";-export { attachmentToItem, fileToItem, filterByCategory, separateMediaAndDocs, toAttachmentItems } from "./types";