refactor(web): split touch canvas adapters

apps/web/src/hooks/timelineTouch.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { createTouchMouseDownEvent, getTouchPoint, resolveTouchDragDecision } from "./timelineTouch.js";
+import { getTouchPoint, resolveTouchDragDecision } from "./timelineTouch.js";
 
 describe("timelineTouch", () => {
   it("falls back from active touches to changedTouches and then zeroes", () => {
@@ -73,24 +73,4 @@ describe("timelineTouch", () => {
     });
   });
 
-  it("creates a primary-button mouse-down adapter for touch handlers", () => {
-    const currentTarget = new EventTarget();
-
-    expect(createTouchMouseDownEvent({ clientX: 42, clientY: 17 }, currentTarget)).toMatchObject({
-      button: 0,
-      clientX: 42,
-      currentTarget,
-      shiftKey: false,
-    });
-  });
-
-  it("allows missing targets when creating a touch mouse-down adapter", () => {
-    const event = createTouchMouseDownEvent({ clientX: 7, clientY: 9 });
-
-    expect(event.currentTarget).toBeNull();
-    expect(() => {
-      event.preventDefault();
-      event.stopPropagation();
-    }).not.toThrow();
-  });
 });

apps/web/src/hooks/timelineTouch.ts

@@ -9,15 +9,6 @@ export type TouchDecisionState = {
   decided: boolean;
 };
 
-export type TouchMouseDownEvent = {
-  button: number;
-  clientX: number;
-  currentTarget?: EventTarget | null;
-  shiftKey: boolean;
-  preventDefault: () => void;
-  stopPropagation: () => void;
-};
-
 type TouchLike = {
   clientX: number;
   clientY: number;
@@ -36,20 +27,6 @@ export function getTouchPoint(event: TouchEventLike): TouchPoint {
   };
 }
 
-export function createTouchMouseDownEvent(
-  point: TouchPoint,
-  currentTarget?: EventTarget | null,
-): TouchMouseDownEvent {
-  return {
-    button: 0,
-    clientX: point.clientX,
-    currentTarget: currentTarget ?? null,
-    shiftKey: false,
-    preventDefault: () => {},
-    stopPropagation: () => {},
-  };
-}
-
 export function resolveTouchDragDecision(
   state: TouchDecisionState,
   point: TouchPoint,

apps/web/src/hooks/timelineTouchAdapters.test.ts

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { createTouchCanvasPointerEvent, createTouchMouseDownEvent } from "./timelineTouchAdapters.js";
+
+describe("timelineTouchAdapters", () => {
+  it("creates a primary-button mouse-down adapter for touch handlers", () => {
+    const currentTarget = new EventTarget();
+
+    expect(createTouchMouseDownEvent({ clientX: 42, clientY: 17 }, currentTarget)).toMatchObject({
+      button: 0,
+      clientX: 42,
+      currentTarget,
+      shiftKey: false,
+    });
+  });
+
+  it("allows missing targets when creating a touch mouse-down adapter", () => {
+    const event = createTouchMouseDownEvent({ clientX: 7, clientY: 9 });
+
+    expect(event.currentTarget).toBeNull();
+    expect(() => {
+      event.preventDefault();
+      event.stopPropagation();
+    }).not.toThrow();
+  });
+
+  it("creates a canvas pointer event with both coordinates preserved", () => {
+    expect(createTouchCanvasPointerEvent({ clientX: 21, clientY: 34 })).toEqual({
+      clientX: 21,
+      clientY: 34,
+    });
+  });
+});

apps/web/src/hooks/timelineTouchAdapters.ts

@@ -0,0 +1,36 @@
+import type { TouchPoint } from "./timelineTouch.js";
+
+export type TouchMouseDownEvent = {
+  button: number;
+  clientX: number;
+  currentTarget?: EventTarget | null;
+  shiftKey: boolean;
+  preventDefault: () => void;
+  stopPropagation: () => void;
+};
+
+export type TouchCanvasPointerEvent = {
+  clientX: number;
+  clientY: number;
+};
+
+export function createTouchMouseDownEvent(
+  point: TouchPoint,
+  currentTarget?: EventTarget | null,
+): TouchMouseDownEvent {
+  return {
+    button: 0,
+    clientX: point.clientX,
+    currentTarget: currentTarget ?? null,
+    shiftKey: false,
+    preventDefault: () => {},
+    stopPropagation: () => {},
+  };
+}
+
+export function createTouchCanvasPointerEvent(point: TouchPoint): TouchCanvasPointerEvent {
+  return {
+    clientX: point.clientX,
+    clientY: point.clientY,
+  };
+}

apps/web/src/hooks/useTimelineDrag.ts

@@ -29,7 +29,16 @@ import {
 } from "./timelineMultiSelect.js";
 import { reconcileOptimisticEntries } from "./timelineOptimisticAllocations.js";
 import { createRangeSelectionState, finalizeRangeSelection, updateRangeSelectionDraft } from "./timelineRangeSelection.js";
-import { createTouchMouseDownEvent, getTouchPoint, resolveTouchDragDecision, type TouchMouseDownEvent } from "./timelineTouch.js";
+import {
+  createTouchCanvasPointerEvent,
+  createTouchMouseDownEvent,
+  type TouchCanvasPointerEvent,
+  type TouchMouseDownEvent,
+} from "./timelineTouchAdapters.js";
+import {
+  getTouchPoint,
+  resolveTouchDragDecision,
+} from "./timelineTouch.js";
 
 const DRAG_CLICK_THRESHOLD_PX = 5;
 
@@ -811,7 +820,7 @@ export function useTimelineDrag({
   // ── Canvas-level handlers (project shift + range select only) ──────────────
 
   const onCanvasMouseMove = useCallback(
-    (e: React.MouseEvent) => {
+    (e: TouchCanvasPointerEvent) => {
       if (updateProjectDragPosition(e.clientX)) {
         return;
       }
@@ -828,7 +837,7 @@ export function useTimelineDrag({
   );
 
   const onCanvasMouseUp = useCallback(
-    async (e: React.MouseEvent) => {
+    async (e: TouchCanvasPointerEvent) => {
       // Project shift
       const drag = dragStateRef.current;
       if (drag.isDragging) {
@@ -982,15 +991,14 @@ export function useTimelineDrag({
         return;
       }
 
-      onCanvasMouseMove({ clientX: point.clientX } as React.MouseEvent);
+      onCanvasMouseMove(createTouchCanvasPointerEvent(point));
     },
     [onCanvasMouseMove],
   );
 
   const onCanvasTouchEnd = useCallback(
     async (e: React.TouchEvent) => {
-      const { clientX, clientY } = getTouchPoint(e);
-      await onCanvasMouseUp({ clientX, clientY } as React.MouseEvent);
+      await onCanvasMouseUp(createTouchCanvasPointerEvent(getTouchPoint(e)));
     },
     [onCanvasMouseUp],
   );