From a32b134ebae46eb014713c63d5655ff9be6a5eec Mon Sep 17 00:00:00 2001
From: Danila Poyarkov <dev@dannote.net>
Date: Tue, 3 Mar 2026 11:44:31 +0300
Subject: [PATCH] Improve zoom smoothness, add absolute position cache (#21)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve trackpad pinch-zoom smoothness

- Replace Math.pow(0.99, delta) with Math.exp(-delta/100) zoom curve
  for natural, symmetric scaling that handles both tiny trackpad deltas
  and large mouse wheel jumps gracefully
- Normalize wheel deltaMode (LINE → 40px, PAGE → 800px) so external
  mice on Firefox produce consistent zoom behavior
- Clamp per-flush scale factor to 0.75–1.25 to prevent jarring jumps
  from discrete mouse wheel ticks

* Add per-frame absolute position cache for SceneGraph
---
 CHANGELOG.md                        |  1 +
 packages/core/src/renderer.ts       |  4 +-
 packages/core/src/scene-graph.ts    | 15 ++++-
 src/composables/use-canvas-input.ts | 21 ++++++-
 src/constants.ts                    |  9 ++-
 src/stores/editor.ts                |  9 ++-
 tests/engine/abspos-cache.test.ts   | 88 +++++++++++++++++++++++++++++
 7 files changed, 139 insertions(+), 8 deletions(-)
 create mode 100644 tests/engine/abspos-cache.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2342187c6..9a7d70ac7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 ### UI
 
 - Replace all native `<select>` dropdowns with reka-ui `AppSelect` component
+- Smoother trackpad pinch-to-zoom with `Math.exp` curve and deltaMode normalization
 - Fix font picker dropdown truncating long font names
 - Show explanation in font picker when Local Font Access API unavailable (Safari/Firefox)
 
diff --git a/packages/core/src/renderer.ts b/packages/core/src/renderer.ts
index 1644ce9ca..33a3726da 100644
--- a/packages/core/src/renderer.ts
+++ b/packages/core/src/renderer.ts
@@ -57,8 +57,8 @@ import {
   TEXT_CARET_COLOR,
   TEXT_CARET_WIDTH
 } from './constants'
-import { vectorNetworkToPath } from './vector'
 import { isFontLoaded } from './fonts'
+import { vectorNetworkToPath } from './vector'
 
 import type { SceneNode, SceneGraph, Fill, Stroke } from './scene-graph'
 import type { SnapGuide } from './snap'
@@ -484,6 +484,8 @@ export class SkiaRenderer {
     overlays: RenderOverlays = {},
     sceneVersion = -1
   ): void {
+    graph.clearAbsPosCache()
+
     const canvas = this.surface.getCanvas()
     canvas.clear(this.ck.Color4f(this.pageColor.r, this.pageColor.g, this.pageColor.b, 1))
 
diff --git a/packages/core/src/scene-graph.ts b/packages/core/src/scene-graph.ts
index 553426315..925698385 100644
--- a/packages/core/src/scene-graph.ts
+++ b/packages/core/src/scene-graph.ts
@@ -409,6 +409,7 @@ export class SceneGraph {
   variableCollections = new Map<string, VariableCollection>()
   activeMode = new Map<string, string>()
   rootId: string
+  private absPosCache = new Map<string, { x: number; y: number }>()
 
   constructor() {
     const root = createDefaultNode('FRAME', {
@@ -609,7 +610,14 @@ export class SceneGraph {
     return false
   }
 
+  clearAbsPosCache(): void {
+    this.absPosCache.clear()
+  }
+
   getAbsolutePosition(id: string): { x: number; y: number } {
+    const cached = this.absPosCache.get(id)
+    if (cached) return cached
+
     let ax = 0
     let ay = 0
     let current = this.nodes.get(id)
@@ -618,7 +626,9 @@ export class SceneGraph {
       ay += current.y
       current = current.parentId ? this.nodes.get(current.parentId) : undefined
     }
-    return { x: ax, y: ay }
+    const result = { x: ax, y: ay }
+    this.absPosCache.set(id, result)
+    return result
   }
 
   getAbsoluteBounds(id: string): Rect {
@@ -648,6 +658,7 @@ export class SceneGraph {
   updateNode(id: string, changes: Partial<SceneNode>): void {
     const node = this.nodes.get(id)
     if (!node) return
+    this.absPosCache.clear()
     Object.assign(node, changes)
   }
 
@@ -661,6 +672,8 @@ export class SceneGraph {
     if (!newParent) return
     if (node.parentId === newParentId) return
 
+    this.absPosCache.clear()
+
     // Convert absolute position
     const absPos = this.getAbsolutePosition(nodeId)
     const newParentNode = this.nodes.get(newParentId)
diff --git a/src/composables/use-canvas-input.ts b/src/composables/use-canvas-input.ts
index 79fc45314..9a0f07b68 100644
--- a/src/composables/use-canvas-input.ts
+++ b/src/composables/use-canvas-input.ts
@@ -942,20 +942,35 @@ export function useCanvasInput(
     wheelAccum.hasZoom = false
   }
 
+  // Normalize wheel deltaY across deltaMode variants (line/page/pixel).
+  // Trackpad pinch is always DOM_DELTA_PIXEL; external mice may use LINE or PAGE.
+  function normalizeWheelDelta(e: WheelEvent): { dx: number; dy: number } {
+    let { deltaX, deltaY } = e
+    if (e.deltaMode === WheelEvent.DOM_DELTA_LINE) {
+      deltaX *= 40
+      deltaY *= 40
+    } else if (e.deltaMode === WheelEvent.DOM_DELTA_PAGE) {
+      deltaX *= 800
+      deltaY *= 800
+    }
+    return { dx: deltaX, dy: deltaY }
+  }
+
   function onWheel(e: WheelEvent) {
     e.preventDefault()
     const canvas = canvasRef.value
     if (!canvas) return
+    const { dx, dy } = normalizeWheelDelta(e)
 
     if (e.ctrlKey || e.metaKey) {
       const rect = canvas.getBoundingClientRect()
       wheelAccum.zoomCenterX = e.clientX - rect.left
       wheelAccum.zoomCenterY = e.clientY - rect.top
-      wheelAccum.zoomDelta += e.deltaY
+      wheelAccum.zoomDelta += dy
       wheelAccum.hasZoom = true
     } else {
-      wheelAccum.deltaX -= e.deltaX
-      wheelAccum.deltaY -= e.deltaY
+      wheelAccum.deltaX -= dx
+      wheelAccum.deltaY -= dy
     }
     if (!wheelAccum.rafId) {
       wheelAccum.rafId = requestAnimationFrame(flushWheel)
diff --git a/src/constants.ts b/src/constants.ts
index 4504055ce..540aed325 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -109,7 +109,14 @@ export const DEFAULT_TEXT_HEIGHT = 24
 export const AUTO_LAYOUT_BREAK_THRESHOLD = 8
 export const HANDLE_HIT_RADIUS = 6
 export const ROTATION_HIT_RADIUS = 8
-export const ZOOM_SENSITIVITY = 0.99
+
+// Pixels of deltaY for one e-fold of zoom (Math.exp(-deltaY / ZOOM_DIVISOR))
+// Trackpad pinch sends small deltas (~2-5px), mouse wheel sends large (~100px).
+// Lower = more responsive. 50 matches Figma's trackpad feel.
+export const ZOOM_DIVISOR = 50
+// Clamp scale factor per wheel flush to prevent jarring jumps from mouse wheels
+export const ZOOM_SCALE_MIN = 0.75
+export const ZOOM_SCALE_MAX = 1.25
 
 export const SECTION_DEFAULT_FILL: Fill = {
   type: 'SOLID',
diff --git a/src/stores/editor.ts b/src/stores/editor.ts
index 7a0df4b87..588b02def 100644
--- a/src/stores/editor.ts
+++ b/src/stores/editor.ts
@@ -7,7 +7,9 @@ import {
   SECTION_DEFAULT_FILL,
   SECTION_DEFAULT_STROKE,
   CANVAS_BG_COLOR,
-  ZOOM_SENSITIVITY
+  ZOOM_DIVISOR,
+  ZOOM_SCALE_MIN,
+  ZOOM_SCALE_MAX
 } from '@/constants'
 import {
   parseFigmaClipboard,
@@ -1933,7 +1935,10 @@ export function createEditorStore() {
   }
 
   function applyZoom(delta: number, centerX: number, centerY: number) {
-    const factor = Math.pow(ZOOM_SENSITIVITY, delta)
+    const factor = Math.min(
+      ZOOM_SCALE_MAX,
+      Math.max(ZOOM_SCALE_MIN, Math.exp(-delta / ZOOM_DIVISOR))
+    )
     const newZoom = Math.max(0.02, Math.min(256, state.zoom * factor))
     state.panX = centerX - (centerX - state.panX) * (newZoom / state.zoom)
     state.panY = centerY - (centerY - state.panY) * (newZoom / state.zoom)
diff --git a/tests/engine/abspos-cache.test.ts b/tests/engine/abspos-cache.test.ts
new file mode 100644
index 000000000..9857c5608
--- /dev/null
+++ b/tests/engine/abspos-cache.test.ts
@@ -0,0 +1,88 @@
+import { describe, expect, test } from 'bun:test'
+
+import { SceneGraph } from '../../packages/core/src/scene-graph'
+
+function pageId(graph: SceneGraph) {
+  return graph.getPages()[0].id
+}
+
+describe('absolute position cache', () => {
+  test('cached result matches uncached computation', () => {
+    const graph = new SceneGraph()
+    const frame = graph.createNode('FRAME', pageId(graph), { name: 'F', x: 100, y: 200 })
+    const child = graph.createNode('RECTANGLE', frame.id, { name: 'R', x: 10, y: 20 })
+
+    const first = graph.getAbsolutePosition(child.id)
+    const second = graph.getAbsolutePosition(child.id)
+
+    expect(first).toEqual({ x: 110, y: 220 })
+    expect(second).toEqual({ x: 110, y: 220 })
+    expect(first).toBe(second)
+  })
+
+  test('cache invalidated after node position change', () => {
+    const graph = new SceneGraph()
+    const frame = graph.createNode('FRAME', pageId(graph), { name: 'F', x: 50, y: 50 })
+    const child = graph.createNode('RECTANGLE', frame.id, { name: 'R', x: 10, y: 10 })
+
+    expect(graph.getAbsolutePosition(child.id)).toEqual({ x: 60, y: 60 })
+
+    graph.updateNode(frame.id, { x: 100, y: 100 })
+
+    expect(graph.getAbsolutePosition(child.id)).toEqual({ x: 110, y: 110 })
+  })
+
+  test('cache invalidated after reparenting', () => {
+    const graph = new SceneGraph()
+    const page = pageId(graph)
+    const frameA = graph.createNode('FRAME', page, { name: 'A', x: 100, y: 100 })
+    const frameB = graph.createNode('FRAME', page, { name: 'B', x: 300, y: 300 })
+    const child = graph.createNode('RECTANGLE', frameA.id, { name: 'R', x: 10, y: 10 })
+
+    expect(graph.getAbsolutePosition(child.id)).toEqual({ x: 110, y: 110 })
+
+    graph.reparentNode(child.id, frameB.id)
+
+    const pos = graph.getAbsolutePosition(child.id)
+    expect(pos).toEqual({ x: 110, y: 110 })
+  })
+
+  test('nested nodes (3+ levels) get correct absolute positions', () => {
+    const graph = new SceneGraph()
+    const page = pageId(graph)
+    const level1 = graph.createNode('FRAME', page, { name: 'L1', x: 10, y: 20 })
+    const level2 = graph.createNode('FRAME', level1.id, { name: 'L2', x: 30, y: 40 })
+    const level3 = graph.createNode('FRAME', level2.id, { name: 'L3', x: 50, y: 60 })
+    const leaf = graph.createNode('RECTANGLE', level3.id, { name: 'Leaf', x: 1, y: 2 })
+
+    expect(graph.getAbsolutePosition(level1.id)).toEqual({ x: 10, y: 20 })
+    expect(graph.getAbsolutePosition(level2.id)).toEqual({ x: 40, y: 60 })
+    expect(graph.getAbsolutePosition(level3.id)).toEqual({ x: 90, y: 120 })
+    expect(graph.getAbsolutePosition(leaf.id)).toEqual({ x: 91, y: 122 })
+  })
+
+  test('clearAbsPosCache forces recomputation', () => {
+    const graph = new SceneGraph()
+    const rect = graph.createNode('RECTANGLE', pageId(graph), { name: 'R', x: 10, y: 20 })
+
+    const first = graph.getAbsolutePosition(rect.id)
+    graph.clearAbsPosCache()
+    const second = graph.getAbsolutePosition(rect.id)
+
+    expect(first).toEqual(second)
+    expect(first).not.toBe(second)
+  })
+
+  test('sibling cache entries survive unrelated sibling update', () => {
+    const graph = new SceneGraph()
+    const page = pageId(graph)
+    const a = graph.createNode('RECTANGLE', page, { name: 'A', x: 10, y: 10 })
+    const b = graph.createNode('RECTANGLE', page, { name: 'B', x: 20, y: 20 })
+
+    graph.getAbsolutePosition(a.id)
+    graph.updateNode(b.id, { x: 30 })
+
+    const posA = graph.getAbsolutePosition(a.id)
+    expect(posA).toEqual({ x: 10, y: 10 })
+  })
+})