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: streamline memo editor insert menu
Johnnyfcb9e377c109
diff --git a/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx b/web/src/components/MemoEditor/Toolbar/InsertMenu.tsxindex 02d3ed893..d28c19b78 100644--- a/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx+++ b/web/src/components/MemoEditor/Toolbar/InsertMenu.tsx@@ -1,7 +1,7 @@import { LatLng } from "leaflet";import { uniqBy } from "lodash-es";-import { FileIcon, LinkIcon, LoaderIcon, MapPinIcon, Maximize2Icon, MoreHorizontalIcon, PlusIcon } from "lucide-react";-import { useEffect, useState } from "react";+import { FileIcon, LinkIcon, LoaderIcon, MapPinIcon, Maximize2Icon, MoreHorizontalIcon, PlusIcon, type LucideIcon } from "lucide-react";+import { useCallback, useEffect, useMemo, useState } from "react";import { useDebounce } from "react-use";import { useReverseGeocoding } from "@/components/map";import { Button } from "@/components/ui/button";@@ -26,6 +26,7 @@ import type { LocalFile } from "../types/attachment";const InsertMenu = (props: InsertMenuProps) => {const t = useTranslate();const { state, actions, dispatch } = useEditorContext();+ const { location: initialLocation, onLocationChange, onToggleFocusMode, isUploading: isUploadingProp } = props;const [linkDialogOpen, setLinkDialogOpen] = useState(false);const [locationDialogOpen, setLocationDialogOpen] = useState(false);@@ -70,11 +71,15 @@ const InsertMenu = (props: InsertMenuProps) => {}}, [displayName]);- const isUploading = selectingFlag || props.isUploading;+ const isUploading = selectingFlag || isUploadingProp;- const handleLocationClick = () => {+ const handleOpenLinkDialog = useCallback(() => {+ setLinkDialogOpen(true);+ }, []);++ const handleLocationClick = useCallback(() => {setLocationDialogOpen(true);- if (!props.location && !location.locationInitialized) {+ if (!initialLocation && !location.locationInitialized) {if (navigator.geolocation) {navigator.geolocation.getCurrentPosition((position) => {@@ -86,24 +91,54 @@ const InsertMenu = (props: InsertMenuProps) => {);}}- };+ }, [initialLocation, location]);- const handleLocationConfirm = () => {+ const handleLocationConfirm = useCallback(() => {const newLocation = location.getLocation();if (newLocation) {- props.onLocationChange(newLocation);+ onLocationChange(newLocation);setLocationDialogOpen(false);}- };+ }, [location, onLocationChange]);- const handleLocationCancel = () => {+ const handleLocationCancel = useCallback(() => {location.reset();setLocationDialogOpen(false);- };+ }, [location]);- const handlePositionChange = (position: LatLng) => {+ const handlePositionChange = useCallback((position: LatLng) => {location.handlePositionChange(position);- };+ }, [location]);++ const handleToggleFocusMode = useCallback(() => {+ onToggleFocusMode?.();+ setMoreSubmenuOpen(false);+ }, [onToggleFocusMode]);++ const menuItems = useMemo(+ () =>+ [+ {+ key: "upload",+ label: t("common.upload"),+ icon: FileIcon,+ onClick: handleUploadClick,+ },+ {+ key: "link",+ label: t("tooltip.link-memo"),+ icon: LinkIcon,+ onClick: handleOpenLinkDialog,+ },+ {+ key: "location",+ label: t("tooltip.select-location"),+ icon: MapPinIcon,+ onClick: handleLocationClick,+ },+ ] satisfies Array<{ key: string; label: string; icon: LucideIcon; onClick: () => void }>,+ [handleLocationClick, handleOpenLinkDialog, handleUploadClick, t],+ );return (<>@@ -114,18 +149,12 @@ const InsertMenu = (props: InsertMenuProps) => {</Button></DropdownMenuTrigger><DropdownMenuContent align="start">- <DropdownMenuItem onClick={handleUploadClick}>- <FileIcon className="w-4 h-4" />- {t("common.upload")}- </DropdownMenuItem>- <DropdownMenuItem onClick={() => setLinkDialogOpen(true)}>- <LinkIcon className="w-4 h-4" />- {t("tooltip.link-memo")}- </DropdownMenuItem>- <DropdownMenuItem onClick={handleLocationClick}>- <MapPinIcon className="w-4 h-4" />- {t("tooltip.select-location")}- </DropdownMenuItem>+ {menuItems.map((item) => (+ <DropdownMenuItem key={item.key} onClick={item.onClick}>+ <item.icon className="w-4 h-4" />+ {item.label}+ </DropdownMenuItem>+ ))}{/* View submenu with Focus Mode */}<DropdownMenuSub open={moreSubmenuOpen} onOpenChange={setMoreSubmenuOpen}><DropdownMenuSubTrigger onPointerEnter={handleTriggerEnter} onPointerLeave={handleTriggerLeave}>@@ -133,15 +162,9 @@ const InsertMenu = (props: InsertMenuProps) => {{t("common.more")}</DropdownMenuSubTrigger><DropdownMenuSubContent onPointerEnter={handleContentEnter} onPointerLeave={handleContentLeave}>- <DropdownMenuItem- onClick={() => {- props.onToggleFocusMode?.();- setMoreSubmenuOpen(false);- }}- >+ <DropdownMenuItem onClick={handleToggleFocusMode}><Maximize2Icon className="w-4 h-4" />{t("editor.focus-mode")}- <span className="ml-auto text-xs text-muted-foreground opacity-60">⌘⇧F</span></DropdownMenuItem></DropdownMenuSubContent></DropdownMenuSub>