Skip to content

Commit 50b8d81

Browse files
committed
fix(web): mouse wheel over the thread minimap glides instead of jumping
1 parent 91f66f8 commit 50b8d81

2 files changed

Lines changed: 133 additions & 1 deletion

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { describe, expect, it, vi } from "vite-plus/test";
2+
3+
import { fakeTimers } from "../../../test/render";
4+
import { forwardWheelToTimeline } from "./timelineMinimapWheel";
5+
6+
function mountTimeline() {
7+
const timeline = document.createElement("div");
8+
timeline.style.cssText = "height: 200px; overflow-y: auto;";
9+
const content = document.createElement("div");
10+
content.style.height = "2000px";
11+
timeline.append(content);
12+
document.body.append(timeline);
13+
return Object.assign(timeline, { [Symbol.dispose]: () => timeline.remove() });
14+
}
15+
16+
function wheel(deltaY: number, wheelDeltaY: number): WheelEvent {
17+
const init = { cancelable: true, deltaY, wheelDeltaY };
18+
return new WheelEvent("wheel", init);
19+
}
20+
21+
describe("forwardWheelToTimeline", () => {
22+
it.each([
23+
["macOS", -360],
24+
["Linux and Windows", -120],
25+
])("scrolls %s trackpad deltas immediately", (_platform, wheelDeltaY) => {
26+
using timeline = mountTimeline();
27+
forwardWheelToTimeline(wheel(120, wheelDeltaY), timeline);
28+
expect(timeline.scrollTop).toBe(120);
29+
});
30+
31+
it("glides mouse wheel notches and accumulates them", () => {
32+
using timeline = mountTimeline();
33+
using _timers = fakeTimers();
34+
forwardWheelToTimeline(wheel(100, -120), timeline);
35+
forwardWheelToTimeline(wheel(100, -120), timeline);
36+
expect(timeline.scrollTop).toBe(0);
37+
vi.advanceTimersByTime(75);
38+
expect(timeline.scrollTop).toBeGreaterThan(0);
39+
expect(timeline.scrollTop).toBeLessThan(200);
40+
vi.advanceTimersByTime(100);
41+
expect(timeline.scrollTop).toBe(200);
42+
});
43+
44+
it("stops gliding when the user clicks or navigates", () => {
45+
using timeline = mountTimeline();
46+
using _timers = fakeTimers();
47+
forwardWheelToTimeline(wheel(100, -120), timeline);
48+
vi.advanceTimersByTime(50);
49+
timeline.scrollTop = 1000;
50+
window.dispatchEvent(new PointerEvent("pointerdown"));
51+
vi.advanceTimersByTime(200);
52+
expect(timeline.scrollTop).toBe(1000);
53+
});
54+
});

‎apps/web/src/components/chat/timelineMinimapWheel.ts‎

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,75 @@
1+
const MOUSE_WHEEL_SCROLL_MS = 150;
2+
const PRECISE_WHEEL_DELTA_RATIOS = [1, 3];
3+
4+
interface WheelGlide {
5+
from: number;
6+
to: number;
7+
start: number;
8+
written: number;
9+
frame: number;
10+
interruptions: AbortController;
11+
}
12+
13+
const glides = new WeakMap<HTMLElement, WheelGlide>();
14+
15+
function isPreciseWheel(event: WheelEvent): boolean {
16+
if (event.deltaMode !== WheelEvent.DOM_DELTA_PIXEL) return false;
17+
const { wheelDeltaY } = event as WheelEvent & { wheelDeltaY?: number };
18+
return (
19+
wheelDeltaY === undefined ||
20+
PRECISE_WHEEL_DELTA_RATIOS.some((ratio) => Math.abs(wheelDeltaY + ratio * event.deltaY) < 1)
21+
);
22+
}
23+
24+
function stopGlide(timeline: HTMLElement): WheelGlide | undefined {
25+
const glide = glides.get(timeline);
26+
if (!glide) return undefined;
27+
cancelAnimationFrame(glide.frame);
28+
glide.interruptions.abort();
29+
glides.delete(timeline);
30+
return glide;
31+
}
32+
33+
function glideBy(timeline: HTMLElement, distance: number): void {
34+
const current = stopGlide(timeline);
35+
const scrollTop = timeline.scrollTop;
36+
const base = current ? current.to + scrollTop - current.written : scrollTop;
37+
const maxScrollTop = timeline.scrollHeight - timeline.clientHeight;
38+
const glide: WheelGlide = {
39+
from: scrollTop,
40+
to: Math.max(0, Math.min(maxScrollTop, base + distance)),
41+
start: performance.now(),
42+
written: scrollTop,
43+
frame: 0,
44+
interruptions: new AbortController(),
45+
};
46+
for (const type of ["pointerdown", "keydown"]) {
47+
window.addEventListener(type, () => stopGlide(timeline), {
48+
capture: true,
49+
signal: glide.interruptions.signal,
50+
});
51+
}
52+
const step = (time: number) => {
53+
if (!timeline.isConnected) {
54+
stopGlide(timeline);
55+
return;
56+
}
57+
const drift = timeline.scrollTop - glide.written;
58+
glide.from += drift;
59+
glide.to += drift;
60+
const progress = Math.min(1, Math.max(0, (time - glide.start) / MOUSE_WHEEL_SCROLL_MS));
61+
timeline.scrollTop = glide.from + (glide.to - glide.from) * (1 - (1 - progress) ** 3);
62+
glide.written = timeline.scrollTop;
63+
if (progress < 1) {
64+
glide.frame = requestAnimationFrame(step);
65+
} else {
66+
stopGlide(timeline);
67+
}
68+
};
69+
glide.frame = requestAnimationFrame(step);
70+
glides.set(timeline, glide);
71+
}
72+
173
export function forwardWheelToTimeline(event: WheelEvent, timeline: HTMLElement): void {
274
if (event.defaultPrevented || event.ctrlKey || event.deltaY === 0) return;
375
event.preventDefault();
@@ -25,5 +97,11 @@ export function forwardWheelToTimeline(event: WheelEvent, timeline: HTMLElement)
2597
: event.deltaMode === WheelEvent.DOM_DELTA_PAGE
2698
? timeline.clientHeight
2799
: 1;
28-
timeline.scrollBy({ top: event.deltaY * pixelsPerUnit });
100+
const distance = event.deltaY * pixelsPerUnit;
101+
if (isPreciseWheel(event) || window.matchMedia("(prefers-reduced-motion: reduce)").matches) {
102+
stopGlide(timeline);
103+
timeline.scrollBy({ top: distance });
104+
return;
105+
}
106+
glideBy(timeline, distance);
29107
}

0 commit comments

Comments
 (0)