Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions core/src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ export function round(value: number, decimals: number) {
}

export function detectTrackpad(event: WheelEvent): boolean {
// deltaMode === 0 means the browser is reporting pixel-level deltas, which
// is the reliable cross-browser signal for trackpad (and touch) input.
// Mouse wheels report in line units (deltaMode === 1) or produce large
// discrete pixel values that don't use pixel mode.
// We avoid the fragile wheelDeltaY / deltaY * -3 ratio check because it
// breaks during high-velocity momentum scrolling on macOS, causing the
// canvas to jump 25x further than intended.
return event.deltaMode === 0;
// Line/page mode is always a mouse wheel.
if (event.deltaMode !== 0) return false;

// In pixel mode both inputs show up, so fall back to magnitude:
// trackpads send small deltas (usually under ~30), mouse wheels send
// chunks of ~100+ per notch. 50 sits comfortably between them.
const dominantDelta = Math.max(Math.abs(event.deltaX), Math.abs(event.deltaY));
return dominantDelta < 50;
}
export function normalizeWheelDelta(event: WheelEvent): { deltaX: number; deltaY: number } {
let { deltaX, deltaY, deltaMode } = event;
Expand Down
6 changes: 5 additions & 1 deletion core/src/zoompinch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,11 @@ export class Zoompinch extends EventTarget {

if (ctrlKey) {
const zoomSpeed = isTrackpad ? 0.01 * this.zoomSpeedAppleTrackpad : 0.1 * this.zoomSpeed;
const scaleFactor = 1 + -deltaY * zoomSpeed;
// Cap the per-event multiplier so a single oversized wheel event
// cannot drive scaleFactor to 0 or negative — which would clamp newScale to
// minScale on the first tick and silently kill zoom.
const cappedDelta = clamp(-deltaY * zoomSpeed, -0.5, 0.5);
const scaleFactor = 1 + cappedDelta;

let newScale = currScale * scaleFactor;

Expand Down