diff --git a/backend/app/correspondence.py b/backend/app/correspondence.py index 87b3e15..13a595b 100644 --- a/backend/app/correspondence.py +++ b/backend/app/correspondence.py @@ -1153,7 +1153,7 @@ def _element_public(conn, element, page: Ctx) -> dict: if element is None: return {"title": "", "kind": "", "dates": {}} dates = _dates(conn, element["id"]) - return { + body = { "id": str(element["id"]), "title": element["title"], "kind": element["kind"], @@ -1163,6 +1163,10 @@ def _element_public(conn, element, page: Ctx) -> dict: "received_on": dump_date(dates["received_on"]), }, } + source = _evidence_source(conn, element["id"]) + if source: + body["external"] = {"source": source} + return body def _readable_uses(conn, actor, scope: Ctx, host_id: UUID, page: Ctx) -> list[dict]: diff --git a/frontend/src/pages/content.jsx b/frontend/src/pages/content.jsx index 8a373e5..05dacc8 100644 --- a/frontend/src/pages/content.jsx +++ b/frontend/src/pages/content.jsx @@ -1531,7 +1531,7 @@ export function ContentBoard({ function beginCarryPointer(event, payload) { if (pending || (event.button != null && event.button !== 0)) return; - if (event.target.closest("button, a, input, textarea, select")) return; + if (event.target.closest("button, input, textarea, select, label")) return; event.stopPropagation(); const carried = { ...payload, @@ -1541,32 +1541,20 @@ export function ContentBoard({ lastX: event.clientX, lastY: event.clientY, moved: false, + settled: false, useBindingId: "", release: false, - sourceNode: event.target.closest?.("[data-carry], .entry-mark") || event.target, + sourceNode: event.target.closest?.(".preview-row, .use-chip") || event.target, }; - function pointOf(x, y) { - const stack = document.elementsFromPoint(x, y); - return stack.find((node) => node !== carried.sourceNode && !carried.sourceNode?.contains(node)) || null; + function blockNativeDrag(native) { + native.preventDefault(); + native.stopPropagation(); } - function track(pointer) { - if (carryRef.current !== carried || pointer.pointerId !== carried.pointerId) return; - if (pointer.clientX || pointer.clientY) { - carried.lastX = pointer.clientX; - carried.lastY = pointer.clientY; - } - if (!carried.moved && Math.hypot(pointer.clientX - carried.anchorX, pointer.clientY - carried.anchorY) > 8) { - carried.moved = true; - if (carried.sourceNode) carried.sourceNode.dataset.dragged = "1"; - try { - carried.sourceNode?.setPointerCapture?.(pointer.pointerId); - } catch { - // The window listeners still follow the pointer. - } - } - if (!carried.moved) return; - pointer.preventDefault(); - const hit = pointOf(carried.lastX, carried.lastY); + function pointOf(x, y) { + return document.elementsFromPoint(x, y).find((node) => !carried.sourceNode?.contains(node)) || null; + } + function remember(x, y, sticky) { + const hit = pointOf(x, y); const useId = useDropId(hit); const ownChip = hit?.closest?.(`[data-carry="${carried.source}:${carried.elementId}"]`); if (useId && useId !== carried.bindingId) { @@ -1575,44 +1563,59 @@ export function ContentBoard({ setIndicator({ kind: "use", bindingId: useId }); return; } + if (sticky && (carried.useBindingId || carried.release)) return; carried.useBindingId = ""; const inside = Boolean(hit && rootRef.current?.contains(hit)); - if (inside && !ownChip && (carried.source === "attachment" || carried.source === "evidence")) { - carried.release = true; - setIndicator({ kind: "release" }); - return; + carried.release = Boolean(inside && !ownChip && (carried.source === "attachment" || carried.source === "evidence")); + setIndicator(carried.release ? { kind: "release" } : null); + } + function track(pointer) { + if (carryRef.current !== carried || (pointer.pointerId !== carried.pointerId && pointer.pointerId !== 0)) return; + if (pointer.clientX || pointer.clientY) { + carried.lastX = pointer.clientX; + carried.lastY = pointer.clientY; } - carried.release = false; - setIndicator(null); + if (!carried.moved && Math.hypot(carried.lastX - carried.anchorX, carried.lastY - carried.anchorY) > 6) { + carried.moved = true; + if (carried.sourceNode) carried.sourceNode.dataset.dragged = "1"; + } + if (!carried.moved) return; + pointer.preventDefault(); + remember(carried.lastX, carried.lastY, false); } function finish(pointer) { - if (pointer && pointer.pointerId !== carried.pointerId && pointer.pointerId !== 0) return; + if (carried.settled) return; + if (pointer && pointer.type !== "dragend" && pointer.pointerId !== carried.pointerId && pointer.pointerId !== 0) return; + carried.settled = true; window.removeEventListener("pointermove", track, true); window.removeEventListener("pointerup", finish, true); window.removeEventListener("pointercancel", finish, true); + window.removeEventListener("dragend", finish, true); + window.removeEventListener("dragstart", blockNativeDrag, true); if (carryRef.current !== carried) return; carryRef.current = null; setIndicator(null); if (!carried.moved) return; - const x = pointer && (pointer.clientX || pointer.clientY) ? pointer.clientX : carried.lastX; - const y = pointer && (pointer.clientX || pointer.clientY) ? pointer.clientY : carried.lastY; - const hit = pointOf(x, y); - const useId = (useDropId(hit) && useDropId(hit) !== carried.bindingId ? useDropId(hit) : "") || carried.useBindingId; - if (useId && useId !== carried.bindingId) { + const x = pointer && pointer.type !== "dragend" && (pointer.clientX || pointer.clientY) ? pointer.clientX : carried.lastX; + const y = pointer && pointer.type !== "dragend" && (pointer.clientX || pointer.clientY) ? pointer.clientY : carried.lastY; + remember(x, y, true); + if (carried.useBindingId && carried.useBindingId !== carried.bindingId) { window.addEventListener("click", (click) => { click.preventDefault(); click.stopPropagation(); }, { capture: true, once: true }); - placeUseRef.current?.(useId, carried); + placeUseRef.current?.(carried.useBindingId, carried); return; } - if (!carried.release) return; - if (carried.source === "attachment" || carried.source === "evidence") releaseRef.current?.(carried); + if (carried.release && (carried.source === "attachment" || carried.source === "evidence")) releaseRef.current?.(carried); } + if (event.target.closest(".entry-mark")) event.preventDefault(); carryRef.current = carried; + window.addEventListener("dragstart", blockNativeDrag, true); window.addEventListener("pointermove", track, true); window.addEventListener("pointerup", finish, true); window.addEventListener("pointercancel", finish, true); + window.addEventListener("dragend", finish, true); } function bindingByElement(elementId) { @@ -2077,12 +2080,32 @@ export function ContentBoard({ canSort && custom ? "preview-row--ordered" : "", ].filter(Boolean).join(" "); function openFromList(event) { + const row = event.currentTarget.closest(".preview-row"); + if (row?.dataset.dragged === "1") { + delete row.dataset.dragged; + event.preventDefault(); + return; + } if (!onOpen || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey || event.button !== 0) return; event.preventDefault(); onOpen(binding); } return ( -