From 42b802b688f92e7077c5a828df4c62296c326bbf Mon Sep 17 00:00:00 2001 From: adamelmore <2363879+adamdottv@users.noreply.github.com> Date: Sat, 24 Jan 2026 12:19:39 -0600 Subject: fix(app): line selection ux fixes --- packages/ui/src/components/diff.tsx | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'packages/ui/src/components/diff.tsx') diff --git a/packages/ui/src/components/diff.tsx b/packages/ui/src/components/diff.tsx index 825a7e076..5aff93d1d 100644 --- a/packages/ui/src/components/diff.tsx +++ b/packages/ui/src/components/diff.tsx @@ -35,6 +35,13 @@ function findSide(node: Node | null): SelectionSide | undefined { const element = findElement(node) if (!element) return + const line = element.closest("[data-line], [data-alt-line]") + if (line instanceof HTMLElement) { + const type = line.dataset.lineType + if (type === "change-deletion") return "deletions" + if (type === "change-addition" || type === "change-additions") return "additions" + } + const code = element.closest("[data-code]") if (!(code instanceof HTMLElement)) return @@ -303,6 +310,12 @@ export function Diff(props: DiffProps) { numberColumn = numberColumn || item.dataset.columnNumber != null + if (side === undefined) { + const type = item.dataset.lineType + if (type === "change-deletion") side = "deletions" + if (type === "change-addition" || type === "change-additions") side = "additions" + } + if (side === undefined && item.dataset.code != null) { side = item.hasAttribute("data-deletions") ? "deletions" : "additions" } @@ -364,12 +377,28 @@ export function Diff(props: DiffProps) { if (props.enableLineSelection !== true) return if (dragStart === undefined) return - if (dragMoved) { - pendingSelectionEnd = true - scheduleDragUpdate() - scheduleSelectionUpdate() + if (!dragMoved) { + pendingSelectionEnd = false + const line = dragStart + const selected: SelectedLineRange = { + start: line, + end: line, + } + if (dragSide) selected.side = dragSide + setSelectedLines(selected) + props.onLineSelectionEnd?.(lastSelection) + dragStart = undefined + dragEnd = undefined + dragSide = undefined + dragEndSide = undefined + dragMoved = false + return } + pendingSelectionEnd = true + scheduleDragUpdate() + scheduleSelectionUpdate() + dragStart = undefined dragEnd = undefined dragSide = undefined -- cgit v1.2.3