gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-28 18:18:55 +01:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

chore(react/collections/geomap): bring back map context menu

Browse Source
This commit is contained in:
Elian Doran 2025-09-04 21:46:05 +03:00
parent dd2b718974
commit 3b66522a5e
No known key found for this signature in database
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/client/src/widgets/collections/geomap/index.tsx
View File

@ -12,7 +12,7 @@ import markerIcon from "leaflet/dist/images/marker-icon.png";
import markerIconShadow from "leaflet/dist/images/marker-shadow.png"; import markerIconShadow from "leaflet/dist/images/marker-shadow.png";
import appContext from "../../../components/app_context"; import appContext from "../../../components/app_context";
import { createNewNote, moveMarker } from "./api"; import { createNewNote, moveMarker } from "./api";
import openContextMenu from "./context_menu"; import openContextMenu, { openMapContextMenu } from "./context_menu";
import toast from "../../../services/toast"; import toast from "../../../services/toast";
import { t } from "../../../services/i18n"; import { t } from "../../../services/i18n";
@ -66,6 +66,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
}; };
window.addEventListener("keydown", globalKeyListener); window.addEventListener("keydown", globalKeyListener);
}); });
const onClick = useCallback(async (e: LeafletMouseEvent) => { const onClick = useCallback(async (e: LeafletMouseEvent) => {
if (state === State.NewNote) { if (state === State.NewNote) {
toast.closePersistent("geo-new-note"); toast.closePersistent("geo-new-note");
@ -74,6 +75,10 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
} }
}, [ state ]); }, [ state ]);
const onContextMenu = useCallback((e: LeafletMouseEvent) => {
openMapContextMenu(note.noteId, e, !isReadOnly);
}, [ note.noteId, isReadOnly ]);
return ( return (
<div className={`geo-view ${state === State.NewNote ? "placing-note" : ""}`}> <div className={`geo-view ${state === State.NewNote ? "placing-note" : ""}`}>
<Map <Map
@ -86,6 +91,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
spacedUpdate.scheduleUpdate(); spacedUpdate.scheduleUpdate();
}} }}
onClick={onClick} onClick={onClick}
onContextMenu={onContextMenu}
> >
{notes.map(note => <NoteMarker note={note} editable={!isReadOnly} />)} {notes.map(note => <NoteMarker note={note} editable={!isReadOnly} />)}
</Map> </Map>

19
apps/client/src/widgets/collections/geomap/map.tsx
View File

@ -13,10 +13,11 @@ interface MapProps {
layerName: string; layerName: string;
viewportChanged: (coordinates: LatLng, zoom: number) => void; viewportChanged: (coordinates: LatLng, zoom: number) => void;
children: ComponentChildren; children: ComponentChildren;
onClick: (e: LeafletMouseEvent) => void; onClick?: (e: LeafletMouseEvent) => void;
onContextMenu?: (e: LeafletMouseEvent) => void;
} }
export default function Map({ coordinates, zoom, layerName, viewportChanged, children, onClick }: MapProps) { export default function Map({ coordinates, zoom, layerName, viewportChanged, children, onClick, onContextMenu }: MapProps) {
const mapRef = useRef<L.Map>(null); const mapRef = useRef<L.Map>(null);
const containerRef = useRef<HTMLDivElement>(null); const containerRef = useRef<HTMLDivElement>(null);
@ -82,7 +83,19 @@ export default function Map({ coordinates, zoom, layerName, viewportChanged, chi
}; };
}, [ mapRef, viewportChanged ]); }, [ mapRef, viewportChanged ]);
useEffect(() => { mapRef.current && mapRef.current.on("click", onClick) }, [ mapRef, onClick ]); useEffect(() => {
if (onClick && mapRef.current) {
mapRef.current.on("click", onClick);
return () => mapRef.current?.off("click", onClick);
}
}, [ mapRef, onClick ]);
useEffect(() => {
if (onContextMenu && mapRef.current) {
mapRef.current.on("contextmenu", onContextMenu);
return () => mapRef.current?.off("contextmenu", onContextMenu);
}
}, [ mapRef, onContextMenu ]);
return ( return (
<div <div

1
apps/client/src/widgets/view_widgets/geo_view/index.ts
View File

@ -54,7 +54,6 @@ export default class GeoView extends ViewMode<MapData> {
} }
const isEditable = !this.isReadOnly; const isEditable = !this.isReadOnly;
map.on("contextmenu", (e) => openMapContextMenu(this.parentNote.noteId, e, isEditable));
if (isEditable) { if (isEditable) {
setupDragging(this.$container, map, this.parentNote.noteId); setupDragging(this.$container, map, this.parentNote.noteId);