Merge develop into main: release v1.7.1

Author: Gnathonic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.7.1] - 2026-06-10
+
+### Fixed
+
+- Restore single-finger touch panning in paged mode (#227)
+
 ## [1.7.0] - 2026-06-10
 
 ### Added

docs/superpowers/specs/2026-06-09-paged-zoom-quality-design.md

@@ -71,7 +71,7 @@ Element-free and unit-testable, shared with the e2e suite like `zoom-layout.ts`:
 A small explicit state machine in `PagedViewport`, preserving today's contracts:
 
 - **All pointers always enter the pointer map** — `.textBox` targets only suppress _pan initiation_ (selection/Yomitan), never pinch participation (today touch pinches work over text; `beforeMouseDown` only ever affected mouse).
-- **Single-finger touch never pans** (today's `onTouch: touches > 1` contract): one-finger touch is reserved for Reader's swipe-to-flip with its #186 edge gating and 200 ms multi-touch debounce — copying the scroll readers' any-pointer drag here would break page flipping. Mouse (and pen) drags pan.
+- **Single-finger touch pans** (correction, 2026-06-10): panzoom's `onTouch` option only gated `preventDefault` — `handleSingleFingerTouch` ran unconditionally, so production touch DID pan with one finger, coexisting with Reader's swipe-to-flip precisely because propagation wasn't stopped. Touch pan and the edge-gated (#186) swipe handlers coexist the same way here: pointer capture never retargets touch events, so the window-level swipe handlers still see them. Mouse/pen on `.textBox` defers to drag selection; touch pans everywhere (as in production).
 - **Pointer capture is deferred until `DRAG_THRESHOLD` is exceeded** — capturing on pointerdown would retarget `mouseup` away from the in-wrapper gutter page-turn buttons (the primary desktop navigation) and break text-selection drags. Below the threshold the press behaves exactly as today.
 - Transitions: a second pointer always upgrades pan → pinch (pan ends, pinch baselines); a pinch losing a finger down to one re-baselines as a fresh mouse-pan _only_ for mouse/pen (touch returns to idle); losing all pointers runs `pinchEnd`. Resize/reset mid-pinch clears controller state; the component re-baselines via `pinchStart` on the next move with ≥2 pointers (the established scroll-reader pattern).
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mokuro-reader",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": true,
   "scripts": {
     "dev": "vite dev",

package.json

@@ -155,12 +155,17 @@
   // ============================================================
   // Pointer state machine
   //
-  // - every pointer enters the map; .textBox only suppresses PAN initiation
-  // - single-finger touch never pans (reserved for Reader's swipe-to-flip)
+  // - every pointer enters the map; .textBox suppresses PAN initiation for
+  //   mouse/pen only (drag selection) — touch pans everywhere, exactly like
+  //   the old panzoom touch path, which handled single-finger touches
+  //   unconditionally (its onTouch option only gated preventDefault)
+  // - single-finger touch pan COEXISTS with Reader's swipe-to-flip: touch
+  //   events aren't retargeted by pointer capture, so the window-level swipe
+  //   handlers still see them and stay edge-gated (#186)
   // - capture is deferred until DRAG_THRESHOLD so gutter-button clicks and
   //   text-selection drags behave exactly as before
   // - two pointers always upgrade to pinch; back down to one re-baselines
-  //   as a fresh mouse/pen pan, touch returns to idle
+  //   as a fresh pan with the remaining pointer
   // ============================================================
 
   const DRAG_THRESHOLD = 5;
@@ -205,8 +210,9 @@
       return;
     }
 
-    if (e.pointerType === 'touch') return; // swipe-to-flip's domain
-    if ((e.target as HTMLElement).closest('.textBox')) return; // selection
+    // Mouse/pen on a text box is a selection drag, never a pan; touch has no
+    // drag-selection gesture and panned over text in production too.
+    if (e.pointerType !== 'touch' && (e.target as HTMLElement).closest('.textBox')) return;
     if (e.button !== 0) return;
 
     if (controller.isActive) controller.finishNow();
@@ -254,9 +260,11 @@
         controller.pinchStart(points()); // re-baseline on the new pair
       } else {
         controller.pinchEnd();
+        // The remaining pointer continues as a pan — for touch too, matching
+        // the old panzoom pinch→drag handoff.
         const rest = points()[0];
         const restId = [...activePointers.keys()][0];
-        if (rest && rest.type !== 'touch') {
+        if (rest) {
           beginPan({ pointerId: restId, clientX: rest.x, clientY: rest.y });
         }
       }