Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

chore(react/collections/geomap): bring back open on click

Browse Source
This commit is contained in:
Elian Doran
2025-09-04 16:51:03 +03:00
parent 0f9a529647
commit dd654fcd8d
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,10 @@ function NoteMarker({ note, editable }: { note: FNote, editable: boolean }) {
const latLng = location?.split(",", 2).map((el) => parseFloat(el)) as [ number, number ] | undefined; const latLng = location?.split(",", 2).map((el) => parseFloat(el)) as [ number, number ] | undefined;
const icon = useMemo(() => buildIcon(iconClass, colorClass ?? undefined, title, note.noteId), [ iconClass, colorClass, title, note.noteId]); const icon = useMemo(() => buildIcon(iconClass, colorClass ?? undefined, title, note.noteId), [ iconClass, colorClass, title, note.noteId]);
const onClick = useCallback(() => {
appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
}, [ note.noteId ]);
// Middle click to open in new tab // Middle click to open in new tab
const onMouseDown = useCallback((e: MouseEvent) => { const onMouseDown = useCallback((e: MouseEvent) => {
if (e.button === 1) { if (e.button === 1) {
@@ -83,9 +87,10 @@ function NoteMarker({ note, editable }: { note: FNote, editable: boolean }) {
return latLng && <Marker return latLng && <Marker
coordinates={latLng} coordinates={latLng}
icon={icon} icon={icon}
mouseDown={onMouseDown}
draggable={editable} draggable={editable}
dragged={editable ? onDragged : undefined} onMouseDown={onMouseDown}
onDragged={editable ? onDragged : undefined}
onClick={!editable ? onClick : undefined}
/> />
} }

21
apps/client/src/widgets/collections/geomap/marker.tsx
View File

@@ -5,12 +5,13 @@ import { DivIcon, Icon, LatLng, Marker as LeafletMarker, marker, MarkerOptions }
export interface MarkerProps { export interface MarkerProps {
coordinates: [ number, number ]; coordinates: [ number, number ];
icon?: Icon | DivIcon; icon?: Icon | DivIcon;
mouseDown?: (e: MouseEvent) => void; onClick?: () => void;
dragged?: ((newCoordinates: LatLng) => void); onMouseDown?: (e: MouseEvent) => void;
onDragged?: ((newCoordinates: LatLng) => void);
draggable?: boolean; draggable?: boolean;
} }
export default function Marker({ coordinates, icon, draggable, dragged, mouseDown }: MarkerProps) { export default function Marker({ coordinates, icon, draggable, onClick, onDragged, onMouseDown }: MarkerProps) {
const parentMap = useContext(ParentMap); const parentMap = useContext(ParentMap);
useEffect(() => { useEffect(() => {
@@ -25,21 +26,25 @@ export default function Marker({ coordinates, icon, draggable, dragged, mouseDow
const newMarker = marker(coordinates, options); const newMarker = marker(coordinates, options);
if (mouseDown) { if (onClick) {
newMarker.on("mousedown", e => mouseDown(e.originalEvent)); newMarker.on("click", () => onClick());
} }
if (dragged) { if (onMouseDown) {
newMarker.on("mousedown", e => onMouseDown(e.originalEvent));
}
if (onDragged) {
newMarker.on("moveend", e => { newMarker.on("moveend", e => {
const coordinates = (e.target as LeafletMarker).getLatLng(); const coordinates = (e.target as LeafletMarker).getLatLng();
dragged(coordinates); onDragged(coordinates);
}); });
} }
newMarker.addTo(parentMap); newMarker.addTo(parentMap);
return () => newMarker.removeFrom(parentMap); return () => newMarker.removeFrom(parentMap);
}, [ parentMap, coordinates, mouseDown ]); }, [ parentMap, coordinates, onMouseDown, onDragged ]);
return (<div />) return (<div />)
} }

7
apps/client/src/widgets/view_widgets/geo_view/markers.ts
View File

@@ -3,7 +3,6 @@ import type FNote from "../../../entities/fnote.js";
import openContextMenu from "./context_menu.js"; import openContextMenu from "./context_menu.js";
import server from "../../../services/server.js"; import server from "../../../services/server.js";
import { moveMarker } from "./editing.js"; import { moveMarker } from "./editing.js";
import appContext from "../../../components/app_context.js";
import L from "leaflet"; import L from "leaflet";
let gpxLoaded = false; let gpxLoaded = false;
@@ -13,12 +12,6 @@ export default function processNoteWithMarker(map: Map, note: FNote, location: s
openContextMenu(note.noteId, e, isEditable); openContextMenu(note.noteId, e, isEditable);
}); });
if (!isEditable) {
newMarker.on("click", (e) => {
appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
});
}
return newMarker; return newMarker;
} }