From a5350bc76e1c3356b878f7ff7c9d8cb3f3c5a897 Mon Sep 17 00:00:00 2001 From: Lars Date: Sun, 18 Oct 2026 14:21:08 +0200 Subject: [PATCH] Ordne Dokumente nur am Dokument-Symbol zu und halte das Ablageziel beim Loslassen fest. Co-authored-by: Cursor --- frontend/src/pages/content.jsx | 46 ++++++++++++++++++++++------------ frontend/src/styles.css | 26 +++++++++++++------ 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/frontend/src/pages/content.jsx b/frontend/src/pages/content.jsx index 13e5552..fdeac18 100644 --- a/frontend/src/pages/content.jsx +++ b/frontend/src/pages/content.jsx @@ -905,6 +905,7 @@ function EntryMark({ element, context, assignable = false, dropId = "", hot = fa ) : null} + {dropId ? ); } @@ -1113,9 +1114,9 @@ export function ContentBoard({ carried.moved = true; document.body.classList.add("is-carrying"); } - const mark = event.target?.closest?.("[data-assign-drop]"); + const mark = event.target?.closest?.(".entry-mark[data-assign-drop]"); const useId = mark?.getAttribute("data-assign-drop") || ""; - const blocked = !useId || useId === carried.bindingId || useId === carried.hostBindingId || carried.sourceNode?.contains(mark); + const blocked = !useId || useId === carried.bindingId || useId === carried.hostBindingId || carried.sourceRow?.contains(mark); if (!blocked) { carried.useBindingId = useId; carried.release = false; @@ -1169,10 +1170,10 @@ export function ContentBoard({ event.preventDefault(); if (carried.settled) return; carried.settled = true; - const mark = event.target?.closest?.("[data-assign-drop]"); + const mark = event.target?.closest?.(".entry-mark[data-assign-drop]"); const useId = mark?.getAttribute("data-assign-drop") || ""; const section = event.target?.closest?.("[data-section]"); - const assign = useId && useId !== carried.bindingId && useId !== carried.hostBindingId && !carried.sourceNode?.contains(mark); + const assign = useId && useId !== carried.bindingId && useId !== carried.hostBindingId && !carried.sourceRow?.contains(mark); carryRef.current = null; setIndicator(null); setCarrying(null); @@ -1623,8 +1624,15 @@ export function ContentBoard({ const root = rootRef.current; if (!root) return; root.querySelectorAll(".preview-row.is-assign-target").forEach((row) => row.classList.remove("is-assign-target")); + root.querySelectorAll(".entry-mark.is-assign-hot").forEach((mark) => mark.classList.remove("is-assign-hot")); if (!bindingId) return; - root.querySelector(`.preview-row[data-binding="${bindingId}"]`)?.classList.add("is-assign-target"); + const row = root.querySelector(`.preview-row[data-binding="${bindingId}"]`); + if (!row) return; + if (carried.source === "list") { + row.querySelector(":scope > .entry-mark")?.classList.add("is-assign-hot"); + return; + } + row.classList.add("is-assign-target"); } function beginCarryMotion() { document.body.classList.add("is-carrying"); @@ -1649,26 +1657,34 @@ export function ContentBoard({ function assignIdAt(x, y) { const root = rootRef.current; if (!root) return ""; - const marks = root.querySelectorAll("[data-assign-drop]"); + const marks = carried.source === "list" + ? root.querySelectorAll(".preview-row:not(.is-carry-source) > .entry-mark[data-assign-drop]") + : root.querySelectorAll(".entry-mark[data-assign-drop]"); + let best = ""; + let bestArea = Number.POSITIVE_INFINITY; for (const mark of marks) { - if (carried.sourceNode?.contains(mark)) continue; + if (carried.sourceRow?.contains(mark)) continue; const rect = mark.getBoundingClientRect(); if (rect.width < 1 || rect.height < 1) continue; if (x < rect.left || x > rect.right || y < rect.top || y > rect.bottom) continue; const useId = mark.getAttribute("data-assign-drop") || ""; if (!useId || useId === carried.bindingId || useId === carried.hostBindingId) continue; - return useId; + const area = rect.width * rect.height; + if (area < bestArea) { + best = useId; + bestArea = area; + } } - return ""; + return best; } function hitAt(x, y) { const direct = assignIdAt(x, y); if (direct) return { useId: direct }; const nodes = document.elementsFromPoint(x, y); for (const node of nodes) { - if (carried.sourceNode?.contains(node)) continue; - const mark = node.closest?.("[data-assign-drop]"); - if (!mark || carried.sourceNode?.contains(mark)) continue; + if (carried.sourceRow?.contains(node)) continue; + const mark = node.closest?.(".entry-mark[data-assign-drop]"); + if (!mark || carried.sourceRow?.contains(mark)) continue; const useId = mark.getAttribute("data-assign-drop") || ""; if (!useId || useId === carried.bindingId || useId === carried.hostBindingId) continue; return { useId }; @@ -1709,7 +1725,7 @@ export function ContentBoard({ setIndicator({ kind: "release", place: carried.place, chapterId: carried.chapterId, title: found.title || "" }); return; } - if (sticky && carried.useBindingId && !(x || y)) { + if (sticky && carried.useBindingId) { carried.release = false; paintAssignTarget(carried.useBindingId); setIndicator({ kind: "use", bindingId: carried.useBindingId }); @@ -2313,7 +2329,6 @@ export function ContentBoard({ "preview-row", draggingId === binding.id ? "is-dragging" : "", carrying && (binding.id === carrying.bindingId || binding.id === carrying.hostBindingId) ? "is-carry-source" : "", - indicator?.kind === "use" && indicator.bindingId === binding.id ? "is-assign-target" : "", selectedId === binding.id ? "is-selected" : "", picking && picked.has(binding.id) ? "is-picked" : "", picking ? "preview-row--picking" : "", @@ -2334,7 +2349,6 @@ export function ContentBoard({
  • { if (!canEdit || pending || picking || event.button !== 0) return; @@ -2437,7 +2451,7 @@ export function ContentBoard({ }} > {(switches, lists) => ( -
    +
    .entry-mark[data-assign-drop], +body.is-list-carry .preview-row:not(.is-carry-source) > .entry-mark[data-assign-drop] { + z-index: 2; } -body.is-list-carry .preview-row:not(.is-carry-source)[data-assign-drop], -body.is-list-carry .preview-row:not(.is-carry-source) .entry-mark[data-assign-drop], -body.is-list-carry .preview-row:not(.is-carry-source) .preview-row__body[data-assign-drop] { - box-shadow: inset 0 0 0 2px var(--accent); +body.is-list-intent .preview-row:not(.is-carry-source) > .entry-mark[data-assign-drop] .entry-mark__drop, +body.is-list-carry .preview-row:not(.is-carry-source) > .entry-mark[data-assign-drop] .entry-mark__drop { + display: block; } .preview-row.is-assign-target { background: var(--accent-light); } .entry-mark.is-assign-hot { background: var(--accent-light); } +.entry-mark__drop { + display: none; + position: absolute; + inset: -6px; + border: 2px dashed var(--accent); + border-radius: 12px; + pointer-events: none; +} +.entry-mark.is-assign-hot .entry-mark__drop { + border-style: solid; + background: var(--accent-light); +} .preview-row__title, .preview-row__text { touch-action: none; } .content-section.is-release-target { background: var(--accent-light);