Skip to content

Commit 676a41b

Browse files
committed
fix(web): scrolling over the thread minimap scrolls the chat
1 parent 5dcb59e commit 676a41b

3 files changed

Lines changed: 113 additions & 0 deletions

File tree

‎apps/web/src/components/chat/MessagesTimeline.tsx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ import { TimelineSystemDivider } from "./TimelineSystemDivider";
296296
import { SkillChipIcon, SkillInlineText } from "./SkillInlineText";
297297
import * as DateTime from "effect/DateTime";
298298
import { formatWorkspaceRelativePath } from "../../filePathDisplay";
299+
import { forwardWheelToTimeline } from "./timelineMinimapWheel";
299300
import {
300301
buildReviewCommentRenderablePatch,
301302
formatReviewCommentFence,
@@ -1539,6 +1540,14 @@ const ConversationTimeline = memo(function ConversationTimeline({
15391540
[],
15401541
);
15411542

1543+
const forwardMinimapWheel = useCallback(
1544+
(event: WheelEvent) => {
1545+
const scrollNode = listRef.current?.getScrollableNode();
1546+
if (scrollNode) forwardWheelToTimeline(event, scrollNode);
1547+
},
1548+
[listRef],
1549+
);
1550+
15421551
if (
15431552
rows.length === 0 &&
15441553
!isWorking &&
@@ -1629,6 +1638,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
16291638
hitStripWidth={minimapHitStripWidth}
16301639
currentIndex={minimapCurrentIndex}
16311640
stripMap={minimapStripMap}
1641+
onWheel={forwardMinimapWheel}
16321642
onSelect={(item) => {
16331643
onManualNavigation();
16341644
void listRef.current?.scrollToIndex({
@@ -1709,16 +1719,26 @@ function TimelineMinimap({
17091719
currentIndex,
17101720
items,
17111721
stripMap,
1722+
onWheel,
17121723
onSelect,
17131724
}: {
17141725
hasPersistentGutter: boolean;
17151726
hitStripWidth: number;
17161727
currentIndex: number | null;
17171728
items: ReadonlyArray<TimelineMinimapItem>;
17181729
stripMap: Map<string, HTMLSpanElement>;
1730+
onWheel: (event: WheelEvent) => void;
17191731
onSelect: (item: TimelineMinimapItem) => void;
17201732
}) {
17211733
const [activeIndex, setActiveIndex] = useState<number | null>(null);
1734+
const wheelTargetRef = useCallback(
1735+
(node: HTMLDivElement | null) => {
1736+
if (!node) return;
1737+
node.addEventListener("wheel", onWheel, { passive: false });
1738+
return () => node.removeEventListener("wheel", onWheel);
1739+
},
1740+
[onWheel],
1741+
);
17221742

17231743
const resolvedActiveIndex =
17241744
activeIndex !== null && activeIndex < items.length ? activeIndex : null;
@@ -1793,6 +1813,7 @@ function TimelineMinimap({
17931813
)}
17941814
data-testid="timeline-minimap"
17951815
data-persistent-gutter={hasPersistentGutter ? "true" : "false"}
1816+
ref={wheelTargetRef}
17961817
>
17971818
<div className="relative h-full w-full select-none">
17981819
<div
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// @vitest-environment jsdom
2+
3+
import { describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { forwardWheelToTimeline } from "./timelineMinimapWheel";
6+
7+
function setup() {
8+
const timeline = document.createElement("div");
9+
const minimap = document.createElement("div");
10+
Object.defineProperty(timeline, "clientHeight", { value: 500 });
11+
const scrollBy = vi.fn();
12+
timeline.scrollBy = scrollBy as typeof timeline.scrollBy;
13+
const seen: WheelEvent[] = [];
14+
timeline.addEventListener("wheel", (event) => seen.push(event));
15+
minimap.addEventListener("wheel", (event) => forwardWheelToTimeline(event, timeline));
16+
document.body.append(timeline, minimap);
17+
const wheel = (init: WheelEventInit) => {
18+
const event = new WheelEvent("wheel", { bubbles: true, cancelable: true, ...init });
19+
minimap.dispatchEvent(event);
20+
return event;
21+
};
22+
return { timeline, scrollBy, seen, wheel };
23+
}
24+
25+
describe("forwardWheelToTimeline", () => {
26+
it("replays the wheel on the timeline and scrolls it instead of the minimap", () => {
27+
const { timeline, scrollBy, seen, wheel } = setup();
28+
const original = wheel({ deltaY: -120, clientX: 20, clientY: 300 });
29+
30+
expect(original.defaultPrevented).toBe(true);
31+
expect(seen).toHaveLength(1);
32+
expect(seen[0]?.target).toBe(timeline);
33+
expect(seen[0]?.deltaY).toBe(-120);
34+
expect(seen[0]?.clientY).toBe(300);
35+
expect(scrollBy).toHaveBeenCalledWith({ top: -120 });
36+
});
37+
38+
it.each([
39+
{ deltaMode: WheelEvent.DOM_DELTA_LINE, top: 48 },
40+
{ deltaMode: WheelEvent.DOM_DELTA_PAGE, top: 1500 },
41+
])("converts delta mode $deltaMode to pixels", ({ deltaMode, top }) => {
42+
const { scrollBy, wheel } = setup();
43+
wheel({ deltaY: 3, deltaMode });
44+
expect(scrollBy).toHaveBeenCalledWith({ top });
45+
});
46+
47+
it("lets a timeline listener cancel the scroll", () => {
48+
const { timeline, scrollBy, wheel } = setup();
49+
timeline.addEventListener("wheel", (event) => event.preventDefault());
50+
wheel({ deltaY: 40 });
51+
expect(scrollBy).not.toHaveBeenCalled();
52+
});
53+
54+
it.each([{ deltaY: 40, ctrlKey: true }, { deltaX: 40 }])(
55+
"leaves pinch zoom and horizontal wheels alone: %j",
56+
(init) => {
57+
const { scrollBy, seen, wheel } = setup();
58+
expect(wheel(init).defaultPrevented).toBe(false);
59+
expect(seen).toHaveLength(0);
60+
expect(scrollBy).not.toHaveBeenCalled();
61+
},
62+
);
63+
});
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
export function forwardWheelToTimeline(event: WheelEvent, timeline: HTMLElement): void {
2+
if (event.defaultPrevented || event.ctrlKey || event.deltaY === 0) return;
3+
event.preventDefault();
4+
5+
const forwarded = new WheelEvent("wheel", {
6+
bubbles: true,
7+
cancelable: true,
8+
deltaX: event.deltaX,
9+
deltaY: event.deltaY,
10+
deltaZ: event.deltaZ,
11+
deltaMode: event.deltaMode,
12+
clientX: event.clientX,
13+
clientY: event.clientY,
14+
screenX: event.screenX,
15+
screenY: event.screenY,
16+
altKey: event.altKey,
17+
metaKey: event.metaKey,
18+
shiftKey: event.shiftKey,
19+
});
20+
if (!timeline.dispatchEvent(forwarded)) return;
21+
22+
const pixelsPerUnit =
23+
event.deltaMode === WheelEvent.DOM_DELTA_LINE
24+
? 16
25+
: event.deltaMode === WheelEvent.DOM_DELTA_PAGE
26+
? timeline.clientHeight
27+
: 1;
28+
timeline.scrollBy({ top: event.deltaY * pixelsPerUnit });
29+
}

0 commit comments

Comments
 (0)