From f77ac59e6c081f84e050afcc47a0c9f71665ed26 Mon Sep 17 00:00:00 2001 From: Hiren Kangad Date: Fri, 13 Mar 2026 00:50:21 +0530 Subject: [PATCH] fix(sticky): make size presets absolute again --- frontend/src/canvas/stickyPresets.ts | 39 ++-------------------------- frontend/src/canvas/tools.ts | 10 +++---- frontend/src/pages/Editor.tsx | 20 +++++--------- 3 files changed, 13 insertions(+), 56 deletions(-) diff --git a/frontend/src/canvas/stickyPresets.ts b/frontend/src/canvas/stickyPresets.ts index 69311d5..f50ca89 100644 --- a/frontend/src/canvas/stickyPresets.ts +++ b/frontend/src/canvas/stickyPresets.ts @@ -1,9 +1,8 @@ /** * stickyPresets — sticky note size presets (shared domain module). * - * Presets are defined in screen-space so they preserve the same visual intent - * regardless of viewport zoom. Scene data still stores world-space width and - * fontSize; callers convert through the helpers below. + * Presets are absolute semantic sizes. Zoom changes the camera/view only; it + * must not change what S/M/L/XL/XXL mean for an existing sticky. */ export type StickyTextSize = 'S' | 'M' | 'L' | 'XL' | 'XXL'; @@ -36,37 +35,3 @@ export function nearestStickySize(fontSize: number): StickyTextSize { export function getStickyWidthForSize(fontSize: number): number { return STICKY_WIDTH_MAP[nearestStickySize(fontSize)]; } - -/** - * Convert a preset's screen-space target to world-space sticky metrics. - * objectScale is included so old non-1 scaled stickies still respond - * predictably when a preset is applied. - */ -export function getStickyWorldMetricsForPreset( - preset: StickyTextSize, - zoom: number, - objectScale: number = 1, -): { fontSize: number; width: number } { - const safeZoom = Math.max(zoom, 0.001); - const safeScale = Math.max(Math.abs(objectScale), 0.001); - return { - fontSize: STICKY_FONT_MAP[preset] / (safeZoom * safeScale), - width: STICKY_WIDTH_MAP[preset] / (safeZoom * safeScale), - }; -} - -/** - * Convert a desired on-screen font size into world-space sticky metrics by - * snapping to the nearest preset first. - */ -export function getStickyWorldMetricsForScreenFont( - screenFontSize: number, - zoom: number, - objectScale: number = 1, -): { fontSize: number; width: number; preset: StickyTextSize } { - const preset = nearestStickySize(screenFontSize); - return { - ...getStickyWorldMetricsForPreset(preset, zoom, objectScale), - preset, - }; -} diff --git a/frontend/src/canvas/tools.ts b/frontend/src/canvas/tools.ts index 56d85fa..3b4a013 100644 --- a/frontend/src/canvas/tools.ts +++ b/frontend/src/canvas/tools.ts @@ -13,7 +13,7 @@ import { DrawingSprite } from './sprites/DrawingSprite'; import type { DrawingObject } from './scene-format'; import { TextEditor } from './TextEditor'; import { clampTextFontSize } from './textLimits'; -import { DEFAULT_STICKY_PRESET, getStickyWorldMetricsForPreset } from './stickyPresets'; +import { DEFAULT_STICKY_PRESET, STICKY_FONT_MAP, STICKY_WIDTH_MAP } from './stickyPresets'; export enum ToolType { SELECT = 'SELECT', @@ -323,10 +323,8 @@ export function activateTool( const rect = container.getBoundingClientRect(); const world = viewport.toWorld(e.clientX - rect.left, e.clientY - rect.top); - const zoom = viewport.scale.x; - const presetMetrics = getStickyWorldMetricsForPreset(DEFAULT_STICKY_PRESET, zoom); - const cardW = presetMetrics.width; - const cardH = screenToWorld(60, zoom, 40, 200); + const cardW = STICKY_WIDTH_MAP[DEFAULT_STICKY_PRESET]; + const cardH = 60; // auto-computed by StickySprite const stickyData = { id: crypto.randomUUID(), type: 'sticky' as const, @@ -343,7 +341,7 @@ export function activateTool( name: '', visible: true, text: '', - fontSize: presetMetrics.fontSize, + fontSize: STICKY_FONT_MAP[DEFAULT_STICKY_PRESET], fontFamily: 'Inter, system-ui, sans-serif', fill: '#ffd43b', // default yellow textColor: '#1a1a1a', diff --git a/frontend/src/pages/Editor.tsx b/frontend/src/pages/Editor.tsx index 29a8dc0..b5896e7 100644 --- a/frontend/src/pages/Editor.tsx +++ b/frontend/src/pages/Editor.tsx @@ -21,7 +21,7 @@ import ContextMenu from '../components/ContextMenu'; import LayerPanel from '../components/LayerPanel'; import SelectionToolbar from '../components/SelectionToolbar'; import TextFormatToolbar from '../components/TextFormatToolbar'; -import { getStickyWorldMetricsForScreenFont } from '../canvas/stickyPresets'; +import { getStickyWidthForSize } from '../canvas/stickyPresets'; import VideoControls from '../components/VideoControls'; import ShortcutsHelp from '../components/ShortcutsHelp'; import MattermostImport from '../components/MattermostImport'; @@ -629,7 +629,7 @@ export default function Editor({ isPublicView }: EditorProps) { kind: 'sticky', x: posX, y: posY, fontFamily: sd.fontFamily || 'Inter, system-ui, sans-serif', textColor: sd.textColor || '#1a1a1a', fill: sd.fill || '#ffd43b', - stickyFontSize: (sd.fontSize || 14) * vp.scale.x * Math.abs(sd.sx || 1), + stickyFontSize: sd.fontSize || 14, items: stickyItems, }); } @@ -974,26 +974,20 @@ export default function Editor({ isPublicView }: EditorProps) { onCanvasChange(textToolbar.items.map(i => i.id)); updateOverlays(); } : undefined} - onStickySizeChange={textToolbar.kind === 'sticky' ? (screenFontSize) => { + onStickySizeChange={textToolbar.kind === 'sticky' ? (fontSize) => { const scene = canvasRef.current?.getScene(); - const vp = canvasRef.current?.getViewport(); - const zoom = vp?.scale.x ?? 1; + const newWidth = getStickyWidthForSize(fontSize); for (const item of textToolbar.items) { const d = item.data as StickyObject; - const metrics = getStickyWorldMetricsForScreenFont( - screenFontSize, - zoom, - Math.abs(d.sx || 1), - ); - d.fontSize = metrics.fontSize; - d.w = metrics.width; + d.fontSize = fontSize; + d.w = newWidth; if (item.displayObject instanceof StickySprite) { item.displayObject.updateFromData(d); d.h = item.displayObject.computedHeight; } if (scene) scene.updateSpatialEntry(item); } - setTextToolbar((prev) => prev && prev.kind === 'sticky' ? { ...prev, stickyFontSize: screenFontSize } : prev); + setTextToolbar((prev) => prev && prev.kind === 'sticky' ? { ...prev, stickyFontSize: fontSize } : prev); selectionRef.current?.transformBox.update(textToolbar.items); onCanvasChange(textToolbar.items.map(i => i.id)); updateOverlays();