AI-native design editor. Open-source Figma alternative.
feat(editor): add configurable snapping and guides
Danila Poyarkov91e759d7fd8f
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 4c871af44..91ed350a4 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -4,6 +4,7 @@### Added+- Snap vector points, moved layers, and resized edges to nearby geometry, sibling layer bounds, canvas and frame layout guides, and whole-pixel coordinates with visible alignment guides, fractional-coordinate preservation when pixel snapping is off, and persistent geometry, object, and pixel-grid controls in General settings and the Preferences menu.- Import, render, edit, resize, select, and export Figma text-on-path layers while preserving their curved glyph layout.- Add tested pane-registry and recursive split-tree models for independently viewed same-document canvases, capped at four visible panes.diff --git a/desktop/generated/menu.json b/desktop/generated/menu.jsonindex 85f7b4fbf..b0863c4d6 100644--- a/desktop/generated/menu.json+++ b/desktop/generated/menu.json@@ -212,15 +212,43 @@{"type": "separator"},+ {+ "id": "preferences",+ "label": "Preferences",+ "sub": [+ {+ "id": "snap-geometry",+ "label": "Snap to Geometry",+ "checkbox": true+ },+ {+ "id": "snap-objects",+ "label": "Snap to Objects",+ "checkbox": true+ },+ {+ "id": "snap-pixel-grid",+ "label": "Snap to Pixel Grid",+ "checkbox": true+ },+ {+ "type": "separator"+ },+ {+ "id": "settings",+ "label": "Settings…",+ "accelerator": "CmdOrCtrl+,"+ }+ ]+ },+ {+ "type": "separator"+ },{"id": "toggle-ui","label": "Toggle UI","accelerator": "CmdOrCtrl+\\"},- {- "id": "settings",- "label": "Settings…"- },{"type": "separator"},diff --git a/desktop/src/lib.rs b/desktop/src/lib.rsindex 4a88c8e0a..b6ef5f650 100644--- a/desktop/src/lib.rs+++ b/desktop/src/lib.rs@@ -14,7 +14,7 @@ use credentials::{use fig_container::build_fig_file;use fonts::{list_system_fonts, load_system_font};use http::proxy_http_request;-use menu::install_app_menu;+use menu::{install_app_menu, native_menu_checked, set_native_menu_checked};use menu_events::handle_menu_event;use std::{path::{Path, PathBuf},@@ -145,6 +145,8 @@ pub fn run() {list_system_fonts,load_system_font,proxy_http_request,+ native_menu_checked,+ set_native_menu_checked,take_pending_open]).plugin(tauri_plugin_opener::init())diff --git a/desktop/src/menu.rs b/desktop/src/menu.rsindex 0f3b05f31..02343991c 100644--- a/desktop/src/menu.rs+++ b/desktop/src/menu.rs@@ -1,5 +1,7 @@use serde::Deserialize;-use tauri::menu::{MenuBuilder, MenuItemBuilder, Submenu, SubmenuBuilder};+use tauri::menu::{+ CheckMenuItemBuilder, MenuBuilder, MenuItemBuilder, MenuItemKind, Submenu, SubmenuBuilder,+};#[cfg(any(target_os = "macos", target_os = "windows"))]use tauri::menu::PredefinedMenuItem;@@ -18,6 +20,8 @@ struct MenuEntry {label: Option<String>,accelerator: Option<String>,#[serde(default)]+ checkbox: bool,+ #[serde(default)]sub: Vec<MenuEntry>,}@@ -60,6 +64,18 @@ fn build_submenu<R: tauri::Runtime>(}}+ if entry.checkbox {+ let mut item = CheckMenuItemBuilder::new(label).checked(true);+ if let Some(id) = &entry.id {+ item = item.id(id);+ }+ if let Some(accelerator) = &entry.accelerator {+ item = item.accelerator(accelerator);+ }+ builder = builder.item(&item.build(app)?);+ continue;+ }+let mut item = MenuItemBuilder::new(label);if let Some(id) = &entry.id {item = item.id(id);@@ -90,6 +106,58 @@ fn build_schema_menus<R: tauri::Runtime>(.collect()}+fn find_menu_item<R: tauri::Runtime>(+ items: Vec<MenuItemKind<R>>,+ id: &str,+) -> Option<MenuItemKind<R>> {+ for item in items {+ if item.id().0 == id {+ return Some(item);+ }+ if let MenuItemKind::Submenu(submenu) = &item {+ if let Ok(children) = submenu.items() {+ if let Some(found) = find_menu_item(children, id) {+ return Some(found);+ }+ }+ }+ }+ None+}++#[tauri::command]+pub fn native_menu_checked<R: tauri::Runtime>(+ app: tauri::AppHandle<R>,+ id: String,+) -> Result<bool, String> {+ let menu = app+ .menu()+ .ok_or_else(|| "Application menu is unavailable".to_string())?;+ let item = find_menu_item(menu.items().map_err(|error| error.to_string())?, &id)+ .ok_or_else(|| format!("Menu item not found: {id}"))?;+ match item {+ MenuItemKind::Check(item) => item.is_checked().map_err(|error| error.to_string()),+ _ => Err(format!("Menu item is not checkable: {id}")),+ }+}++#[tauri::command]+pub fn set_native_menu_checked<R: tauri::Runtime>(+ app: tauri::AppHandle<R>,+ id: String,+ checked: bool,+) -> Result<(), String> {+ let menu = app+ .menu()+ .ok_or_else(|| "Application menu is unavailable".to_string())?;+ let item = find_menu_item(menu.items().map_err(|error| error.to_string())?, &id)+ .ok_or_else(|| format!("Menu item not found: {id}"))?;+ match item {+ MenuItemKind::Check(item) => item.set_checked(checked).map_err(|error| error.to_string()),+ _ => Err(format!("Menu item is not checkable: {id}")),+ }+}+pub fn install_app_menu<R: tauri::Runtime>(app: &mut tauri::App<R>) -> tauri::Result<()> {#[cfg(target_os = "macos")]let app_menu = SubmenuBuilder::new(app, "OpenPencil")diff --git a/packages/core/src/canvas/layout-grids.ts b/packages/core/src/canvas/layout-grids.tsindex 71272a870..1d8d7f6da 100644--- a/packages/core/src/canvas/layout-grids.ts+++ b/packages/core/src/canvas/layout-grids.ts@@ -2,6 +2,7 @@ import type { Canvas } from 'canvaskit-wasm'import { readEffectiveFigmaRawField } from '@open-pencil/fig'import type { SceneNode } from '@open-pencil/scene-graph'+import { layoutGuideSections } from '@open-pencil/scene-graph/layout-guides'import type { Color } from '@open-pencil/scene-graph/primitives'import { SELECTION_COLOR } from '#core/constants'@@ -74,41 +75,20 @@ function gridGeometry(grid: RawLayoutGrid): GridGeometry | null {}}-function gridSectionSize(nodeSize: number, grid: GridGeometry): number {- if (grid.alignment !== 'STRETCH') return grid.sectionSize- return (nodeSize - grid.offset * 2 - Math.max(0, grid.count - 1) * grid.gutterSize) / grid.count-}--function gridStart(nodeSize: number, grid: GridGeometry): number {- const sectionSize = gridSectionSize(nodeSize, grid)- const span = grid.count * sectionSize + Math.max(0, grid.count - 1) * grid.gutterSize- if (grid.alignment === 'CENTER') return (nodeSize - span) / 2 + grid.offset- if (grid.alignment === 'MAX') return nodeSize - span - grid.offset- return grid.offset-}-function drawColumnGrid(r: SkiaRenderer,canvas: Canvas,node: SceneNode,grid: GridGeometry): void {- const sectionSize = gridSectionSize(node.width, grid)- if (sectionSize <= 0) return- const x0 = gridStart(node.width, grid)- for (let index = 0; index < grid.count; index++) {- const x = x0 + index * (sectionSize + grid.gutterSize)- canvas.drawRect(r.ck.LTRBRect(x, 0, x + sectionSize, node.height), r.auxFill)+ for (const section of layoutGuideSections(node, grid)) {+ canvas.drawRect(r.ck.LTRBRect(section.start, 0, section.end, node.height), r.auxFill)}}function drawRowGrid(r: SkiaRenderer, canvas: Canvas, node: SceneNode, grid: GridGeometry): void {- const sectionSize = gridSectionSize(node.height, grid)- if (sectionSize <= 0) return- const y0 = gridStart(node.height, grid)- for (let index = 0; index < grid.count; index++) {- const y = y0 + index * (sectionSize + grid.gutterSize)- canvas.drawRect(r.ck.LTRBRect(0, y, node.width, y + sectionSize), r.auxFill)+ for (const section of layoutGuideSections(node, grid)) {+ canvas.drawRect(r.ck.LTRBRect(0, section.start, node.width, section.end), r.auxFill)}}diff --git a/packages/core/src/canvas/page-guides.ts b/packages/core/src/canvas/page-guides.tsindex f26522699..11aad8c75 100644--- a/packages/core/src/canvas/page-guides.ts+++ b/packages/core/src/canvas/page-guides.ts@@ -6,32 +6,19 @@ import { SELECTION_COLOR } from '#core/constants'import type { SkiaRenderer } from './renderer'-interface RawGuide {- axis?: string- offset?: number-}--function rawGuides(graph: SceneGraph, pageId?: string | null): RawGuide[] {- const pageNode = graph.getNode(pageId ?? graph.rootId)- const guides = pageNode?.source.fig.rawNodeFields.guides- if (!Array.isArray(guides)) return []- return guides.filter((guide): guide is RawGuide => guide !== null && typeof guide === 'object')-}-export function drawPageGuides(r: SkiaRenderer, canvas: Canvas, graph: SceneGraph): void {- const guides = rawGuides(graph, r.pageId)- if (guides.length === 0) return+ const page = graph.getNode(r.pageId ?? graph.rootId)+ if (!page || page.guides.length === 0) returnr.auxStroke.setStrokeWidth(1)r.auxStroke.setColor(r.ck.Color4f(SELECTION_COLOR.r, SELECTION_COLOR.g, SELECTION_COLOR.b, 0.65))- for (const guide of guides) {- if (typeof guide.offset !== 'number') continue- if (guide.axis === 'X') {- const x = guide.offset * r.zoom + r.panX+ for (const guide of page.guides) {+ if (guide.axis === 'x') {+ const x = guide.position * r.zoom + r.panXcanvas.drawRect(r.ck.LTRBRect(x, 0, x + 1, r.viewportHeight), r.auxStroke)- } else if (guide.axis === 'Y') {- const y = guide.offset * r.zoom + r.panY+ } else {+ const y = guide.position * r.zoom + r.panYcanvas.drawRect(r.ck.LTRBRect(0, y, r.viewportWidth, y + 1), r.auxStroke)}}diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.tsindex fb3d4ab68..bd2fdfaba 100644--- a/packages/core/src/constants.ts+++ b/packages/core/src/constants.ts@@ -46,7 +46,7 @@ export function getDefaultCanvasBgColor(): Color {return CANVAS_BG_COLOR}-export const SNAP_THRESHOLD = 5+export const SNAP_THRESHOLD_SCREEN_PX = 5export const RULER_SIZE = 20export const RULER_BG_COLOR = { r: 0.14, g: 0.14, b: 0.14, a: 1 } satisfies Colordiff --git a/packages/core/src/editor/create.ts b/packages/core/src/editor/create.tsindex 99e0e1649..a2d71bb9f 100644--- a/packages/core/src/editor/create.ts+++ b/packages/core/src/editor/create.ts@@ -206,6 +206,9 @@ export function createEditor(options?: EditorOptions) {setSelectedIds(new Set())state.hoveredNodeId = nullstate.measurementMode = 'off'+ state.snapGuides = []+ state.layoutInsertIndicator = null+ state.dropTargetId = nullpages.clearPageViewports()emitEditorEvent('graph:replaced', _graph)if (previousPageId !== state.currentPageId) {diff --git a/packages/core/src/editor/index.ts b/packages/core/src/editor/index.tsindex a7b9ceda1..caf0065d7 100644--- a/packages/core/src/editor/index.ts+++ b/packages/core/src/editor/index.ts@@ -4,6 +4,8 @@ export {ReadOnlyLibraryDefinitionError} from './capabilities'export type { NodeEditCapability } from './capabilities'+export { DEFAULT_SNAPPING_PREFERENCES } from './preferences'+export type { SnappingPreferences } from './preferences'export { createDefaultEditorSharedState } from './state/shared'export {copyEditorViewState,diff --git a/packages/core/src/editor/preferences.ts b/packages/core/src/editor/preferences.tsnew file mode 100644index 000000000..edd04f8ef--- /dev/null+++ b/packages/core/src/editor/preferences.ts@@ -0,0 +1,11 @@+export interface SnappingPreferences {+ geometry: boolean+ objects: boolean+ pixelGrid: boolean+}++export const DEFAULT_SNAPPING_PREFERENCES: Readonly<SnappingPreferences> = {+ geometry: true,+ objects: true,+ pixelGrid: true+}diff --git a/packages/core/src/editor/state/shared.ts b/packages/core/src/editor/state/shared.tsindex 48f00e0cc..d049f8aed 100644--- a/packages/core/src/editor/state/shared.ts+++ b/packages/core/src/editor/state/shared.ts@@ -1,8 +1,10 @@+import { DEFAULT_SNAPPING_PREFERENCES } from '#core/editor/preferences'import type { EditorSharedState } from '#core/editor/types'export function createDefaultEditorSharedState(): EditorSharedState {return {activeTool: 'SELECT',+ snappingPreferences: { ...DEFAULT_SNAPPING_PREFERENCES },remoteCursors: [],documentName: 'Untitled',rulerTheme: undefined,diff --git a/packages/core/src/editor/types.ts b/packages/core/src/editor/types.tsindex 96eaa3b82..8a0266c4d 100644--- a/packages/core/src/editor/types.ts+++ b/packages/core/src/editor/types.ts@@ -13,6 +13,7 @@ import type { UndoManager } from '@open-pencil/scene-graph/undo'import type { RulerTheme, SkiaRenderer } from '#core/canvas/renderer'import type { MeasurementMode, RenderOverlays } from '#core/canvas/renderer/types'+import type { SnappingPreferences } from '#core/editor/preferences'import type { TextEditor } from '#core/text/editor'import type { FontResolutionEvent, FontResolutionSnapshot } from '#core/text/resolver'@@ -31,6 +32,7 @@ export type Tool =export interface EditorSharedState {activeTool: Tool+ snappingPreferences: SnappingPreferencesremoteCursors: Array<{name: stringcolor: Colordiff --git a/packages/core/src/io/formats/fig/export.ts b/packages/core/src/io/formats/fig/export.tsindex ca5d0b6cd..f73a3df19 100644--- a/packages/core/src/io/formats/fig/export.ts+++ b/packages/core/src/io/formats/fig/export.ts@@ -3,7 +3,12 @@ import type { CanvasKit } from 'canvaskit-wasm'import { deflateSync, inflateSync } from 'fflate'import { compressFigDataSync } from '@open-pencil/fig'-import { buildComponentPropIndex, stringToGuid } from '@open-pencil/fig/node-change'+import {+ buildComponentPropIndex,+ exportCanvasGuides,+ importCanvasGuides,+ stringToGuid+} from '@open-pencil/fig/node-change'import { initCodec, getCompiledSchema, getSchemaBytes } from '@open-pencil/kiwi/fig/codec'import type { NodeChange } from '@open-pencil/kiwi/fig/codec'import { decodeBinarySchema, compileSchema, ByteBuffer } from '@open-pencil/kiwi/schema-runtime'@@ -253,8 +258,13 @@ function applyImportedCanvasFields(page: FigExportPage, canvasNc: KiwiNodeChangepage.source.fig.rawNodeFields.backgroundPaints) as NodeChange['backgroundPaints']}- if ('guides' in page.source.fig.rawNodeFields) {- canvasNc.guides = structuredClone(page.source.fig.rawNodeFields.guides)+ if (page.guides.length > 0) {+ const normalized = exportCanvasGuides(page.guides)+ const raw = page.source.fig.rawNodeFields.guides+ canvasNc.guides =+ Array.isArray(raw) && JSON.stringify(importCanvasGuides(raw)) === JSON.stringify(page.guides)+ ? structuredClone(raw)+ : normalized}const strokeJoin = page.source.fig.rawNodeFields.strokeJoinif (typeof strokeJoin === 'string') canvasNc.strokeJoin = strokeJoindiff --git a/packages/core/src/kiwi/fig/import.ts b/packages/core/src/kiwi/fig/import.tsindex 5ae529b39..8d71bd487 100644--- a/packages/core/src/kiwi/fig/import.ts+++ b/packages/core/src/kiwi/fig/import.ts@@ -7,6 +7,7 @@ import {ENABLED_LIBRARIES_PLUGIN_KEY,getOpenPencilPluginValue,guidToString,+ importCanvasGuides,nodeChangeToProps,shouldImportTextAsAutoSize,sortChildren,@@ -33,7 +34,10 @@ function applyImportedCanvasMetadata(page.source.fig.rawNodeFields.backgroundColor = structuredClone(canvasNc.backgroundColor)if (canvasNc.backgroundPaints)page.source.fig.rawNodeFields.backgroundPaints = structuredClone(canvasNc.backgroundPaints)- if (canvasNc.guides) page.source.fig.rawNodeFields.guides = structuredClone(canvasNc.guides)+ if (canvasNc.guides) {+ page.guides = importCanvasGuides(canvasNc.guides)+ page.source.fig.rawNodeFields.guides = structuredClone(canvasNc.guides)+ }page.source.fig.rawNodeFields.strokeJoin = canvasNc.strokeJoinpage.source.fig.rawNodeFields.strokeWeight = canvasNc.strokeWeightif (canvasNc.pageType) page.source.fig.rawNodeFields.pageType = canvasNc.pageTypediff --git a/packages/fig/src/node-change/canvas-guides.ts b/packages/fig/src/node-change/canvas-guides.tsnew file mode 100644index 000000000..fcb0707d0--- /dev/null+++ b/packages/fig/src/node-change/canvas-guides.ts@@ -0,0 +1,26 @@+import type { CanvasGuide } from '@open-pencil/scene-graph/guides'++interface FigmaCanvasGuide {+ axis?: string+ offset?: number+}++export function importCanvasGuides(value: unknown): CanvasGuide[] {+ if (!Array.isArray(value)) return []+ const guides: CanvasGuide[] = []+ for (const raw of value) {+ if (!raw || typeof raw !== 'object') continue+ const guide = raw as FigmaCanvasGuide+ if (typeof guide.offset !== 'number' || !Number.isFinite(guide.offset)) continue+ if (guide.axis === 'X') guides.push({ axis: 'x', position: guide.offset })+ else if (guide.axis === 'Y') guides.push({ axis: 'y', position: guide.offset })+ }+ return guides+}++export function exportCanvasGuides(guides: readonly CanvasGuide[]): FigmaCanvasGuide[] {+ return guides.map((guide) => ({+ axis: guide.axis === 'x' ? 'X' : 'Y',+ offset: guide.position+ }))+}diff --git a/packages/fig/src/node-change/index.ts b/packages/fig/src/node-change/index.tsindex 899f30b77..115023802 100644--- a/packages/fig/src/node-change/index.ts+++ b/packages/fig/src/node-change/index.ts@@ -1,4 +1,5 @@export * from './basics'+export * from './canvas-guides'export * from './convert'export * from './derived-text-data'export * from './derived-text-glyphs'diff --git a/packages/scene-graph/package.json b/packages/scene-graph/package.jsonindex f32f0157e..65aa433d5 100644--- a/packages/scene-graph/package.json+++ b/packages/scene-graph/package.json@@ -2,7 +2,19 @@"name": "@open-pencil/scene-graph","version": "0.14.0","license": "MIT",+ "repository": {+ "type": "git",+ "url": "git+https://github.com/open-pencil/open-pencil.git",+ "directory": "packages/scene-graph"+ },+ "files": [+ "dist",+ "README.md"+ ],"type": "module",+ "sideEffects": false,+ "main": "./dist/index.js",+ "types": "./dist/index.d.ts","exports": {".": {"types": "./dist/index.d.ts",@@ -58,6 +70,18 @@"import": "./dist/vector-network.js","default": "./dist/vector-network.js"},+ "./guides": {+ "types": "./dist/guides.d.ts",+ "bun": "./src/guides.ts",+ "import": "./dist/guides.js",+ "default": "./dist/guides.js"+ },+ "./layout-guides": {+ "types": "./dist/layout-guides.d.ts",+ "bun": "./src/layout-guides.ts",+ "import": "./dist/layout-guides.js",+ "default": "./dist/layout-guides.js"+ },"./types": {"types": "./dist/types.d.ts","bun": "./src/types.ts",@@ -137,13 +161,10 @@"default": "./dist/parse-path.js"}},- "main": "./dist/index.js",- "types": "./dist/index.d.ts",- "sideEffects": false,- "files": [- "dist",- "README.md"- ],+ "publishConfig": {+ "access": "public",+ "provenance": true+ },"scripts": {"build": "bunx tsdown --config tsdown.config.ts","check": "bun run typecheck && bun run build && bun run smoke:dist",@@ -151,15 +172,6 @@"smoke:dist": "bun scripts/smoke-dist.ts","typecheck": "bunx tsc --noEmit -p tsconfig.json"},- "repository": {- "type": "git",- "url": "git+https://github.com/open-pencil/open-pencil.git",- "directory": "packages/scene-graph"- },- "publishConfig": {- "access": "public",- "provenance": true- },"dependencies": {"es-toolkit": "^1.46.1","nanoevents": "^9.1.0",diff --git a/packages/scene-graph/src/copy.ts b/packages/scene-graph/src/copy.tsindex dd7e0143f..56cf6c370 100644--- a/packages/scene-graph/src/copy.ts+++ b/packages/scene-graph/src/copy.ts@@ -255,6 +255,7 @@ export function cloneNodeProps(strokes: copyOpt(src.strokes, (value) => markCopySource(value, copyStrokes(value))),effects: copyOpt(src.effects, (value) => markCopySource(value, copyEffects(value))),layoutGrids: copyOpt(src.layoutGrids, copyLayoutGrids),+ guides: copyOpt(src.guides, (guides) => guides.map((guide) => ({ ...guide }))),styleRuns: copyOpt(src.styleRuns, (value) => markCopySource(value, copyStyleRuns(value))),// Generated instance descendants have no independent Figma provenance. Retaining the source// component's opaque raw payload here duplicates megabytes of metadata per instance.diff --git a/packages/scene-graph/src/guides.ts b/packages/scene-graph/src/guides.tsnew file mode 100644index 000000000..672883758--- /dev/null+++ b/packages/scene-graph/src/guides.ts@@ -0,0 +1,4 @@+export interface CanvasGuide {+ axis: 'x' | 'y'+ position: number+}diff --git a/packages/scene-graph/src/index.ts b/packages/scene-graph/src/index.tsindex d9e6f97e0..352eafb02 100644--- a/packages/scene-graph/src/index.ts+++ b/packages/scene-graph/src/index.ts@@ -7,6 +7,8 @@ export * from './export-scale'export * from './coordinate'export * from './constants'export * from './geometry'+export * from './guides'+export * from './layout-guides'export * from './font-style'export * from './shared-styles'export { default as TransformMatrix } from './matrix'diff --git a/packages/scene-graph/src/layout-guides.ts b/packages/scene-graph/src/layout-guides.tsnew file mode 100644index 000000000..7810ca117--- /dev/null+++ b/packages/scene-graph/src/layout-guides.ts@@ -0,0 +1,87 @@+import type { LayoutGrid, SceneNode } from './types'++export interface LayoutGuideLine {+ axis: 'x' | 'y'+ position: number+}++function pattern(grid: LayoutGrid): 'COLUMNS' | 'ROWS' | 'GRID' {+ if (grid.pattern === 'GRID' || grid.pattern === 'ROWS') return grid.pattern+ if (grid.axis === 'Y') return 'ROWS'+ return 'COLUMNS'+}++function alignment(grid: LayoutGrid): 'MIN' | 'CENTER' | 'MAX' | 'STRETCH' {+ const value = grid.alignment ?? grid.type+ if (value === 'CENTER' || value === 'MAX' || value === 'STRETCH') return value+ return 'MIN'+}++function sectionSize(nodeSize: number, grid: LayoutGrid): number {+ const fixed = grid.sectionSize ?? 0+ if (alignment(grid) !== 'STRETCH') return fixed+ const count = grid.count ?? grid.numSections ?? 1+ const gutter = grid.gutterSize ?? 0+ const offset = grid.offset ?? 0+ return (nodeSize - offset * 2 - Math.max(0, count - 1) * gutter) / count+}++function start(nodeSize: number, grid: LayoutGrid, size: number): number {+ const count = grid.count ?? grid.numSections ?? 1+ const gutter = grid.gutterSize ?? 0+ const offset = grid.offset ?? 0+ const span = count * size + Math.max(0, count - 1) * gutter+ if (alignment(grid) === 'CENTER') return (nodeSize - span) / 2 + offset+ if (alignment(grid) === 'MAX') return nodeSize - span - offset+ return offset+}++export interface LayoutGuideSection {+ axis: 'x' | 'y'+ start: number+ end: number+}++export function layoutGuideSections(+ node: Pick<SceneNode, 'width' | 'height'>,+ grid: LayoutGrid+): LayoutGuideSection[] {+ if (grid.visible === false || pattern(grid) === 'GRID') return []+ const axis = pattern(grid) === 'ROWS' ? 'y' : 'x'+ const nodeSize = axis === 'x' ? node.width : node.height+ const size = sectionSize(nodeSize, grid)+ const count = grid.count ?? grid.numSections ?? 1+ if (!Number.isFinite(count) || count <= 0 || size <= 0) return []+ const first = start(nodeSize, grid, size)+ const step = size + (grid.gutterSize ?? 0)+ return Array.from({ length: count }, (_, index) => {+ const sectionStart = first + index * step+ return { axis, start: sectionStart, end: sectionStart + size }+ })+}++export function layoutGuideLines(node: Pick<SceneNode, 'width' | 'height'>, grid: LayoutGrid) {+ if (grid.visible === false) return []+ const gridPattern = pattern(grid)+ const lines: LayoutGuideLine[] = []+ if (gridPattern === 'GRID') {+ const size = grid.sectionSize ?? 0+ if (size <= 0) return lines+ for (let x = grid.offset ?? 0; x <= node.width; x += size) {+ lines.push({ axis: 'x', position: x })+ }+ for (let y = grid.offset ?? 0; y <= node.height; y += size) {+ lines.push({ axis: 'y', position: y })+ }+ return lines+ }++ const sections = layoutGuideSections(node, grid)+ for (const section of sections) {+ lines.push(+ { axis: section.axis, position: section.start },+ { axis: section.axis, position: section.end }+ )+ }+ return lines+}diff --git a/packages/scene-graph/src/node-defaults.ts b/packages/scene-graph/src/node-defaults.tsindex 5964c62d6..a004c8909 100644--- a/packages/scene-graph/src/node-defaults.ts+++ b/packages/scene-graph/src/node-defaults.ts@@ -44,6 +44,7 @@ export function createDefaultNode(strokes: [],effects: [],layoutGrids: [],+ guides: [],fillStyleId: null,strokeStyleId: null,textStyleId: null,diff --git a/packages/scene-graph/src/snap.ts b/packages/scene-graph/src/snap.tsindex 273388721..9e3b83312 100644--- a/packages/scene-graph/src/snap.ts+++ b/packages/scene-graph/src/snap.ts@@ -2,7 +2,7 @@ import type { SceneNode } from './'import { rotatedBBox } from './geometry'import type { Rect } from './primitives'-const SNAP_THRESHOLD = 5+const DEFAULT_SNAP_THRESHOLD = 5export interface SnapGuide {axis: 'x' | 'y'@@ -21,10 +21,13 @@ function getEdges(node: SceneNode) {return rotatedBBox(node.x, node.y, node.width, node.height, node.rotation)}+// Pairwise edge/center matching intentionally keeps both axes in one pass.+// eslint-disable-next-line complexityexport function computeSnap(movingIds: Set<string>,movingBounds: Rect,- allNodes: SceneNode[]+ allNodes: SceneNode[],+ threshold = DEFAULT_SNAP_THRESHOLD): SnapResult {const targets = allNodes.filter((n) => !movingIds.has(n.id))if (targets.length === 0) return { dx: 0, dy: 0, guides: [] }@@ -56,7 +59,7 @@ export function computeSnap(for (const [mVal, tVal] of xPairs) {const d = tVal - mVal- if (Math.abs(d) < SNAP_THRESHOLD && Math.abs(d) <= Math.abs(bestDx)) {+ if (Math.abs(d) < threshold && Math.abs(d) <= Math.abs(bestDx)) {if (Math.abs(d) < Math.abs(bestDx)) {bestDx = dguides.length = guides.filter((g) => g.axis === 'y').length@@ -86,7 +89,7 @@ export function computeSnap(for (const [mVal, tVal] of yPairs) {const d = tVal - mVal- if (Math.abs(d) < SNAP_THRESHOLD && Math.abs(d) <= Math.abs(bestDy)) {+ if (Math.abs(d) < threshold && Math.abs(d) <= Math.abs(bestDy)) {if (Math.abs(d) < Math.abs(bestDy)) {for (let i = guides.length - 1; i >= 0; i--) {if (guides[i].axis === 'y') guides.splice(i, 1)@@ -103,8 +106,8 @@ export function computeSnap(}return {- dx: Math.abs(bestDx) <= SNAP_THRESHOLD ? bestDx : 0,- dy: Math.abs(bestDy) <= SNAP_THRESHOLD ? bestDy : 0,+ dx: Math.abs(bestDx) <= threshold ? bestDx : 0,+ dy: Math.abs(bestDy) <= threshold ? bestDy : 0,guides}}diff --git a/packages/scene-graph/src/types.ts b/packages/scene-graph/src/types.tsindex 47e9dd53c..7c5952ebd 100644--- a/packages/scene-graph/src/types.ts+++ b/packages/scene-graph/src/types.ts@@ -1,3 +1,4 @@+import type { CanvasGuide } from './guides'import type { Color, Matrix, Rect, Vector } from './primitives'export interface SceneGraphEvents {@@ -411,6 +412,7 @@ export interface SceneNode {strokes: Stroke[]effects: Effect[]layoutGrids: LayoutGrid[]+ guides: CanvasGuide[]fillStyleId: string | nullstrokeStyleId: string | nulltextStyleId: string | nulldiff --git a/packages/scene-graph/tsdown.config.ts b/packages/scene-graph/tsdown.config.tsindex c0776071e..4baee7a1a 100644--- a/packages/scene-graph/tsdown.config.ts+++ b/packages/scene-graph/tsdown.config.ts@@ -22,6 +22,8 @@ export default defineConfig({coordinate: './src/coordinate.ts',matrix: './src/matrix.ts',geometry: './src/geometry.ts',+ guides: './src/guides.ts',+ 'layout-guides': './src/layout-guides.ts',resize: './src/resize.ts','parse-path': './src/parse-path.ts'},@@ -49,7 +51,8 @@ export default defineConfig({const cleanId = id.split('?')[0]const parts = cleanId.split(/[\\/]/g)const srcIndex = parts.lastIndexOf('src')- const file = srcIndex >= 0 ? parts.slice(srcIndex + 1).join('/') : parts.at(-1) ?? 'chunk'+ const file =+ srcIndex >= 0 ? parts.slice(srcIndex + 1).join('/') : (parts.at(-1) ?? 'chunk')return `chunks/${file.replace(/\.(ts|tsx)$/, '')}`}}diff --git a/packages/vue/src/canvas/node-edit-input/use.ts b/packages/vue/src/canvas/node-edit-input/use.tsindex e31af3952..94ab083ba 100644--- a/packages/vue/src/canvas/node-edit-input/use.ts+++ b/packages/vue/src/canvas/node-edit-input/use.ts@@ -47,6 +47,7 @@ export function handleNodeEditMouseUp(drag: Ref<DragState | null>, editor: Edito}if (d.type === 'edit-node') {+ editor.setSnapGuides([])const es = getCanvasNodeEditState(editor)if (es && d.origPositions.size === 1) {const [draggedIdx] = d.origPositions.keys()@@ -70,6 +71,7 @@ export function handleNodeEditMouseUp(drag: Ref<DragState | null>, editor: Edito}if (d.type === 'edit-handle') {+ editor.setSnapGuides([])drag.value = nullreturn true}diff --git a/packages/vue/src/canvas/useCanvasInput.ts b/packages/vue/src/canvas/useCanvasInput.tsindex 12e4146d6..961ff4710 100644--- a/packages/vue/src/canvas/useCanvasInput.ts+++ b/packages/vue/src/canvas/useCanvasInput.ts@@ -280,7 +280,7 @@ export function useCanvasInput(return}if (d.type === 'move') {- handleMoveMove(d, cx, cy, sx, sy, editor)+ handleMoveMove(d, cx, cy, sx, sy, editor, e.ctrlKey)return}if (d.type === 'text-select') {@@ -288,7 +288,7 @@ export function useCanvasInput(return}if (d.type === 'resize') {- applyResize(d, cx, cy, e.shiftKey, editor)+ applyResize(d, cx, cy, e.shiftKey, editor, e.ctrlKey)return}@@ -298,7 +298,7 @@ export function useCanvasInput(}if (d.type === 'edit-node' || d.type === 'edit-handle') {- handleNodeEditMove(d, cx, cy, editor, e.altKey, e.metaKey || e.ctrlKey, e.shiftKey)+ handleNodeEditMove(d, cx, cy, editor, e.altKey, e.metaKey || e.ctrlKey, e.shiftKey, e.ctrlKey)return}@@ -353,13 +353,28 @@ export function useCanvasInput(refreshMeasurement()}+ function clearTransientInteractionFeedback() {+ editor.setSnapGuides([])+ editor.setLayoutInsertIndicator(null)+ editor.setDropTarget(null)+ }++ function cancelPointerInteraction() {+ drag.value = null+ cursorOverride.value = null+ clearTransientInteractionFeedback()+ }+useEventListener(canvasRef, 'dblclick', onDblClick)useEventListener(canvasRef, 'mousedown', onMouseDown)useEventListener(canvasRef, 'mousemove', onMouseMove)useEventListener(canvasRef, 'mouseup', onMouseUp)useEventListener(window, 'keydown', (event) => updateModifier(event.code, true))useEventListener(window, 'keyup', (event) => updateModifier(event.code, false))- useEventListener(window, 'blur', resetMeasurementModifiers)+ useEventListener(window, 'blur', () => {+ resetMeasurementModifiers()+ cancelPointerInteraction()+ })useEventListener(canvasRef, 'mouseleave', () => {pointerInside.value = falseif (!isEnabled()) return@@ -375,6 +390,7 @@ export function useCanvasInput(const stopToolListener = editor.onEditorEvent('tool:changed', () => {if (!isEnabled()) returneditor.setMeasurementMode('off')+ cancelPointerInteraction()})onScopeDispose(stopToolListener)@@ -391,6 +407,7 @@ export function useCanvasInput(drag.value = nullcursorOverride.value = nullpointerInside.value = false+ clearTransientInteractionFeedback()resetMeasurementModifiers()}}diff --git a/packages/vue/src/i18n/locales/de/dialogs.json b/packages/vue/src/i18n/locales/de/dialogs.jsonindex 21d32a02b..7b1db8b41 100644--- a/packages/vue/src/i18n/locales/de/dialogs.json+++ b/packages/vue/src/i18n/locales/de/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Anbietereinstellungen öffnen","settings": "Einstellungen","settingsDescription": "Integrationen und App-Einstellungen verwalten.",+ "settingsGeneral": "Allgemein",+ "settingsEditing": "Bearbeitung",+ "settingsSnappingDescription": "Lege fest, wie sich Vektorpunkte beim Bearbeiten von Pfaden ausrichten.",+ "snapToGeometry": "An Geometrie ausrichten",+ "snapToGeometryDescription": "Gezogene Vektorpunkte an anderen Punkten im Pfad ausrichten.",+ "snapToObjects": "An Objekten ausrichten",+ "snapToObjectsDescription": "Vektorpunkte an Kanten und Mittelpunkten benachbarter Ebenen ausrichten.",+ "snapToPixelGrid": "Am Pixelraster ausrichten",+ "snapToPixelGridDescription": "Vektorpunkte an ganzzahligen Pixelkoordinaten ausrichten.",+ "snapTemporaryDisableHint": "Halte beim Ziehen die Strg-Taste gedrückt, um das Ausrichten vorübergehend zu deaktivieren.","settingsAIAndAgents": "KI und Agenten","models": "Modelle","modelsDescription": "Wiederverwendbare Modelle und ihre Anbieter-Verbindungen konfigurieren.",diff --git a/packages/vue/src/i18n/locales/de/menu.json b/packages/vue/src/i18n/locales/de/menu.jsonindex 432829a31..c37f603b4 100644--- a/packages/vue/src/i18n/locales/de/menu.json+++ b/packages/vue/src/i18n/locales/de/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Mittig ausrichten","arrangeAlignBottom": "Unten ausrichten","multiplayerCursors": "Multiplayer-Cursor",+ "preferences": "Einstellungen",+ "snapToGeometry": "An Geometrie ausrichten",+ "snapToObjects": "An Objekten ausrichten",+ "snapToPixelGrid": "Am Pixelraster ausrichten","renameSelection": "Auswahl umbenennen…","rulers": "Lineale","settings": "Einstellungen…",diff --git a/packages/vue/src/i18n/locales/es/dialogs.json b/packages/vue/src/i18n/locales/es/dialogs.jsonindex c311578a6..c27228ef2 100644--- a/packages/vue/src/i18n/locales/es/dialogs.json+++ b/packages/vue/src/i18n/locales/es/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Abrir opciones del proveedor","settings": "Ajustes","settingsDescription": "Gestiona integraciones y preferencias de la aplicación.",+ "settingsGeneral": "General",+ "settingsEditing": "Edición",+ "settingsSnappingDescription": "Controla cómo se alinean los puntos vectoriales al editar trazados.",+ "snapToGeometry": "Ajustar a la geometría",+ "snapToGeometryDescription": "Alinea los puntos vectoriales arrastrados con otros puntos del trazado.",+ "snapToObjects": "Ajustar a objetos",+ "snapToObjectsDescription": "Alinea los puntos vectoriales con los bordes y centros de las capas cercanas.",+ "snapToPixelGrid": "Ajustar a la cuadrícula de píxeles",+ "snapToPixelGridDescription": "Alinea los puntos vectoriales con coordenadas de píxeles enteros.",+ "snapTemporaryDisableHint": "Mantén pulsada la tecla Control mientras arrastras para desactivar temporalmente el ajuste.","settingsAIAndAgents": "IA y agentes","models": "Modelos","modelsDescription": "Configura modelos reutilizables y sus conexiones de proveedor.",diff --git a/packages/vue/src/i18n/locales/es/menu.json b/packages/vue/src/i18n/locales/es/menu.jsonindex 1f283145c..9e0422d8a 100644--- a/packages/vue/src/i18n/locales/es/menu.json+++ b/packages/vue/src/i18n/locales/es/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Alinear centro verticalmente","arrangeAlignBottom": "Alinear abajo","multiplayerCursors": "Cursores multijugador",+ "preferences": "Preferencias",+ "snapToGeometry": "Ajustar a la geometría",+ "snapToObjects": "Ajustar a objetos",+ "snapToPixelGrid": "Ajustar a la cuadrícula de píxeles","renameSelection": "Renombrar selección…","rulers": "Reglas","settings": "Ajustes…",diff --git a/packages/vue/src/i18n/locales/fr/dialogs.json b/packages/vue/src/i18n/locales/fr/dialogs.jsonindex 2cf51869f..165790fdf 100644--- a/packages/vue/src/i18n/locales/fr/dialogs.json+++ b/packages/vue/src/i18n/locales/fr/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Ouvrir les paramètres du fournisseur","settings": "Paramètres","settingsDescription": "Gérez les intégrations et les préférences de l’application.",+ "settingsGeneral": "Général",+ "settingsEditing": "Édition",+ "settingsSnappingDescription": "Contrôlez l’alignement des points vectoriels lors de la modification des tracés.",+ "snapToGeometry": "Aligner sur la géométrie",+ "snapToGeometryDescription": "Aligne les points vectoriels déplacés sur les autres points du tracé.",+ "snapToObjects": "Aligner sur les objets",+ "snapToObjectsDescription": "Aligne les points vectoriels sur les bords et les centres des calques voisins.",+ "snapToPixelGrid": "Aligner sur la grille de pixels",+ "snapToPixelGridDescription": "Aligne les points vectoriels sur des coordonnées de pixels entières.",+ "snapTemporaryDisableHint": "Maintenez la touche Contrôle pendant le déplacement pour désactiver temporairement l’alignement.","settingsAIAndAgents": "IA et agents","models": "Modèles","modelsDescription": "Configurez des modèles réutilisables et leurs connexions fournisseur.",diff --git a/packages/vue/src/i18n/locales/fr/menu.json b/packages/vue/src/i18n/locales/fr/menu.jsonindex 9e9a764a0..0750f5bb7 100644--- a/packages/vue/src/i18n/locales/fr/menu.json+++ b/packages/vue/src/i18n/locales/fr/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Centrer verticalement","arrangeAlignBottom": "Aligner en bas","multiplayerCursors": "Curseurs multijoueurs",+ "preferences": "Préférences",+ "snapToGeometry": "Aligner sur la géométrie",+ "snapToObjects": "Aligner sur les objets",+ "snapToPixelGrid": "Aligner sur la grille de pixels","renameSelection": "Renommer la sélection…","rulers": "Règles","settings": "Paramètres…",diff --git a/packages/vue/src/i18n/locales/it/dialogs.json b/packages/vue/src/i18n/locales/it/dialogs.jsonindex bcc990b36..e42b69385 100644--- a/packages/vue/src/i18n/locales/it/dialogs.json+++ b/packages/vue/src/i18n/locales/it/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Apri impostazioni provider","settings": "Impostazioni","settingsDescription": "Gestisci integrazioni e preferenze dell’app.",+ "settingsGeneral": "Generali",+ "settingsEditing": "Modifica",+ "settingsSnappingDescription": "Controlla come si allineano i punti vettoriali durante la modifica dei tracciati.",+ "snapToGeometry": "Aggancia alla geometria",+ "snapToGeometryDescription": "Allinea i punti vettoriali trascinati agli altri punti del tracciato.",+ "snapToObjects": "Aggancia agli oggetti",+ "snapToObjectsDescription": "Allinea i punti vettoriali ai bordi e ai centri dei livelli vicini.",+ "snapToPixelGrid": "Aggancia alla griglia di pixel",+ "snapToPixelGridDescription": "Allinea i punti vettoriali a coordinate di pixel intere.",+ "snapTemporaryDisableHint": "Tieni premuto Control durante il trascinamento per disattivare temporaneamente l’aggancio.","settingsAIAndAgents": "IA e agenti","models": "Modelli","modelsDescription": "Configura modelli riutilizzabili e le connessioni ai provider.",diff --git a/packages/vue/src/i18n/locales/it/menu.json b/packages/vue/src/i18n/locales/it/menu.jsonindex c51128460..d1eb43814 100644--- a/packages/vue/src/i18n/locales/it/menu.json+++ b/packages/vue/src/i18n/locales/it/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Centra verticalmente","arrangeAlignBottom": "Allinea in basso","multiplayerCursors": "Cursori multigiocatore",+ "preferences": "Preferenze",+ "snapToGeometry": "Aggancia alla geometria",+ "snapToObjects": "Aggancia agli oggetti",+ "snapToPixelGrid": "Aggancia alla griglia di pixel","renameSelection": "Rinomina selezione…","rulers": "Righelli","settings": "Impostazioni…",diff --git a/packages/vue/src/i18n/locales/ja/dialogs.json b/packages/vue/src/i18n/locales/ja/dialogs.jsonindex 501f9667e..63b7d9058 100644--- a/packages/vue/src/i18n/locales/ja/dialogs.json+++ b/packages/vue/src/i18n/locales/ja/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "プロバイダー設定を開く","settings": "設定","settingsDescription": "連携サービスとアプリの設定を管理します。",+ "settingsGeneral": "一般",+ "settingsEditing": "編集",+ "settingsSnappingDescription": "パス編集中のベクターポイントの整列方法を設定します。",+ "snapToGeometry": "ジオメトリにスナップ",+ "snapToGeometryDescription": "ドラッグしたベクターポイントをパス内の他のポイントに揃えます。",+ "snapToObjects": "オブジェクトにスナップ",+ "snapToObjectsDescription": "ベクターポイントを近くのレイヤーの端や中心に揃えます。",+ "snapToPixelGrid": "ピクセルグリッドにスナップ",+ "snapToPixelGridDescription": "ベクターポイントを整数のピクセル座標に揃えます。",+ "snapTemporaryDisableHint": "ドラッグ中にControlキーを押すと、スナップを一時的に無効にできます。","settingsAIAndAgents": "AIとエージェント","models": "モデル","modelsDescription": "再利用可能なモデルとプロバイダー接続を設定します。",diff --git a/packages/vue/src/i18n/locales/ja/menu.json b/packages/vue/src/i18n/locales/ja/menu.jsonindex 1254e423a..80ef0e118 100644--- a/packages/vue/src/i18n/locales/ja/menu.json+++ b/packages/vue/src/i18n/locales/ja/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "上下中央揃え","arrangeAlignBottom": "下揃え","multiplayerCursors": "マルチプレイヤーカーソル",+ "preferences": "環境設定",+ "snapToGeometry": "ジオメトリにスナップ",+ "snapToObjects": "オブジェクトにスナップ",+ "snapToPixelGrid": "ピクセルグリッドにスナップ","renameSelection": "選択範囲の名前を変更…","rulers": "ルーラー","settings": "設定…",diff --git a/packages/vue/src/i18n/locales/pl/dialogs.json b/packages/vue/src/i18n/locales/pl/dialogs.jsonindex 86a8ba051..716c73a17 100644--- a/packages/vue/src/i18n/locales/pl/dialogs.json+++ b/packages/vue/src/i18n/locales/pl/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Otwórz ustawienia dostawcy","settings": "Ustawienia","settingsDescription": "Zarządzaj integracjami i preferencjami aplikacji.",+ "settingsGeneral": "Ogólne",+ "settingsEditing": "Edycja",+ "settingsSnappingDescription": "Określ sposób wyrównywania punktów wektorowych podczas edycji ścieżek.",+ "snapToGeometry": "Przyciągaj do geometrii",+ "snapToGeometryDescription": "Wyrównuj przeciągane punkty wektorowe do innych punktów ścieżki.",+ "snapToObjects": "Przyciągaj do obiektów",+ "snapToObjectsDescription": "Wyrównuj punkty wektorowe do krawędzi i środków pobliskich warstw.",+ "snapToPixelGrid": "Przyciągaj do siatki pikseli",+ "snapToPixelGridDescription": "Wyrównuj punkty wektorowe do pełnych współrzędnych pikseli.",+ "snapTemporaryDisableHint": "Przytrzymaj Control podczas przeciągania, aby tymczasowo wyłączyć przyciąganie.","settingsAIAndAgents": "AI i agenci","models": "Modele","modelsDescription": "Skonfiguruj modele wielokrotnego użytku i połączenia z dostawcami.",diff --git a/packages/vue/src/i18n/locales/pl/menu.json b/packages/vue/src/i18n/locales/pl/menu.jsonindex 30a612e84..ca9fbfbc0 100644--- a/packages/vue/src/i18n/locales/pl/menu.json+++ b/packages/vue/src/i18n/locales/pl/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Wyśrodkuj w pionie","arrangeAlignBottom": "Wyrównaj do dołu","multiplayerCursors": "Kursory wielu użytkowników",+ "preferences": "Preferencje",+ "snapToGeometry": "Przyciągaj do geometrii",+ "snapToObjects": "Przyciągaj do obiektów",+ "snapToPixelGrid": "Przyciągaj do siatki pikseli","renameSelection": "Zmień nazwę zaznaczenia…","rulers": "Linijki","settings": "Ustawienia…",diff --git a/packages/vue/src/i18n/locales/ru/dialogs.json b/packages/vue/src/i18n/locales/ru/dialogs.jsonindex 151abc177..f2ba43cd9 100644--- a/packages/vue/src/i18n/locales/ru/dialogs.json+++ b/packages/vue/src/i18n/locales/ru/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "Открыть настройки провайдера","settings": "Настройки","settingsDescription": "Управление интеграциями и настройками приложения.",+ "settingsGeneral": "Основные",+ "settingsEditing": "Редактирование",+ "settingsSnappingDescription": "Настройте выравнивание векторных точек при редактировании контуров.",+ "snapToGeometry": "Привязка к геометрии",+ "snapToGeometryDescription": "Выравнивать перетаскиваемые векторные точки по другим точкам контура.",+ "snapToObjects": "Привязка к объектам",+ "snapToObjectsDescription": "Выравнивать векторные точки по краям и центрам соседних слоёв.",+ "snapToPixelGrid": "Привязка к пиксельной сетке",+ "snapToPixelGridDescription": "Выравнивать векторные точки по целым пиксельным координатам.",+ "snapTemporaryDisableHint": "Удерживайте Control при перетаскивании, чтобы временно отключить привязку.","settingsAIAndAgents": "ИИ и агенты","models": "Модели","modelsDescription": "Настройте переиспользуемые модели и подключения к провайдерам.",diff --git a/packages/vue/src/i18n/locales/ru/menu.json b/packages/vue/src/i18n/locales/ru/menu.jsonindex d24a4078e..51ddb3405 100644--- a/packages/vue/src/i18n/locales/ru/menu.json+++ b/packages/vue/src/i18n/locales/ru/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "Выровнять по центру по вертикали","arrangeAlignBottom": "Выровнять по нижнему краю","multiplayerCursors": "Курсоры участников",+ "preferences": "Настройки",+ "snapToGeometry": "Привязка к геометрии",+ "snapToObjects": "Привязка к объектам",+ "snapToPixelGrid": "Привязка к пиксельной сетке","renameSelection": "Переименовать выделение…","rulers": "Линейки","settings": "Настройки…",diff --git a/packages/vue/src/i18n/locales/zh-cn/dialogs.json b/packages/vue/src/i18n/locales/zh-cn/dialogs.jsonindex defa84e2c..1bafefbce 100644--- a/packages/vue/src/i18n/locales/zh-cn/dialogs.json+++ b/packages/vue/src/i18n/locales/zh-cn/dialogs.json@@ -83,6 +83,16 @@"openProviderSettings": "打开提供商设置","settings": "设置","settingsDescription": "管理集成和应用偏好设置。",+ "settingsGeneral": "通用",+ "settingsEditing": "编辑",+ "settingsSnappingDescription": "控制编辑路径时矢量点的对齐方式。",+ "snapToGeometry": "吸附到几何图形",+ "snapToGeometryDescription": "将拖动的矢量点与路径中的其他点对齐。",+ "snapToObjects": "吸附到对象",+ "snapToObjectsDescription": "将矢量点与附近图层的边缘和中心对齐。",+ "snapToPixelGrid": "吸附到像素网格",+ "snapToPixelGridDescription": "将矢量点与整数像素坐标对齐。",+ "snapTemporaryDisableHint": "拖动时按住 Control 可暂时禁用吸附。","settingsAIAndAgents": "AI 和代理","models": "模型","modelsDescription": "配置可复用模型及其提供商连接。",diff --git a/packages/vue/src/i18n/locales/zh-cn/menu.json b/packages/vue/src/i18n/locales/zh-cn/menu.jsonindex 502b9b87b..b862a707e 100644--- a/packages/vue/src/i18n/locales/zh-cn/menu.json+++ b/packages/vue/src/i18n/locales/zh-cn/menu.json@@ -56,6 +56,10 @@"arrangeAlignMiddle": "垂直居中","arrangeAlignBottom": "底部对齐","multiplayerCursors": "多人光标",+ "preferences": "偏好设置",+ "snapToGeometry": "吸附到几何图形",+ "snapToObjects": "吸附到对象",+ "snapToPixelGrid": "吸附到像素网格","renameSelection": "重命名所选内容…","rulers": "标尺","settings": "设置…",diff --git a/packages/vue/src/i18n/messages/dialogs.ts b/packages/vue/src/i18n/messages/dialogs.tsindex 29d463dce..262c3308b 100644--- a/packages/vue/src/i18n/messages/dialogs.ts+++ b/packages/vue/src/i18n/messages/dialogs.ts@@ -171,6 +171,16 @@ export const dialogMessageDefaults = {openProviderSettings: 'Open provider settings',settings: 'Settings',settingsDescription: 'Manage integrations and app preferences.',+ settingsGeneral: 'General',+ settingsEditing: 'Editing',+ settingsSnappingDescription: 'Control how vector points align while you edit paths.',+ snapToGeometry: 'Snap to geometry',+ snapToGeometryDescription: 'Align dragged vector points to other points in the path.',+ snapToObjects: 'Snap to objects',+ snapToObjectsDescription: 'Align vector points to the edges and centers of nearby layers.',+ snapToPixelGrid: 'Snap to pixel grid',+ snapToPixelGridDescription: 'Align vector points to whole-pixel coordinates.',+ snapTemporaryDisableHint: 'Hold Control while dragging to temporarily disable snapping.',settingsAIAndAgents: 'AI & agents',models: 'Models',modelsDescription: 'Configure reusable models and their provider connections.',diff --git a/packages/vue/src/i18n/messages/menu.ts b/packages/vue/src/i18n/messages/menu.tsindex c4387d651..5f99da376 100644--- a/packages/vue/src/i18n/messages/menu.ts+++ b/packages/vue/src/i18n/messages/menu.ts@@ -29,6 +29,10 @@ export const menuMessageDefaults = {settings: 'Settings…',rulers: 'Rulers',multiplayerCursors: 'Multiplayer cursors',+ preferences: 'Preferences',+ snapToGeometry: 'Snap to geometry',+ snapToObjects: 'Snap to objects',+ snapToPixelGrid: 'Snap to pixel grid',checkUpdates: 'Check for updates…',moveToPage: 'Move to page',diff --git a/packages/vue/src/shared/input/duplicate-drag.ts b/packages/vue/src/shared/input/duplicate-drag.tsindex 746385c03..acb4cac50 100644--- a/packages/vue/src/shared/input/duplicate-drag.ts+++ b/packages/vue/src/shared/input/duplicate-drag.ts@@ -40,6 +40,8 @@ export function duplicateAndDrag(startY: cy,currentX: cx,currentY: cy,+ appliedDx: 0,+ appliedDy: 0,startScreenX: sx,startScreenY: sy,dragStarted: true,diff --git a/packages/vue/src/shared/input/explicit-snap-targets.ts b/packages/vue/src/shared/input/explicit-snap-targets.tsnew file mode 100644index 000000000..de9046312--- /dev/null+++ b/packages/vue/src/shared/input/explicit-snap-targets.ts@@ -0,0 +1,72 @@+import type { Editor } from '@open-pencil/core/editor'+import type { SceneNode } from '@open-pencil/scene-graph'+import { getWorldMatrix } from '@open-pencil/scene-graph/coordinate'+import { layoutGuideLines } from '@open-pencil/scene-graph/layout-guides'+import Matrix from '@open-pencil/scene-graph/matrix'+import type { Vector } from '@open-pencil/scene-graph/primitives'++import type { ExplicitSnapTarget } from '#vue/shared/input/snap'++function pageGuideTargets(editor: Editor): ExplicitSnapTarget[] {+ const page = editor.graph.getNode(editor.state.currentPageId)+ if (!page) return []+ return page.guides.map((guide) => ({+ kind: 'canvas-guide',+ axis: guide.axis,+ position: guide.position,+ from: -1e6,+ to: 1e6+ }))+}++function axisAlignedTarget(start: Vector, end: Vector): ExplicitSnapTarget | null {+ const dx = Math.abs(end.x - start.x)+ const dy = Math.abs(end.y - start.y)+ if (dx <= Number.EPSILON * Math.max(1, Math.abs(start.x), Math.abs(end.x))) {+ return {+ kind: 'layout-guide',+ axis: 'x',+ position: start.x,+ from: Math.min(start.y, end.y),+ to: Math.max(start.y, end.y)+ }+ }+ if (dy <= Number.EPSILON * Math.max(1, Math.abs(start.y), Math.abs(end.y))) {+ return {+ kind: 'layout-guide',+ axis: 'y',+ position: start.y,+ from: Math.min(start.x, end.x),+ to: Math.max(start.x, end.x)+ }+ }+ return null+}++function layoutGuideTargets(parent: SceneNode, editor: Editor): ExplicitSnapTarget[] {+ const matrix = getWorldMatrix(parent, editor.graph)+ return parent.layoutGrids.flatMap((grid) =>+ layoutGuideLines(parent, grid).flatMap((line) => {+ const start = Matrix.mapPoint(+ matrix,+ line.axis === 'x' ? { x: line.position, y: 0 } : { x: 0, y: line.position }+ )+ const end = Matrix.mapPoint(+ matrix,+ line.axis === 'x'+ ? { x: line.position, y: parent.height }+ : { x: parent.width, y: line.position }+ )+ const target = axisAlignedTarget(start, end)+ return target ? [target] : []+ })+ )+}++export function explicitSnapTargets(parentId: string | null | undefined, editor: Editor) {+ const parent = parentId ? editor.graph.getNode(parentId) : undefined+ return [+ ...pageGuideTargets(editor),+ ...(parent && !editor.isTopLevel(parent.id) ? layoutGuideTargets(parent, editor) : [])+ ]+}diff --git a/packages/vue/src/shared/input/move-snap.ts b/packages/vue/src/shared/input/move-snap.tsindex 3251132cc..b92168615 100644--- a/packages/vue/src/shared/input/move-snap.ts+++ b/packages/vue/src/shared/input/move-snap.ts@@ -1,53 +1,83 @@import type { Editor } from '@open-pencil/core/editor'-import { computeSelectionBounds, computeSnap } from '@open-pencil/scene-graph'+import { computeSelectionBounds } from '@open-pencil/scene-graph'import type { SceneNode } from '@open-pencil/scene-graph'+import { getAxisAlignedWorldBounds } from '@open-pencil/scene-graph/coordinate'+import type { Rect } from '@open-pencil/scene-graph/primitives'+import { explicitSnapTargets } from '#vue/shared/input/explicit-snap-targets'+import {+ resolveObjectPixelSnap,+ worldBoundsNode,+ worldDeltaToParentLocal+} from '#vue/shared/input/snap'import type { DragMove } from '#vue/shared/input/types'+function movingSelection(drag: DragMove, dx: number, dy: number, editor: Editor): SceneNode[] {+ const selectedNodes: SceneNode[] = []+ for (const [id, original] of drag.originals) {+ const node = editor.graph.getNode(id)+ if (!node) continue+ const bounds = getAxisAlignedWorldBounds(+ { ...node, x: original.x, y: original.y },+ editor.graph+ )+ selectedNodes.push({+ ...node,+ x: bounds.x + dx,+ y: bounds.y + dy,+ width: bounds.width,+ height: bounds.height,+ rotation: 0,+ flipX: false,+ flipY: false+ })+ }+ return selectedNodes+}++function absoluteMoveContext(+ drag: DragMove,+ bounds: Rect,+ editor: Editor+): { bounds: Rect; targets: SceneNode[] } {+ const firstId = drag.originals.keys().next().value+ const firstNode = firstId ? editor.graph.getNode(firstId) : undefined+ const parentId = firstNode?.parentId ?? editor.state.currentPageId+ return {+ bounds,+ targets: editor.graph.getChildren(parentId).map((node) => worldBoundsNode(node, editor))+ }+}+export function applyMoveSnap(- d: DragMove,+ drag: DragMove,dx: number,dy: number,- editor: Editor+ editor: Editor,+ disableSnapping = false): { dx: number; dy: number } {- const selectedNodes: SceneNode[] = []- for (const [id, orig] of d.originals) {- const node = editor.graph.getNode(id)- if (node) {- const abs = editor.graph.getAbsolutePosition(id)- const parentAbs = node.parentId- ? editor.graph.getAbsolutePosition(node.parentId)- : { x: 0, y: 0 }- selectedNodes.push({- ...node,- x: abs.x - parentAbs.x - node.x + orig.x + dx,- y: abs.y - parentAbs.y - node.y + orig.y + dy- })- }+ const selectionBounds = computeSelectionBounds(movingSelection(drag, dx, dy, editor))+ if (!selectionBounds || disableSnapping) {+ editor.setSnapGuides([])+ return { dx, dy }}- const bounds = computeSelectionBounds(selectedNodes)- if (!bounds) return { dx, dy }-- const firstId = [...d.originals.keys()][0]- const firstNode = editor.graph.getNode(firstId)+ const context = absoluteMoveContext(drag, selectionBounds, editor)+ const firstId = drag.originals.keys().next().value+ const firstNode = firstId ? editor.graph.getNode(firstId) : undefinedconst parentId = firstNode?.parentId ?? editor.state.currentPageId- const siblings = editor.graph.getChildren(parentId)- const parentAbs = !editor.isTopLevel(parentId)- ? editor.graph.getAbsolutePosition(parentId)- : { x: 0, y: 0 }- const absTargets = siblings.map((node) => ({- ...node,- x: node.x + parentAbs.x,- y: node.y + parentAbs.y- }))- const absBounds = {- x: bounds.x + parentAbs.x,- y: bounds.y + parentAbs.y,- width: bounds.width,- height: bounds.height- }- const snap = computeSnap(editor.state.selectedIds, absBounds, absTargets)+ const snap = resolveObjectPixelSnap(+ editor.state.selectedIds,+ context.bounds,+ context.targets,+ editor,+ explicitSnapTargets(parentId, editor)+ )editor.setSnapGuides(snap.guides)- return { dx: dx + snap.dx, dy: dy + snap.dy }+ const localDelta = worldDeltaToParentLocal({ x: dx, y: dy }, parentId, editor)+ const localCorrection = worldDeltaToParentLocal(snap.correction, parentId, editor)+ return {+ dx: localDelta.x + localCorrection.x,+ dy: localDelta.y + localCorrection.y+ }}diff --git a/packages/vue/src/shared/input/move.ts b/packages/vue/src/shared/input/move.tsindex 9bdcf3b21..82d041f0b 100644--- a/packages/vue/src/shared/input/move.ts+++ b/packages/vue/src/shared/input/move.ts@@ -57,7 +57,8 @@ export function handleMoveMove(cy: number,sx: number,sy: number,- editor: Editor+ editor: Editor,+ disableSnapping = false) {d.currentX = cxd.currentY = cy@@ -94,12 +95,14 @@ export function handleMoveMove(editor.setLayoutInsertIndicator(null)- const snapped = applyMoveSnap(d, dx, dy, editor)+ const snapped = applyMoveSnap(d, dx, dy, editor, disableSnapping)dx = snapped.dxdy = snapped.dy+ d.appliedDx = dx+ d.appliedDy = dyfor (const [id, orig] of d.originals) {- editor.graph.updateNodePositionPreview(id, Math.round(orig.x + dx), Math.round(orig.y + dy))+ editor.graph.updateNodePositionPreview(id, orig.x + dx, orig.y + dy)}editor.setDropTarget(dropTarget?.id ?? null)@@ -124,10 +127,8 @@ function restoreOriginalPositions(d: DragMove, editor: Editor) {}function applyFinalPositions(d: DragMove, editor: Editor) {- const dx = d.currentX - d.startX- const dy = d.currentY - d.startYfor (const [id, orig] of d.originals) {- editor.updateNode(id, { x: Math.round(orig.x + dx), y: Math.round(orig.y + dy) })+ editor.updateNode(id, { x: orig.x + d.appliedDx, y: orig.y + d.appliedDy })}}diff --git a/packages/vue/src/shared/input/node-edit/index.ts b/packages/vue/src/shared/input/node-edit/index.tsindex 64f3aa04d..171072e52 100644--- a/packages/vue/src/shared/input/node-edit/index.ts+++ b/packages/vue/src/shared/input/node-edit/index.ts@@ -4,6 +4,7 @@ import {hitTestEditVertex,isEndpoint} from '#vue/shared/input/node-edit/hit-test'+import { applyNodeEditSnap } from '#vue/shared/input/node-edit/snap'import type { DragEditHandle, DragEditNode, DragState } from '#vue/shared/input/types'export {@@ -149,20 +150,24 @@ export function handleNodeEditMove(editor: Editor,breakMirroring?: boolean,continuous?: boolean,- lockDirection?: boolean+ lockDirection?: boolean,+ disableSnapping?: boolean) {const nodeEditEditor = editor as Editor & NodeEditEditorif (d.type === 'edit-node') {- const dx = cx - d.startX- const dy = cy - d.startY+ const unsnappedDx = cx - d.startX+ const unsnappedDy = cy - d.startYconst es = getNodeEditState(editor)if (!es) return+ let snapped = { x: unsnappedDx, y: unsnappedDy }+ if (disableSnapping) editor.setSnapGuides([])+ else snapped = applyNodeEditSnap(d, unsnappedDx, unsnappedDy, editor, es)for (const [idx, orig] of d.origPositions) {es.vertices[idx] = {...es.vertices[idx],- x: orig.x + dx,- y: orig.y + dy+ x: orig.x + snapped.x,+ y: orig.y + snapped.y}}editor.requestRepaint()diff --git a/packages/vue/src/shared/input/node-edit/snap.ts b/packages/vue/src/shared/input/node-edit/snap.tsnew file mode 100644index 000000000..6e14c1309--- /dev/null+++ b/packages/vue/src/shared/input/node-edit/snap.ts@@ -0,0 +1,93 @@+import type { Editor } from '@open-pencil/core/editor'+import type { SceneNode } from '@open-pencil/scene-graph'+import type { Rect, Vector } from '@open-pencil/scene-graph/primitives'++import { explicitSnapTargets } from '#vue/shared/input/explicit-snap-targets'+import type { NodeEditState } from '#vue/shared/input/node-edit/hit-test'+import {+ resolveObjectPixelSnap,+ type GeometrySnapTarget,+ worldBoundsNode+} from '#vue/shared/input/snap'+import type { DragEditNode } from '#vue/shared/input/types'++function draggedVertexBounds(drag: DragEditNode, dx: number, dy: number): Rect | null {+ if (drag.origPositions.size === 0) return null++ let minX = Infinity+ let minY = Infinity+ let maxX = -Infinity+ let maxY = -Infinity+ for (const position of drag.origPositions.values()) {+ const x = position.x + dx+ const y = position.y + dy+ minX = Math.min(minX, x)+ minY = Math.min(minY, y)+ maxX = Math.max(maxX, x)+ maxY = Math.max(maxY, y)+ }++ return { x: minX, y: minY, width: maxX - minX, height: maxY - minY }+}++function siblingSnapTargets(editor: Editor, editedNode: SceneNode): SceneNode[] {+ const parentId = editedNode.parentId ?? editor.state.currentPageId+ return editor.graph+ .getChildren(parentId)+ .filter((node) => node.id !== editedNode.id)+ .map((node) => worldBoundsNode(node, editor))+}++function geometrySnapTargets(+ editor: Editor,+ editState: NodeEditState,+ movingIndices: Set<number>+): GeometrySnapTarget[] {+ if (!editor.state.snappingPreferences.geometry) return []+ return editState.vertices.flatMap((vertex, index) => {+ if (movingIndices.has(index)) return []+ return [+ {+ kind: 'geometry',+ axis: 'x',+ position: vertex.x,+ from: vertex.y,+ to: vertex.y+ },+ {+ kind: 'geometry',+ axis: 'y',+ position: vertex.y,+ from: vertex.x,+ to: vertex.x+ }+ ]+ })+}++export function applyNodeEditSnap(+ drag: DragEditNode,+ dx: number,+ dy: number,+ editor: Editor,+ editState: NodeEditState+): Vector {+ const bounds = draggedVertexBounds(drag, dx, dy)+ const editedNode = editor.graph.getNode(editState.nodeId)+ if (!bounds || !editedNode) {+ editor.setSnapGuides([])+ return { x: dx, y: dy }+ }++ const parentId = editedNode.parentId ?? editor.state.currentPageId+ const snap = resolveObjectPixelSnap(+ new Set([editedNode.id]),+ bounds,+ siblingSnapTargets(editor, editedNode),+ editor,+ explicitSnapTargets(parentId, editor),+ geometrySnapTargets(editor, editState, new Set(drag.origPositions.keys()))+ )+ editor.setSnapGuides(snap.guides)+ return { x: dx + snap.correction.x, y: dy + snap.correction.y }+}diff --git a/packages/vue/src/shared/input/resize.ts b/packages/vue/src/shared/input/resize.tsindex e62da010b..4179c394a 100644--- a/packages/vue/src/shared/input/resize.ts+++ b/packages/vue/src/shared/input/resize.ts@@ -15,6 +15,7 @@ import {} from '@open-pencil/scene-graph/resize'import { calculateResizeRect } from '#vue/shared/input/resize/rect'+import { applyResizeSnap } from '#vue/shared/input/resize/snap'import type { DragResize } from '#vue/shared/input/types'/**@@ -56,9 +57,25 @@ function reflowedPathTextChanges(}}-function resizeChanges(d: DragResize, cx: number, cy: number, constrain: boolean) {+function resizeChanges(+ d: DragResize,+ cx: number,+ cy: number,+ constrain: boolean,+ editor: Editor,+ disableSnapping: boolean+) {const { origRect } = d- const newRect = calculateResizeRect(d.handle, origRect, cx - d.startX, cy - d.startY, constrain)+ const calculatedRect = calculateResizeRect(+ d.handle,+ origRect,+ cx - d.startX,+ cy - d.startY,+ constrain+ )+ const newRect = constrain+ ? calculatedRect+ : applyResizeSnap(d, calculatedRect, editor, disableSnapping)const changes: Partial<SceneNode> = {...newRect,@@ -118,14 +135,16 @@ export function applyResize(cx: number,cy: number,constrain: boolean,- editor: Editor+ editor: Editor,+ disableSnapping = false) {// Drag state lives in Vue-reactive input state; nested arrays read through// it are reactive proxies. Writing those into the graph poisons it for// structuredClone consumers (export subgraph clone, undo snapshots) with// DataCloneError. Unwrap once — also keeps the drag hot path off proxies.const d = toRaw(dragState)- const { changes, newRect } = resizeChanges(d, cx, cy, constrain)+ const { changes, newRect } = resizeChanges(d, cx, cy, constrain, editor, disableSnapping)+ d.appliedRect = { ...newRect }if (d.origRect.width > 0 && d.origRect.height > 0) {const reflow = reflowedPathTextChanges({@@ -209,6 +228,7 @@ function clearResizedRawGeometry(editor: Editor, nodeId: string): void {export function commitResizePreview(dragState: DragResize, editor: Editor) {// See applyResize — reactive drag state must not leak into graph writes.const d = toRaw(dragState)+ if (editor.state) editor.state.snapGuides = []const node = editor.graph.getNode(d.nodeId)if (!node) returnconst finalChanges = snapshotResizeFinal(node)diff --git a/packages/vue/src/shared/input/resize/rect.ts b/packages/vue/src/shared/input/resize/rect.tsindex 6c612120d..0436a33f9 100644--- a/packages/vue/src/shared/input/resize/rect.ts+++ b/packages/vue/src/shared/input/resize/rect.ts@@ -71,9 +71,9 @@ export function calculateResizeRect(}return {- x: Math.round(x),- y: Math.round(y),- width: Math.round(Math.max(1, width)),- height: Math.round(Math.max(1, height))+ x,+ y,+ width: Math.max(1, width),+ height: Math.max(1, height)}}diff --git a/packages/vue/src/shared/input/resize/snap.ts b/packages/vue/src/shared/input/resize/snap.tsnew file mode 100644index 000000000..b9722a696--- /dev/null+++ b/packages/vue/src/shared/input/resize/snap.ts@@ -0,0 +1,102 @@+import type { Editor } from '@open-pencil/core/editor'+import type { SceneNode } from '@open-pencil/scene-graph'+import { getAxisAlignedWorldBounds } from '@open-pencil/scene-graph/coordinate'+import type { Rect } from '@open-pencil/scene-graph/primitives'++import { explicitSnapTargets } from '#vue/shared/input/explicit-snap-targets'+import {+ resolveObjectPixelSnap,+ worldBoundsNode,+ worldDeltaToParentLocal+} from '#vue/shared/input/snap'+import type { DragResize, HandlePosition } from '#vue/shared/input/types'++function movesLeft(handle: HandlePosition): boolean {+ return handle.includes('w')+}++function movesRight(handle: HandlePosition): boolean {+ return handle.includes('e')+}++function movesTop(handle: HandlePosition): boolean {+ return handle === 'nw' || handle === 'n' || handle === 'ne'+}++function movesBottom(handle: HandlePosition): boolean {+ return handle === 'sw' || handle === 's' || handle === 'se'+}++function resizeTargets(drag: DragResize, editor: Editor): SceneNode[] {+ const node = editor.graph.getNode(drag.nodeId)+ const parentId = node?.parentId ?? editor.state.currentPageId+ return editor.graph+ .getChildren(parentId)+ .filter((candidate) => candidate.id !== drag.nodeId)+ .map((candidate) => worldBoundsNode(candidate, editor))+}++function activeEdgeBounds(handle: HandlePosition, rect: Rect): Rect {+ const horizontal = movesLeft(handle) || movesRight(handle)+ const vertical = movesTop(handle) || movesBottom(handle)+ let x = rect.x+ let y = rect.y+ if (movesRight(handle)) x += rect.width+ if (movesBottom(handle)) y += rect.height+ return {+ x,+ y,+ width: horizontal ? 0 : rect.width,+ height: vertical ? 0 : rect.height+ }+}++function applyEdgeDelta(handle: HandlePosition, rect: Rect, dx: number, dy: number): Rect {+ let { x, y, width, height } = rect+ if (movesLeft(handle)) {+ x += dx+ width -= dx+ } else if (movesRight(handle)) {+ width += dx+ }+ if (movesTop(handle)) {+ y += dy+ height -= dy+ } else if (movesBottom(handle)) {+ height += dy+ }+ return { x, y, width: Math.max(1, width), height: Math.max(1, height) }+}++export function applyResizeSnap(+ drag: DragResize,+ rect: Rect,+ editor: Editor,+ disableSnapping: boolean+): Rect {+ if (disableSnapping || !editor.state) {+ if (editor.state) editor.state.snapGuides = []+ return rect+ }++ const node = editor.graph.getNode(drag.nodeId)+ if (!node) return rect+ const candidate = { ...node, ...rect }+ const worldBounds = getAxisAlignedWorldBounds(candidate, editor.graph)+ const activeBounds = activeEdgeBounds(drag.handle, worldBounds)+ const snap = resolveObjectPixelSnap(+ new Set([drag.nodeId]),+ activeBounds,+ resizeTargets(drag, editor),+ editor,+ explicitSnapTargets(node.parentId, editor)+ )+ const horizontal = movesLeft(drag.handle) || movesRight(drag.handle)+ const vertical = movesTop(drag.handle) || movesBottom(drag.handle)+ const localCorrection = worldDeltaToParentLocal(snap.correction, node.parentId, editor)+ const dx = horizontal ? localCorrection.x : 0+ const dy = vertical ? localCorrection.y : 0++ editor.state.snapGuides = snap.guides+ return applyEdgeDelta(drag.handle, rect, dx, dy)+}diff --git a/packages/vue/src/shared/input/resize/start.ts b/packages/vue/src/shared/input/resize/start.tsindex 1e426aeef..bb566f6a0 100644--- a/packages/vue/src/shared/input/resize/start.ts+++ b/packages/vue/src/shared/input/resize/start.ts@@ -25,7 +25,8 @@ export function tryStartResize(cx: number, cy: number, editor: Editor): DragResiorigStrokes: snap.strokes,origTextPathData: snap.textPathData,origTextPathBox: snap.textPathBox,- origChildren: collectResizeDescendants(editor.graph, id)+ origChildren: collectResizeDescendants(editor.graph, id),+ appliedRect: { x: node.x, y: node.y, width: node.width, height: node.height }}}}diff --git a/packages/vue/src/shared/input/select/move.ts b/packages/vue/src/shared/input/select/move.tsindex 4075469e3..55ce9953a 100644--- a/packages/vue/src/shared/input/select/move.ts+++ b/packages/vue/src/shared/input/select/move.ts@@ -74,6 +74,8 @@ export function createSelectionMoveDrag(startY: cy,currentX: cx,currentY: cy,+ appliedDx: 0,+ appliedDy: 0,startScreenX: sx,startScreenY: sy,dragStarted: false,diff --git a/packages/vue/src/shared/input/snap.ts b/packages/vue/src/shared/input/snap.tsnew file mode 100644index 000000000..4825fc58c--- /dev/null+++ b/packages/vue/src/shared/input/snap.ts@@ -0,0 +1,196 @@+import { SNAP_THRESHOLD_SCREEN_PX } from '@open-pencil/core/constants'+import type { Editor } from '@open-pencil/core/editor'+import { computeSnap } from '@open-pencil/scene-graph'+import type { SceneNode } from '@open-pencil/scene-graph'+import { getAxisAlignedWorldBounds, getWorldMatrix } from '@open-pencil/scene-graph/coordinate'+import Matrix from '@open-pencil/scene-graph/matrix'+import type { Rect, Vector } from '@open-pencil/scene-graph/primitives'+import type { SnapGuide } from '@open-pencil/scene-graph/snap'++export interface PixelSnapResult {+ delta: Vector+ guides: SnapGuide[]+}++export function computePixelGridSnap(bounds: Rect, threshold: number): PixelSnapResult {+ const roundedX = Math.round(bounds.x)+ const roundedY = Math.round(bounds.y)+ const dx = roundedX - bounds.x+ const dy = roundedY - bounds.y+ const guides: SnapGuide[] = []+ if (Math.abs(dx) < threshold) {+ guides.push({+ axis: 'x',+ position: roundedX,+ from: bounds.y,+ to: bounds.y + bounds.height+ })+ }+ if (Math.abs(dy) < threshold) {+ guides.push({+ axis: 'y',+ position: roundedY,+ from: bounds.x,+ to: bounds.x + bounds.width+ })+ }+ return {+ delta: {+ x: Math.abs(dx) < threshold ? dx : 0,+ y: Math.abs(dy) < threshold ? dy : 0+ },+ guides+ }+}++export interface ExplicitSnapTarget extends SnapGuide {+ kind: 'canvas-guide' | 'layout-guide'+}++export interface GeometrySnapTarget extends SnapGuide {+ kind: 'geometry'+}++export interface ObjectPixelSnapResult {+ correction: Vector+ guides: SnapGuide[]+}++function deduplicateGuides(guides: SnapGuide[]): SnapGuide[] {+ const merged = new Map<string, SnapGuide>()+ for (const guide of guides) {+ const key = `${guide.axis}:${guide.position}`+ const current = merged.get(key)+ if (!current) merged.set(key, { ...guide })+ else {+ current.from = Math.min(current.from, guide.from)+ current.to = Math.max(current.to, guide.to)+ }+ }+ return [...merged.values()]+}++export function worldBoundsNode(node: SceneNode, editor: Editor): SceneNode {+ const bounds = getAxisAlignedWorldBounds(node, editor.graph)+ return { ...node, ...bounds, rotation: 0, flipX: false, flipY: false }+}++function winningCorrection(+ geometry: { delta: number } | null,+ explicit: { delta: number } | null,+ objectMatched: boolean,+ objectDelta: number,+ pixelDelta: number+): number {+ if (geometry) return geometry.delta+ if (explicit) return explicit.delta+ return objectMatched ? objectDelta : pixelDelta+}++// Resolving ranked candidates on two axes is branch-heavy by nature; candidate+// collection remains split into focused helpers at each interaction call site.+// eslint-disable-next-line complexity+export function resolveObjectPixelSnap(+ movingIds: Set<string>,+ movingBounds: Rect,+ targets: SceneNode[],+ editor: Editor,+ explicitTargets: ExplicitSnapTarget[] = [],+ geometryTargets: GeometrySnapTarget[] = []+): ObjectPixelSnapResult {+ const threshold = snappingThreshold(editor)+ const xAnchors = [+ movingBounds.x,+ movingBounds.x + movingBounds.width / 2,+ movingBounds.x + movingBounds.width+ ]+ const yAnchors = [+ movingBounds.y,+ movingBounds.y + movingBounds.height / 2,+ movingBounds.y + movingBounds.height+ ]+ let geometryX: { delta: number; target: GeometrySnapTarget } | null = null+ let geometryY: { delta: number; target: GeometrySnapTarget } | null = null+ for (const target of geometryTargets) {+ const anchors = target.axis === 'x' ? xAnchors : yAnchors+ for (const anchor of anchors) {+ const delta = target.position - anchor+ if (Math.abs(delta) >= threshold) continue+ const current = target.axis === 'x' ? geometryX : geometryY+ if (!current || Math.abs(delta) < Math.abs(current.delta)) {+ const winner = { delta, target }+ if (target.axis === 'x') geometryX = winner+ else geometryY = winner+ }+ }+ }+ let explicitX: { delta: number; target: ExplicitSnapTarget } | null = null+ let explicitY: { delta: number; target: ExplicitSnapTarget } | null = null+ for (const target of explicitTargets) {+ const anchors = target.axis === 'x' ? xAnchors : yAnchors+ for (const anchor of anchors) {+ const delta = target.position - anchor+ if (Math.abs(delta) >= threshold) continue+ const current = target.axis === 'x' ? explicitX : explicitY+ if (!current || Math.abs(delta) < Math.abs(current.delta)) {+ const winner = { delta, target }+ if (target.axis === 'x') explicitX = winner+ else explicitY = winner+ }+ }+ }+ const objectSnap = editor.state.snappingPreferences.objects+ ? computeSnap(movingIds, movingBounds, targets, threshold)+ : { dx: 0, dy: 0, guides: [] }+ const pixelSnap = editor.state.snappingPreferences.pixelGrid+ ? computePixelGridSnap(movingBounds, threshold)+ : { delta: { x: 0, y: 0 }, guides: [] }+ const objectX = objectSnap.guides.some((guide) => guide.axis === 'x')+ const objectY = objectSnap.guides.some((guide) => guide.axis === 'y')+ const explicitGuides = [explicitX?.target, explicitY?.target].flatMap((guide) =>+ guide ? [guide] : []+ )+ const geometryGuides = [geometryX?.target, geometryY?.target].flatMap((guide) =>+ guide ? [guide] : []+ )+ const xBlockedByGeometry = Boolean(geometryX)+ const yBlockedByGeometry = Boolean(geometryY)+ return {+ correction: {+ x: winningCorrection(geometryX, explicitX, objectX, objectSnap.dx, pixelSnap.delta.x),+ y: winningCorrection(geometryY, explicitY, objectY, objectSnap.dy, pixelSnap.delta.y)+ },+ guides: deduplicateGuides([+ ...geometryGuides,+ ...explicitGuides.filter((guide) =>+ guide.axis === 'x' ? !xBlockedByGeometry : !yBlockedByGeometry+ ),+ ...objectSnap.guides.filter((guide) =>+ guide.axis === 'x' ? !xBlockedByGeometry && !explicitX : !yBlockedByGeometry && !explicitY+ ),+ ...pixelSnap.guides.filter((guide) =>+ guide.axis === 'x'+ ? !xBlockedByGeometry && !explicitX && !objectX+ : !yBlockedByGeometry && !explicitY && !objectY+ )+ ])+ }+}++export function worldDeltaToParentLocal(+ delta: Vector,+ parentId: string | null | undefined,+ editor: Editor+): Vector {+ const parent = parentId ? editor.graph.getNode(parentId) : undefined+ if (!parent || editor.isTopLevel(parent.id)) return delta+ const inverse = Matrix.invert(getWorldMatrix(parent, editor.graph))+ if (!inverse) return delta+ const origin = Matrix.mapPoint(inverse, { x: 0, y: 0 })+ const endpoint = Matrix.mapPoint(inverse, delta)+ return { x: endpoint.x - origin.x, y: endpoint.y - origin.y }+}++export function snappingThreshold(editor: Editor): number {+ return SNAP_THRESHOLD_SCREEN_PX / Math.max(editor.state.zoom, Number.EPSILON)+}diff --git a/packages/vue/src/shared/input/types.ts b/packages/vue/src/shared/input/types.tsindex 5744e4040..c1f4f01d0 100644--- a/packages/vue/src/shared/input/types.ts+++ b/packages/vue/src/shared/input/types.ts@@ -27,6 +27,8 @@ export interface DragMove {startY: numbercurrentX: numbercurrentY: number+ appliedDx: number+ appliedDy: numberstartScreenX: numberstartScreenY: numberdragStarted: boolean@@ -61,6 +63,7 @@ export interface DragResize {origTextPathData: TextPathData | nullorigTextPathBox: Rect | nullorigChildren: Map<string, ResizeSnapshot> | null+ appliedRect?: Rect}export interface DragMarquee {diff --git a/src/app/editor/session/types.ts b/src/app/editor/session/types.tsindex becb2db15..958868e93 100644--- a/src/app/editor/session/types.ts+++ b/src/app/editor/session/types.ts@@ -1,10 +1,12 @@import { createDefaultEditorState, type EditorState } from '@open-pencil/core/editor'import type { NodeEditState } from '@/app/editor/vector-edit/types'+import { appPreferences } from '@/app/settings/preferences/store'export function createInitialAppEditorState(pageId: string): AppEditorState {return {...createDefaultEditorState(pageId),+ snappingPreferences: { ...appPreferences.value.editing.snapping },showUI: true,showRulers: true,showRemoteCursors: true,diff --git a/src/app/editor/vector-edit/lifecycle.ts b/src/app/editor/vector-edit/lifecycle.tsindex bdf758d83..e85a6884e 100644--- a/src/app/editor/vector-edit/lifecycle.ts+++ b/src/app/editor/vector-edit/lifecycle.ts@@ -83,6 +83,7 @@ export function createVectorEditLifecycle(editor: Editor, state: VectorEditStateconst world = getWorldMatrix(node, editor.graph)const absNetwork = transformVectorNetwork(world, node.vectorNetwork)+ state.snapGuides = []state.nodeEditState = {nodeId,origNetwork: cloneVectorNetwork(node.vectorNetwork),@@ -106,6 +107,7 @@ export function createVectorEditLifecycle(editor: Editor, state: VectorEditStatefunction exitNodeEditMode(commit: boolean) {const es = getNodeEditState()if (!es) return+ state.snapGuides = []const node = editor.graph.getNode(es.nodeId)if (node?.type !== 'VECTOR') {diff --git a/src/app/settings/dialog.ts b/src/app/settings/dialog.tsindex f15ee51af..0d81677af 100644--- a/src/app/settings/dialog.ts+++ b/src/app/settings/dialog.ts@@ -1,11 +1,11 @@import { ref } from 'vue'-export type SettingsSection = 'ai' | 'mcp' | 'media' | 'storage'+export type SettingsSection = 'general' | 'ai' | 'mcp' | 'media' | 'storage'export const settingsDialogOpen = ref(false)-export const settingsDialogSection = ref<SettingsSection>('ai')+export const settingsDialogSection = ref<SettingsSection>('general')-export function openSettingsDialog(section: SettingsSection = 'ai'): void {- settingsDialogSection.value = section+export function openSettingsDialog(section?: SettingsSection): void {+ if (section) settingsDialogSection.value = sectionsettingsDialogOpen.value = true}diff --git a/src/app/settings/preferences/apply.ts b/src/app/settings/preferences/apply.tsnew file mode 100644index 000000000..32f80416a--- /dev/null+++ b/src/app/settings/preferences/apply.ts@@ -0,0 +1,18 @@+import type { SnappingPreferences } from '@open-pencil/core/editor'++import { getTabsSnapshot } from '@/app/tabs'++import { syncNativeSnappingMenu } from './native-menu'+import { appPreferences, updateSnappingPreferences } from './store'++export function setSnappingPreference(+ preference: keyof SnappingPreferences,+ enabled: boolean+): void {+ updateSnappingPreferences({ [preference]: enabled })+ const snapping = appPreferences.value.editing.snapping+ for (const tab of getTabsSnapshot()) {+ tab.store.state.snappingPreferences = { ...snapping }+ }+ void syncNativeSnappingMenu(snapping)+}diff --git a/src/app/settings/preferences/native-menu.ts b/src/app/settings/preferences/native-menu.tsnew file mode 100644index 000000000..33636a46e--- /dev/null+++ b/src/app/settings/preferences/native-menu.ts@@ -0,0 +1,22 @@+import type { SnappingPreferences } from '@open-pencil/core/editor'++import { isTauri } from '@/app/tauri/env'++const SNAPPING_MENU_IDS = {+ geometry: 'snap-geometry',+ objects: 'snap-objects',+ pixelGrid: 'snap-pixel-grid'+} satisfies Record<keyof SnappingPreferences, string>++export async function syncNativeSnappingMenu(preferences: SnappingPreferences): Promise<void> {+ if (!isTauri()) return+ const { invoke } = await import('@tauri-apps/api/core')+ await Promise.all(+ Object.entries(SNAPPING_MENU_IDS).map(([preference, id]) =>+ invoke('set_native_menu_checked', {+ id,+ checked: preferences[preference as keyof SnappingPreferences]+ })+ )+ )+}diff --git a/src/app/settings/preferences/store.ts b/src/app/settings/preferences/store.tsnew file mode 100644index 000000000..0c988e05d--- /dev/null+++ b/src/app/settings/preferences/store.ts@@ -0,0 +1,84 @@+import { useLocalStorage } from '@vueuse/core'++import { DEFAULT_SNAPPING_PREFERENCES, type SnappingPreferences } from '@open-pencil/core/editor'++export interface AppPreferences {+ version: 1+ editing: {+ snapping: SnappingPreferences+ }+}++export const DEFAULT_APP_PREFERENCES: Readonly<AppPreferences> = {+ version: 1,+ editing: {+ snapping: { ...DEFAULT_SNAPPING_PREFERENCES }+ }+}++const STORAGE_KEY = 'open-pencil:preferences:v1'++function booleanOrDefault(value: unknown, fallback: boolean): boolean {+ return typeof value === 'boolean' ? value : fallback+}++interface StoredSnappingPreferences {+ geometry?: unknown+ objects?: unknown+ pixelGrid?: unknown+}++interface StoredEditingPreferences {+ snapping?: StoredSnappingPreferences+}++interface StoredAppPreferences {+ editing?: StoredEditingPreferences+}++function isStoredAppPreferences(value: unknown): value is StoredAppPreferences {+ return Boolean(value) && typeof value === 'object' && !Array.isArray(value)+}++function normalizePreferences(value: unknown): AppPreferences {+ const snapping = isStoredAppPreferences(value) ? value.editing?.snapping : undefined++ return {+ version: 1,+ editing: {+ snapping: {+ geometry: booleanOrDefault(+ snapping?.geometry,+ DEFAULT_APP_PREFERENCES.editing.snapping.geometry+ ),+ objects: booleanOrDefault(+ snapping?.objects,+ DEFAULT_APP_PREFERENCES.editing.snapping.objects+ ),+ pixelGrid: booleanOrDefault(+ snapping?.pixelGrid,+ DEFAULT_APP_PREFERENCES.editing.snapping.pixelGrid+ )+ }+ }+ }+}++export const appPreferences = useLocalStorage<AppPreferences>(+ STORAGE_KEY,+ structuredClone(DEFAULT_APP_PREFERENCES),+ { mergeDefaults: (storageValue) => normalizePreferences(storageValue) }+)++export function updateSnappingPreferences(changes: Partial<SnappingPreferences>): void {+ appPreferences.value = {+ ...appPreferences.value,+ editing: {+ ...appPreferences.value.editing,+ snapping: {+ ...appPreferences.value.editing.snapping,+ ...changes+ }+ }+ }+}diff --git a/src/app/shell/keyboard/registry.ts b/src/app/shell/keyboard/registry.tsindex f2f1e30c9..39cc0032e 100644--- a/src/app/shell/keyboard/registry.ts+++ b/src/app/shell/keyboard/registry.ts@@ -7,6 +7,7 @@ import type { EditorCommandId } from '@open-pencil/vue'import { requestRenameSelection } from '@/app/editor/selection/rename-dialog'import { TOOL_SHORTCUTS } from '@/app/editor/session'+import { openSettingsDialog } from '@/app/settings/dialog'import { isEditing } from '@/app/shell/keyboard/focus'import { bindSpaceHandTool } from '@/app/shell/keyboard/space-tool'import type {@@ -22,6 +23,7 @@ type ShortcutDefinition = {keys: string | string[]run: ShortcutActionshouldPreventDefault?: (event: KeyboardEvent) => boolean+ global?: boolean}function commandShortcut(@@ -130,6 +132,12 @@ export function registerKeyboardShortcuts(options: KeyboardShortcutOptions) {run: ({ actions }) => actions.toggleUI()},{ id: 'toggle-ai', keys: '$mod+KeyJ', run: ({ actions }) => actions.toggleAI() },+ {+ id: 'open-settings',+ keys: appMenuTinykeysShortcut('settings') ?? '$mod+Comma',+ run: () => openSettingsDialog(),+ global: true+ },{id: 'close-tab',keys: appMenuTinykeysShortcut('close') ?? '$mod+KeyW',@@ -181,16 +189,17 @@ export function registerKeyboardShortcuts(options: KeyboardShortcutOptions) {]const bindings: KeyBindingMap = {}+ const globalBindings: KeyBindingMap = {}bindToolShortcuts(bindings, runOptions(new KeyboardEvent('keydown')))for (const shortcut of shortcuts) {- bindShortcut(bindings, shortcut.keys, (event) => {+ bindShortcut(shortcut.global ? globalBindings : bindings, shortcut.keys, (event) => {shortcut.run(runOptions(event))if (shortcut.shouldPreventDefault?.(event) ?? true) event.preventDefault()})}- const unsubscribe = tinykeys(+ const unsubscribeEditor = tinykeys(window,Object.fromEntries(Object.entries(bindings).map(([keys, handler]) => [@@ -204,5 +213,10 @@ export function registerKeyboardShortcuts(options: KeyboardShortcutOptions) {{ capture: true })- onScopeDispose(unsubscribe)+ const unsubscribeGlobal = tinykeys(window, globalBindings, { capture: true })++ onScopeDispose(() => {+ unsubscribeEditor()+ unsubscribeGlobal()+ })}diff --git a/src/app/shell/menu/app-menu.ts b/src/app/shell/menu/app-menu.tsindex a9a20c727..05d3454b7 100644--- a/src/app/shell/menu/app-menu.ts+++ b/src/app/shell/menu/app-menu.ts@@ -6,6 +6,7 @@ import { useEditorCommands, useI18n } from '@open-pencil/vue'import { useEditorStore } from '@/app/editor/active-store'import { openSettingsDialog } from '@/app/settings/dialog'+import { setSnappingPreference } from '@/app/settings/preferences/apply'import { createSharedEditorMenuActions } from '@/app/shell/menu/editor-actions'import { openStorageWorkspace } from '@/app/shell/menu/navigation'import type { AppMenuActionItem, AppMenuEntry, AppMenuGroupSchema } from '@/app/shell/menu/schema'@@ -57,9 +58,13 @@ export function useAppMenu() {'selection.rename': 'renameSelection','selection.moveToPage': 'moveToPage',language: 'language',+ preferences: 'preferences',settings: 'settings','view-rulers': 'rulers','view-multiplayer-cursors': 'multiplayerCursors',+ 'snap-geometry': 'snapToGeometry',+ 'snap-objects': 'snapToObjects',+ 'snap-pixel-grid': 'snapToPixelGrid',profiler: 'profiler','toggle-ui': 'toggleUI',theme: 'theme',@@ -130,6 +135,12 @@ export function useAppMenu() {return store.state.showRulerscase 'view-multiplayer-cursors':return store.state.showRemoteCursors+ case 'snap-geometry':+ return store.state.snappingPreferences.geometry+ case 'snap-objects':+ return store.state.snappingPreferences.objects+ case 'snap-pixel-grid':+ return store.state.snappingPreferences.pixelGridcase 'theme-light':return theme.value === 'light'case 'theme-dark':@@ -157,6 +168,12 @@ export function useAppMenu() {return (value: boolean) => {if (store.state.showRemoteCursors !== value) itemAction(item)?.()}+ case 'snap-geometry':+ return (value: boolean) => setSnappingPreference('geometry', value)+ case 'snap-objects':+ return (value: boolean) => setSnappingPreference('objects', value)+ case 'snap-pixel-grid':+ return (value: boolean) => setSnappingPreference('pixelGrid', value)case 'theme-light':case 'theme-dark':case 'theme-auto':diff --git a/src/app/shell/menu/editor-actions.ts b/src/app/shell/menu/editor-actions.tsindex 5dd132aec..781133970 100644--- a/src/app/shell/menu/editor-actions.ts+++ b/src/app/shell/menu/editor-actions.ts@@ -1,6 +1,7 @@import type { SceneNode } from '@open-pencil/scene-graph'import { useEditorStore } from '@/app/editor/active-store'+import { setSnappingPreference } from '@/app/settings/preferences/apply'type TextFormatUpdates = {fontWeight?: number@@ -62,6 +63,12 @@ export function createSharedEditorMenuActions(store.state.showRemoteCursors = !store.state.showRemoteCursorsstore.requestRepaint()},+ 'snap-geometry': () =>+ setSnappingPreference('geometry', !store.state.snappingPreferences.geometry),+ 'snap-objects': () =>+ setSnappingPreference('objects', !store.state.snappingPreferences.objects),+ 'snap-pixel-grid': () =>+ setSnappingPreference('pixelGrid', !store.state.snappingPreferences.pixelGrid),'toggle-ui': () => {store.state.showUI = !store.state.showUI},diff --git a/src/app/shell/menu/schema.ts b/src/app/shell/menu/schema.tsindex 2eb06c0b7..945773d28 100644--- a/src/app/shell/menu/schema.ts+++ b/src/app/shell/menu/schema.ts@@ -136,8 +136,25 @@ export const APP_MENU_SCHEMA = [},{ id: 'language', label: 'Language', target: 'browser' },{ type: 'separator' },+ {+ id: 'preferences',+ label: 'Preferences',+ sub: [+ { id: 'snap-geometry', label: 'Snap to Geometry', checkbox: true },+ { id: 'snap-objects', label: 'Snap to Objects', checkbox: true },+ { id: 'snap-pixel-grid', label: 'Snap to Pixel Grid', checkbox: true },+ { type: 'separator' },+ {+ id: 'settings',+ label: 'Settings…',+ shortcut: 'MOD+,',+ accelerator: 'CmdOrCtrl+,',+ handler: 'shell'+ }+ ]+ },+ { type: 'separator' },{ id: 'toggle-ui', label: 'Toggle UI', shortcut: 'MOD+\\' },- { id: 'settings', label: 'Settings…', handler: 'shell' },{ type: 'separator' },{ id: 'profiler', label: 'Profiler', checkbox: true, target: 'browser' },{diff --git a/src/app/shell/menu/shell.ts b/src/app/shell/menu/shell.tsindex eae78684f..9b5176a53 100644--- a/src/app/shell/menu/shell.ts+++ b/src/app/shell/menu/shell.ts@@ -1,6 +1,8 @@import { useI18n } from '@open-pencil/vue'import { openSettingsDialog } from '@/app/settings/dialog'+import { syncNativeSnappingMenu } from '@/app/settings/preferences/native-menu'+import { appPreferences } from '@/app/settings/preferences/store'import { useNativeMenuEvents } from '@/app/shell/menu/native-events'import { openStorageWorkspace } from '@/app/shell/menu/navigation'import { APP_MENU_SCHEMA, type AppMenuEntry } from '@/app/shell/menu/schema'@@ -24,6 +26,8 @@ export const SHELL_MENU_IDS = new Set([export function useShellMenu() {if (!isTauri()) return+ void syncNativeSnappingMenu(appPreferences.value.editing.snapping)+const { setTheme } = useAppTheme()const { dialogs } = useI18n()const actions: Partial<Record<string, () => void>> = {diff --git a/src/app/tabs/index.ts b/src/app/tabs/index.tsindex cd6953b7d..f12303545 100644--- a/src/app/tabs/index.ts+++ b/src/app/tabs/index.ts@@ -79,6 +79,10 @@ export function createTab(store?: EditorStore, initialGraph?: SceneGraph): Tab {}function activateTab(tab: Tab) {+ const previous = tabsRef.value.find((candidate) => candidate.id === activeTabId.value)+ previous?.store.setSnapGuides([])+ previous?.store.setLayoutInsertIndicator(null)+ previous?.store.setDropTarget(null)activeTabId.value = tab.idsetActiveEditorStore(tab.store)triggerRef(tabsRef)diff --git a/src/components/settings/SettingsDialog.vue b/src/components/settings/SettingsDialog.vueindex 4ab4d8317..440a6e661 100644--- a/src/components/settings/SettingsDialog.vue+++ b/src/components/settings/SettingsDialog.vue@@ -7,6 +7,7 @@ import { IS_TAURI } from '@open-pencil/core/constants'import { useAIChat } from '@/app/ai/chat/use'import { appCredentialServices } from '@/app/settings/credentials/app'import { settingsDialogOpen, settingsDialogSection } from '@/app/settings/dialog'+import GeneralSettingsPanel from '@/components/settings/general/GeneralSettingsPanel.vue'import MCPConnectionsSection from '@/components/settings/mcp/MCPConnectionsSection.vue'import ModelsPanel from '@/components/settings/models/ModelsPanel.vue'import StockPhotoKeysSection from '@/components/settings/provider/StockPhotoKeysSection.vue'@@ -58,6 +59,16 @@ const navigationClass =<div class="flex min-h-0 flex-1"><nav class="w-40 shrink-0 border-r border-border p-2" :aria-label="dialogs.settings">+ <button+ type="button"+ :class="navigationClass"+ :data-state="settingsDialogSection === 'general' ? 'active' : 'inactive'"+ data-test-id="settings-section-general"+ @click="settingsDialogSection = 'general'"+ >+ <icon-lucide-settings class="size-3.5" />+ {{ dialogs.settingsGeneral }}+ </button><buttontype="button":class="navigationClass"@@ -101,8 +112,10 @@ const navigationClass =</nav><div class="min-h-0 flex-1 overflow-y-auto p-4">+ <GeneralSettingsPanel v-if="settingsDialogSection === 'general'" />+<section- v-if="settingsDialogSection === 'ai'"+ v-else-if="settingsDialogSection === 'ai'"class="flex h-full flex-col"data-test-id="settings-ai-panel">diff --git a/src/components/settings/general/GeneralSettingsPanel.vue b/src/components/settings/general/GeneralSettingsPanel.vuenew file mode 100644index 000000000..22c12dc47--- /dev/null+++ b/src/components/settings/general/GeneralSettingsPanel.vue@@ -0,0 +1,72 @@+<script setup lang="ts">+import { computed } from 'vue'+import { useI18n } from '@open-pencil/vue'++import { setSnappingPreference } from '@/app/settings/preferences/apply'+import { appPreferences } from '@/app/settings/preferences/store'+import AppSwitch from '@/components/ui/AppSwitch.vue'++const { dialogs } = useI18n()++const snapToGeometry = computed({+ get: () => appPreferences.value.editing.snapping.geometry,+ set: (enabled: boolean) => setSnappingPreference('geometry', enabled)+})++const snapToObjects = computed({+ get: () => appPreferences.value.editing.snapping.objects,+ set: (enabled: boolean) => setSnappingPreference('objects', enabled)+})++const snapToPixelGrid = computed({+ get: () => appPreferences.value.editing.snapping.pixelGrid,+ set: (enabled: boolean) => setSnappingPreference('pixelGrid', enabled)+})+</script>++<template>+ <section class="flex flex-col gap-4" data-test-id="settings-general-panel">+ <div>+ <h3 class="text-xs font-semibold text-surface">{{ dialogs.settingsEditing }}</h3>+ <p class="mt-1 text-[11px] text-muted">{{ dialogs.settingsSnappingDescription }}</p>+ </div>++ <div class="flex flex-col divide-y divide-border rounded border border-border">+ <label class="flex items-center justify-between gap-4 px-3 py-2.5">+ <span>+ <span class="block text-xs text-surface">{{ dialogs.snapToGeometry }}</span>+ <span class="block text-[10px] text-muted">{{ dialogs.snapToGeometryDescription }}</span>+ </span>+ <AppSwitch+ v-model="snapToGeometry"+ :label="dialogs.snapToGeometry"+ data-test-id="settings-snap-geometry"+ />+ </label>+ <label class="flex items-center justify-between gap-4 px-3 py-2.5">+ <span>+ <span class="block text-xs text-surface">{{ dialogs.snapToObjects }}</span>+ <span class="block text-[10px] text-muted">{{ dialogs.snapToObjectsDescription }}</span>+ </span>+ <AppSwitch+ v-model="snapToObjects"+ :label="dialogs.snapToObjects"+ data-test-id="settings-snap-objects"+ />+ </label>+ <label class="flex items-center justify-between gap-4 px-3 py-2.5">+ <span>+ <span class="block text-xs text-surface">{{ dialogs.snapToPixelGrid }}</span>+ <span class="block text-[10px] text-muted">{{ dialogs.snapToPixelGridDescription }}</span>+ </span>+ <AppSwitch+ v-model="snapToPixelGrid"+ :label="dialogs.snapToPixelGrid"+ data-test-id="settings-snap-pixel-grid"+ />+ </label>+ </div>++ <p class="text-[10px] text-muted">{{ dialogs.snapTemporaryDisableHint }}</p>+ </section>+</template>diff --git a/src/constants.ts b/src/constants.tsindex b2ffe92f0..b8d3a25e9 100644--- a/src/constants.ts+++ b/src/constants.ts@@ -9,7 +9,7 @@ export {COMPONENT_COLOR,SNAP_COLOR,CANVAS_BG_COLOR,- SNAP_THRESHOLD,+ SNAP_THRESHOLD_SCREEN_PX,RULER_SIZE,RULER_BG_COLOR,RULER_TICK_COLOR,diff --git a/tests/e2e/canvas/manipulation.spec.ts b/tests/e2e/canvas/manipulation.spec.tsindex a210b8ea6..6c8c86b9b 100644--- a/tests/e2e/canvas/manipulation.spec.ts+++ b/tests/e2e/canvas/manipulation.spec.ts@@ -126,6 +126,46 @@ test('resize corner handle drag increases node dimensions', async () => {canvas.assertNoErrors()})+test('resize snapping preferences control pixel alignment and Control bypass', async () => {+ await canvas.clearCanvas()+ await page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: false }+ const id = store.createShape('RECTANGLE', 100.25, 100.25, 100, 100)+ store.select([id])+ })+ await canvas.waitForRender()+ const box = await page.getByTestId('canvas-element').boundingBox()+ if (!box) throw new Error('No canvas')++ await page.mouse.move(box.x + 200.25, box.y + 200.25)+ await page.mouse.down()+ await page.mouse.move(box.x + 206.25, box.y + 207.25, { steps: 5 })+ await page.mouse.up()+ expect(await getSelectedNode(page)).toMatchObject({ width: 106, height: 107 })++ await page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences.pixelGrid = true+ })+ await page.mouse.move(box.x + 206.25, box.y + 207.25)+ await page.mouse.down()+ await page.mouse.move(box.x + 212.25, box.y + 214.25, { steps: 5 })+ await page.mouse.up()+ expect(await getSelectedNode(page)).toMatchObject({ width: 111.75, height: 113.75 })++ await page.mouse.move(box.x + 212, box.y + 214)+ await page.mouse.down()+ await page.keyboard.down('Control')+ await page.mouse.move(box.x + 218, box.y + 221, { steps: 5 })+ await page.keyboard.up('Control')+ await page.mouse.up()+ expect(await getSelectedNode(page)).toMatchObject({ width: 117.75, height: 120.75 })+ canvas.assertNoErrors()+})+test('rotation handle drag rotates node', async () => {await canvas.clearCanvas()await canvas.drawRect(200, 200, 100, 100)diff --git a/tests/e2e/canvas/vector/editing.spec.ts b/tests/e2e/canvas/vector/editing.spec.tsindex 232a8e5a5..1c10e6c9d 100644--- a/tests/e2e/canvas/vector/editing.spec.ts+++ b/tests/e2e/canvas/vector/editing.spec.ts@@ -100,3 +100,82 @@ test('vector edit overlay follows nested transforms and live path fills', asyncconst buffer = await editor.canvas.canvas.screenshot()expect(buffer).toMatchSnapshot('vector-edit-mode-overlay.png')})++test('dragging a vector point snaps to sibling bounds and clears guides on release', async () => {+ await editor.page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ const pageId = store.state.currentPageId+ const vector = store.graph.createNode('VECTOR', pageId, {+ name: 'Snap source',+ x: 100,+ y: 100,+ width: 100,+ height: 100,+ vectorNetwork: {+ vertices: [+ { x: 0, y: 0 },+ { x: 100, y: 0 },+ { x: 100, y: 100 }+ ],+ segments: [+ { start: 0, end: 1, tangentStart: { x: 0, y: 0 }, tangentEnd: { x: 0, y: 0 } },+ { start: 1, end: 2, tangentStart: { x: 0, y: 0 }, tangentEnd: { x: 0, y: 0 } }+ ],+ regions: []+ }+ })+ store.graph.createNode('RECTANGLE', pageId, {+ name: 'Snap target',+ x: 300,+ y: 80,+ width: 100,+ height: 140+ })+ store.enterNodeEditMode(vector.id)+ })+ await editor.canvas.waitForRender()++ const box = await editor.canvas.canvas.boundingBox()+ if (!box) throw new Error('Canvas bounds unavailable')+ await editor.page.mouse.move(box.x + 100, box.y + 100)+ await editor.page.mouse.down()+ await editor.page.mouse.move(box.x + 297, box.y + 100, { steps: 12 })++ const duringDrag = await editor.page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ const editState = store?.getNodeEditState()+ return {+ vertex: editState?.vertices[0],+ guides: store?.state.snapGuides ?? []+ }+ })+ expect(duringDrag.vertex).toMatchObject({ x: 300, y: 100 })+ expect(duringDrag.guides).toContainEqual({ axis: 'x', position: 300, from: 80, to: 220 })+ expect(await editor.canvas.canvas.screenshot()).toMatchSnapshot('vector-edit-snap-guide.png')++ await editor.page.mouse.up()+ await expect+ .poll(() =>+ editor.page.evaluate(() => window.openPencil?.getStore?.().state.snapGuides.length ?? -1)+ )+ .toBe(0)++ await editor.page.mouse.move(box.x + 300, box.y + 100)+ await editor.page.mouse.down()+ await editor.page.keyboard.down('Control')+ await editor.page.mouse.move(box.x + 297, box.y + 100, { steps: 3 })+ const withControl = await editor.page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ return {+ vertex: store?.getNodeEditState()?.vertices[0],+ guides: store?.state.snapGuides ?? []+ }+ })+ expect(withControl.vertex).toMatchObject({ x: 297, y: 100 })+ expect(withControl.guides).toEqual([])+ await editor.page.keyboard.up('Control')+ await editor.page.mouse.up()++ editor.canvas.assertNoErrors()+})diff --git a/tests/e2e/canvas/vector/editing.spec.ts-snapshots/vector-edit-snap-guide-openpencil-darwin.png b/tests/e2e/canvas/vector/editing.spec.ts-snapshots/vector-edit-snap-guide-openpencil-darwin.pngnew file mode 100644index 000000000..8ddef543aBinary files /dev/null and b/tests/e2e/canvas/vector/editing.spec.ts-snapshots/vector-edit-snap-guide-openpencil-darwin.png differdiff --git a/tests/e2e/native/settings.spec.ts b/tests/e2e/native/settings.spec.tsnew file mode 100644index 000000000..2b4580986--- /dev/null+++ b/tests/e2e/native/settings.spec.ts@@ -0,0 +1,56 @@+import { strict as assert } from 'node:assert'++function settingsOpen(): Promise<boolean> {+ return browser.execute(() =>+ Boolean(document.querySelector('[data-test-id="app-settings-dialog"]'))+ )+}++describe('native preferences', () => {+ it('opens Settings with the platform shortcut while an input is focused', async () => {+ await browser.waitUntil(+ async () => browser.execute(() => Boolean(window.openPencil?.getStore?.())),+ { timeout: 30_000, timeoutMsg: 'OpenPencil editor did not initialize' }+ )+ await browser.execute(() => {+ const input = document.createElement('input')+ input.setAttribute('data-test-id', 'native-settings-shortcut-input')+ document.body.append(input)+ })+ const input = await $('[data-test-id="native-settings-shortcut-input"]')+ await input.click()+ await browser.keys([process.platform === 'darwin' ? 'Meta' : 'Control', ','])+ await browser.waitUntil(settingsOpen, {+ timeout: 10_000,+ timeoutMsg: 'Native settings shortcut did not open Settings'+ })++ assert.equal(await settingsOpen(), true)+ })++ it('keeps native snapping checkmarks synchronized with preferences', async () => {+ await browser.waitUntil(+ async () => browser.execute(() => Boolean(window.openPencil?.getStore?.())),+ { timeout: 30_000, timeoutMsg: 'OpenPencil editor did not initialize' }+ )+ const initial = await browser.execute(async () => {+ const { invoke } = await import('@tauri-apps/api/core')+ return invoke<boolean>('native_menu_checked', { id: 'snap-objects' })+ })+ assert.equal(initial, true)++ await browser.executeAsync((done) => {+ const toggle = document.querySelector<HTMLElement>('[data-test-id="app-settings-trigger"]')+ toggle?.click()+ requestAnimationFrame(() => {+ document.querySelector<HTMLElement>('[data-test-id="settings-snap-objects"]')?.click()+ setTimeout(done, 200)+ })+ })+ const updated = await browser.execute(async () => {+ const { invoke } = await import('@tauri-apps/api/core')+ return invoke<boolean>('native_menu_checked', { id: 'snap-objects' })+ })+ assert.equal(updated, false)+ })+})diff --git a/tests/e2e/settings/general.spec.ts b/tests/e2e/settings/general.spec.tsnew file mode 100644index 000000000..1061d2459--- /dev/null+++ b/tests/e2e/settings/general.spec.ts@@ -0,0 +1,75 @@+import { expect, test } from '@playwright/test'++import { CanvasHelper } from '#tests/helpers/canvas'++test('general snapping preferences persist and apply to editor sessions', async ({ page }) => {+ await page.goto('/?test')+ const canvas = new CanvasHelper(page)+ await canvas.waitForInit()++ await page.getByTestId('app-settings-trigger').click()+ await expect(page.getByTestId('settings-general-panel')).toBeVisible()+ const geometry = page.getByRole('switch', { name: 'Snap to geometry' })+ const objects = page.getByRole('switch', { name: 'Snap to objects' })+ const pixelGrid = page.getByRole('switch', { name: 'Snap to pixel grid' })+ await expect(geometry).toBeChecked()+ await expect(objects).toBeChecked()+ await expect(pixelGrid).toBeChecked()++ await geometry.click()+ await objects.click()+ await pixelGrid.click()+ await expect+ .poll(() =>+ page.evaluate(() => window.openPencil?.getStore?.().state.snappingPreferences ?? null)+ )+ .toEqual({ geometry: false, objects: false, pixelGrid: false })++ await page.getByTestId('app-settings-done').click()+ await page.reload()+ await canvas.waitForInit()+ await page.getByTestId('app-settings-trigger').click()+ await expect(geometry).not.toBeChecked()+ await expect(objects).not.toBeChecked()+ await expect(pixelGrid).not.toBeChecked()+ await expect(+ page.evaluate(() => window.openPencil?.getStore?.().state.snappingPreferences ?? null)+ ).resolves.toEqual({ geometry: false, objects: false, pixelGrid: false })++ await geometry.click()+ await objects.click()+ await pixelGrid.click()+})++test('Preferences menu snapping controls use the same preferences', async ({ page }) => {+ await page.goto('/?test')+ const canvas = new CanvasHelper(page)+ await canvas.waitForInit()++ await page.getByTestId('menubar-view').click()+ await page.getByRole('menuitem', { name: 'Preferences' }).hover()+ const geometry = page.getByRole('menuitemcheckbox', { name: 'Snap to geometry' })+ const objects = page.getByRole('menuitemcheckbox', { name: 'Snap to objects' })+ const pixelGrid = page.getByRole('menuitemcheckbox', { name: 'Snap to pixel grid' })+ await expect(geometry).toBeChecked()+ await expect(objects).toBeChecked()+ await expect(pixelGrid).toBeChecked()+ await objects.click()++ await page.getByTestId('app-settings-trigger').click()+ await expect(page.getByRole('switch', { name: 'Snap to objects' })).not.toBeChecked()+ await page.getByRole('switch', { name: 'Snap to objects' }).click()+})++test('settings shortcut preserves the last visited section', async ({ page }) => {+ await page.goto('/?test')+ const canvas = new CanvasHelper(page)+ await canvas.waitForInit()++ await page.getByTestId('app-settings-trigger').click()+ await page.getByTestId('settings-section-media').click()+ await page.getByTestId('app-settings-done').click()++ await page.keyboard.press(process.platform === 'darwin' ? 'Meta+,' : 'Control+,')+ await expect(page.getByTestId('settings-media-panel')).toBeVisible()+})diff --git a/tests/e2e/snap/guides.spec.ts b/tests/e2e/snap/guides.spec.tsindex ef8ff8f22..46250546e 100644--- a/tests/e2e/snap/guides.spec.ts+++ b/tests/e2e/snap/guides.spec.ts@@ -1,5 +1,7 @@import { test, expect, type Page } from '@playwright/test'+import type { Vector } from '@open-pencil/scene-graph/primitives'+import { CanvasHelper } from '#tests/helpers/canvas'let page: Page@@ -24,6 +26,7 @@ async function createRects() {await page.evaluate(() => {const store = window.openPencil?.getStore?.()if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences = { geometry: true, objects: true, pixelGrid: false }store.createShape('RECTANGLE', 100, 100, 80, 80)const b = store.createShape('RECTANGLE', 300, 100, 80, 80)store.select([b])@@ -31,6 +34,21 @@ async function createRects() {await canvas.waitForRender()}+async function selectedPosition(): Promise<Vector> {+ return page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ const id = store.state.selectedIds.values().next().value+ const node = id ? store.graph.getNode(id) : undefined+ if (!node) throw new Error('Selected node not found')+ return { x: node.x, y: node.y }+ })+}++async function snapGuides() {+ return page.evaluate(() => window.openPencil?.getStore?.().state.snapGuides ?? [])+}+// Snap guide visual tests compare the canvas at a snap position vs a non-snap position// during the same drag. The snap position produces a guide line overlay; non-snap does not.// Skipped on Linux CI due to X11 Alt+drag interference and rendering differences.@@ -43,17 +61,21 @@ test('edge snap guide: canvas differs at snap vs non-snap position', async () =>const box = await page.getByTestId('canvas-element').boundingBox()if (!box) throw new Error('No canvas')- // drag to a non-snap position first, capture screenshot+ // Drag near the target's right edge. The moving left edge lands at x=182,+ // then snaps to the target's right edge at x=180.await page.mouse.move(box.x + 340, box.y + 140)await page.mouse.down()- await page.mouse.move(box.x + 250, box.y + 140, { steps: 15 })+ await page.mouse.move(box.x + 230, box.y + 140, { steps: 15 })const nonSnapShot = await canvas.screenshotCanvas()- // continue drag to edge-snap position (right edge of rect B aligns with left edge of rect A at x=180)- await page.mouse.move(box.x + 182, box.y + 140, { steps: 15 })+ await page.mouse.move(box.x + 222, box.y + 140, { steps: 15 })+ expect(await selectedPosition()).toEqual({ x: 180, y: 100 })+ expect(await snapGuides()).toContainEqual({ axis: 'x', position: 180, from: 100, to: 180 })const snapShot = await canvas.screenshotCanvas()await page.mouse.up()+ expect(await selectedPosition()).toEqual({ x: 180, y: 100 })+ expect(await snapGuides()).toEqual([])// At snap position the guide line overlay should make the canvas visually differentexpect(@@ -71,17 +93,20 @@ test('center snap guide: canvas differs at snap vs non-snap position', async ()const box = await page.getByTestId('canvas-element').boundingBox()if (!box) throw new Error('No canvas')- // drag to a non-snap position first+ // Move the selected center near the target center at x=140.await page.mouse.move(box.x + 340, box.y + 140)await page.mouse.down()- await page.mouse.move(box.x + 260, box.y + 140, { steps: 15 })+ await page.mouse.move(box.x + 150, box.y + 140, { steps: 15 })const nonSnapShot = await canvas.screenshotCanvas()- // continue drag to center-snap position (center of rect B aligns with center of rect A)- await page.mouse.move(box.x + 220, box.y + 140, { steps: 15 })+ await page.mouse.move(box.x + 142, box.y + 140, { steps: 15 })+ expect(await selectedPosition()).toEqual({ x: 100, y: 100 })+ expect(await snapGuides()).toContainEqual({ axis: 'x', position: 140, from: 100, to: 180 })const snapShot = await canvas.screenshotCanvas()await page.mouse.up()+ expect(await selectedPosition()).toEqual({ x: 100, y: 100 })+ expect(await snapGuides()).toEqual([])expect(Buffer.compare(nonSnapShot, snapShot),@@ -89,3 +114,59 @@ test('center snap guide: canvas differs at snap vs non-snap position', async ()).not.toBe(0)canvas.assertNoErrors()})++test('pixel snapping preference controls fractional object movement', async () => {+ await canvas.clearCanvas()+ await page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: false }+ const id = store.createShape('RECTANGLE', 120.25, 100.25, 80, 80)+ store.select([id])+ })+ const box = await page.getByTestId('canvas-element').boundingBox()+ if (!box) throw new Error('No canvas')++ await page.mouse.move(box.x + 160.25, box.y + 140.25)+ await page.mouse.down()+ await page.mouse.move(box.x + 166.55, box.y + 147.65, { steps: 5 })+ await page.mouse.up()+ expect(await selectedPosition()).toEqual({ x: 126.25, y: 107.25 })++ await page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences.pixelGrid = true+ })+ await page.mouse.move(box.x + 166.25, box.y + 147.25)+ await page.mouse.down()+ await page.mouse.move(box.x + 172.8, box.y + 155.05, { steps: 5 })+ await page.mouse.up()+ expect(await selectedPosition()).toEqual({ x: 133, y: 115 })+ canvas.assertNoErrors()+})++test('Control bypasses object and pixel snapping during a real pointer drag', async () => {+ await canvas.clearCanvas()+ await page.evaluate(() => {+ const store = window.openPencil?.getStore?.()+ if (!store) throw new Error('OpenPencil store not initialized')+ store.state.snappingPreferences = { geometry: true, objects: true, pixelGrid: true }+ store.createShape('RECTANGLE', 100, 100, 80, 80)+ const id = store.createShape('RECTANGLE', 300, 100, 80, 80)+ store.select([id])+ })+ const box = await page.getByTestId('canvas-element').boundingBox()+ if (!box) throw new Error('No canvas')++ await page.mouse.move(box.x + 340, box.y + 140)+ await page.mouse.down()+ await page.keyboard.down('Control')+ await page.mouse.move(box.x + 222.4, box.y + 147.3, { steps: 10 })+ expect(await selectedPosition()).toEqual({ x: 182, y: 107 })+ expect(await snapGuides()).toEqual([])+ await page.keyboard.up('Control')+ await page.mouse.up()+ expect(await selectedPosition()).toEqual({ x: 182, y: 107 })+ canvas.assertNoErrors()+})diff --git a/tests/engine/io/fig/roundtrip/source-metadata.test.ts b/tests/engine/io/fig/roundtrip/source-metadata.test.tsindex 6f7f3709e..127e2f6e3 100644--- a/tests/engine/io/fig/roundtrip/source-metadata.test.ts+++ b/tests/engine/io/fig/roundtrip/source-metadata.test.ts@@ -43,9 +43,9 @@ describe('fig roundtrip source metadata', () => {blendMode: 'NORMAL'}]- page.source.fig.rawNodeFields.guides = [- { axis: 'X', offset: 42 },- { axis: 'Y', offset: 84 }+ page.guides = [+ { axis: 'x', position: 42 },+ { axis: 'y', position: 84 }]page.source.fig.rawNodeFields.strokeJoin = 'BEVEL'page.source.fig.rawNodeFields.strokeWeight = 0@@ -76,7 +76,10 @@ describe('fig roundtrip source metadata', () => {expect(canvas?.strokeWeight).toBe(0)expect(canvas?.backgroundColor).toEqual(page.source.fig.rawNodeFields.backgroundColor)expect(canvas?.backgroundPaints).toEqual(page.source.fig.rawNodeFields.backgroundPaints)- expect(canvas?.guides).toEqual(page.source.fig.rawNodeFields.guides)+ expect(canvas?.guides).toEqual([+ { axis: 'X', offset: 42 },+ { axis: 'Y', offset: 84 }+ ])expect(changes.get('4:4812')?.parentIndex?.position).toBe('~~~~~~~~~~1')expect(changes.get('4:4813')?.parentIndex?.position).toBe('~~~~~~~~~~3')diff --git a/tests/engine/render/canvas/page-guides.test.ts b/tests/engine/render/canvas/page-guides.test.tsindex a10181b82..a04e5fbd8 100644--- a/tests/engine/render/canvas/page-guides.test.ts+++ b/tests/engine/render/canvas/page-guides.test.ts@@ -8,10 +8,10 @@ import { drawPageGuides } from '#core/canvas/page-guides'import { createMockCanvas, createMockRenderer, mockCalls } from './effects/helpers'-function graphWithGuides(guides: unknown[]): SceneGraph {+function graphWithGuides(guides: SceneNode['guides']): SceneGraph {const page = {id: 'page',- source: { fig: { rawNodeFields: { guides } } }+ guides} as SceneNodereturn {rootId: 'root',@@ -31,8 +31,8 @@ describe('page guide rendering', () => {})const canvas = createMockCanvas()const graph = graphWithGuides([- { axis: 'X', offset: 42 },- { axis: 'Y', offset: 84 }+ { axis: 'x', position: 42 },+ { axis: 'y', position: 84 }])drawPageGuides(r, canvas as Canvas, graph)@@ -44,10 +44,10 @@ describe('page guide rendering', () => {])})- test('ignores malformed guides', () => {+ test('ignores pages without guides', () => {const r = createMockRenderer({ pageId: 'page' })const canvas = createMockCanvas()- const graph = graphWithGuides([{ axis: 'X' }, { axis: 'Z', offset: 10 }])+ const graph = graphWithGuides([])drawPageGuides(r, canvas as Canvas, graph)diff --git a/tests/engine/text/rtl-auto-layout-input.test.ts b/tests/engine/text/rtl-auto-layout-input.test.tsindex 0b23d85a8..4be6a6ae6 100644--- a/tests/engine/text/rtl-auto-layout-input.test.ts+++ b/tests/engine/text/rtl-auto-layout-input.test.ts@@ -74,6 +74,8 @@ describe('RTL auto-layout input', () => {startY: 40,currentX: 100,currentY: 40,+ appliedDx: 0,+ appliedDy: 0,startScreenX: 100,startScreenY: 40,dragStarted: true,diff --git a/tests/engine/vue/input/explicit-snap-targets.test.ts b/tests/engine/vue/input/explicit-snap-targets.test.tsnew file mode 100644index 000000000..638dc57a3--- /dev/null+++ b/tests/engine/vue/input/explicit-snap-targets.test.ts@@ -0,0 +1,155 @@+import { describe, expect, test } from 'bun:test'++import { createEditor } from '@open-pencil/core/editor'++import { explicitSnapTargets } from '#vue/shared/input/explicit-snap-targets'+import { resolveObjectPixelSnap } from '#vue/shared/input/snap'++function pageWithGuide(offset: number, axis: 'X' | 'Y') {+ const editor = createEditor()+ const page = editor.graph.getNode(editor.state.currentPageId)+ if (!page) throw new Error('Page not found')+ page.guides = [{ axis: axis === 'X' ? 'x' : 'y', position: offset }]+ return editor+}++describe('explicit snap targets', () => {+ test('canvas guides outrank object and pixel targets', () => {+ const editor = pageWithGuide(102.5, 'X')+ const pageId = editor.state.currentPageId+ const target = editor.graph.createNode('RECTANGLE', pageId, {+ x: 103,+ y: 0,+ width: 50,+ height: 50+ })++ const result = resolveObjectPixelSnap(+ new Set(['moving']),+ { x: 100, y: 10, width: 10, height: 10 },+ [target],+ editor,+ explicitSnapTargets(pageId, editor)+ )++ expect(result.correction.x).toBe(2.5)+ expect(result.guides[0]).toMatchObject({ kind: 'canvas-guide', position: 102.5 })+ })++ test('geometry targets outrank canvas guides, objects, and pixels', () => {+ const editor = pageWithGuide(102.5, 'X')+ const pageId = editor.state.currentPageId+ const target = editor.graph.createNode('RECTANGLE', pageId, {+ x: 103,+ y: 0,+ width: 50,+ height: 50+ })++ const result = resolveObjectPixelSnap(+ new Set(['moving']),+ { x: 100, y: 10, width: 10, height: 10 },+ [target],+ editor,+ explicitSnapTargets(pageId, editor),+ [{ kind: 'geometry', axis: 'x', position: 101.5, from: 20, to: 20 }]+ )++ expect(result.correction.x).toBe(1.5)+ expect(result.guides[0]).toEqual({+ kind: 'geometry',+ axis: 'x',+ position: 101.5,+ from: 20,+ to: 20+ })+ expect(result.guides.filter((guide) => guide.axis === 'x')).toHaveLength(1)+ })++ test('emits one stable guide for coincident explicit targets', () => {+ const editor = createEditor()+ editor.state.snappingPreferences = { geometry: false, objects: false, pixelGrid: false }+ const result = resolveObjectPixelSnap(+ new Set(['moving']),+ { x: 99, y: 10, width: 10, height: 10 },+ [],+ editor,+ [+ { kind: 'canvas-guide', axis: 'x', position: 100, from: 0, to: 20 },+ { kind: 'layout-guide', axis: 'x', position: 100, from: 10, to: 30 }+ ]+ )++ expect(result.guides).toEqual([+ { kind: 'canvas-guide', axis: 'x', position: 100, from: 0, to: 20 }+ ])+ expect(+ resolveObjectPixelSnap(+ new Set(['moving']),+ { x: 99, y: 10, width: 10, height: 10 },+ [],+ editor,+ [+ { kind: 'canvas-guide', axis: 'x', position: 100, from: 0, to: 20 },+ { kind: 'layout-guide', axis: 'x', position: 100, from: 10, to: 30 }+ ]+ ).guides+ ).toEqual(result.guides)+ })++ test('extracts visible layout-guide boundaries in world space', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const frame = editor.graph.createNode('FRAME', pageId, {+ x: 100,+ y: 200,+ width: 300,+ height: 200,+ layoutGrids: [+ {+ pattern: 'COLUMNS',+ alignment: 'STRETCH',+ count: 2,+ offset: 20,+ gutterSize: 10+ }+ ]+ })++ expect(explicitSnapTargets(frame.id, editor)).toEqual(+ expect.arrayContaining([+ { kind: 'layout-guide', axis: 'x', position: 120, from: 200, to: 400 },+ { kind: 'layout-guide', axis: 'x', position: 245, from: 200, to: 400 },+ { kind: 'layout-guide', axis: 'x', position: 255, from: 200, to: 400 },+ { kind: 'layout-guide', axis: 'x', position: 380, from: 200, to: 400 }+ ])+ )+ })++ test('ignores layout guides rotated away from the canvas axes', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const frame = editor.graph.createNode('FRAME', pageId, {+ x: 100,+ y: 200,+ width: 300,+ height: 200,+ rotation: 30,+ layoutGrids: [{ pattern: 'COLUMNS', sectionSize: 50, count: 2 }]+ })++ expect(explicitSnapTargets(frame.id, editor)).toEqual([])+ })++ test('ignores hidden layout guides', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const frame = editor.graph.createNode('FRAME', pageId, {+ width: 300,+ height: 200,+ layoutGrids: [{ pattern: 'GRID', sectionSize: 10, visible: false }]+ })++ expect(explicitSnapTargets(frame.id, editor)).toEqual([])+ })+})diff --git a/tests/engine/vue/input/move-threshold.test.ts b/tests/engine/vue/input/move-threshold.test.tsindex bdf7f0991..7f68d9a65 100644--- a/tests/engine/vue/input/move-threshold.test.ts+++ b/tests/engine/vue/input/move-threshold.test.ts@@ -51,6 +51,71 @@ describe('selection move drag threshold', () => {expect(drag.dragStarted).toBe(true)})+ test('preserves fractional movement when pixel snapping is disabled', () => {+ const { editor, drag, nodeId } = setupMoveDrag()+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: false }++ handleMoveMove(drag, 16.25, 27.75, 110, 200, editor)+ handleMoveUp(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ x: 16.25, y: 27.75 })+ })++ test('snaps movement to whole pixels when pixel snapping is enabled', () => {+ const { editor, drag, nodeId } = setupMoveDrag()+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: true }++ handleMoveMove(drag, 16.25, 27.75, 110, 200, editor)+ handleMoveUp(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ x: 16, y: 28 })+ })++ test('Control bypasses object and pixel snapping during movement', () => {+ const { editor, drag, nodeId } = setupMoveDrag()++ handleMoveMove(drag, 16.25, 27.75, 110, 200, editor, true)+ handleMoveUp(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ x: 16.25, y: 27.75 })+ expect(editor.state.snapGuides).toEqual([])+ })++ test('converts world movement into a rotated parent coordinate space', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const frame = editor.graph.createNode('FRAME', pageId, {+ x: 200,+ y: 150,+ width: 300,+ height: 300,+ rotation: 30+ })+ const moving = editor.graph.createNode('RECTANGLE', frame.id, {+ x: 20,+ y: 40,+ width: 50,+ height: 50+ })+ editor.graph.createNode('RECTANGLE', frame.id, {+ x: 140,+ y: 40,+ width: 60,+ height: 50,+ rotation: 20+ })+ editor.select([moving.id])+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: false }+ const drag = createSelectionMoveDrag(0, 0, 0, 0, editor, false)+ if (drag.type !== 'move') throw new Error('Expected move drag')++ handleMoveMove(drag, 74, 43, 100, 100, editor)++ expect(editor.state.snapGuides).toEqual([])+ expect(drag.appliedDx).toBeCloseTo(85.5859, 3)+ expect(drag.appliedDy).toBeCloseTo(0.2391, 3)+ })+test('removes duplicate created for alt-click without movement', () => {const editor = createEditor()const pageId = editor.state.currentPageIddiff --git a/tests/engine/vue/input/node-edit-snap.test.ts b/tests/engine/vue/input/node-edit-snap.test.tsnew file mode 100644index 000000000..c6071a268--- /dev/null+++ b/tests/engine/vue/input/node-edit-snap.test.ts@@ -0,0 +1,208 @@+import { describe, expect, test } from 'bun:test'++import { DEFAULT_SNAPPING_PREFERENCES, createEditor } from '@open-pencil/core/editor'++import { applyNodeEditSnap } from '#vue/shared/input/node-edit/snap'+import type { DragEditNode } from '#vue/shared/input/types'++function createDrag(startX: number, startY: number): DragEditNode {+ return {+ type: 'edit-node',+ startX,+ startY,+ origPositions: new Map([[0, { x: startX, y: startY }]])+ }+}++describe('vector edit snapping', () => {+ test('snaps a dragged vertex to sibling bounds and publishes a guide', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const vector = editor.graph.createNode('VECTOR', pageId, {+ x: 0,+ y: 0,+ width: 50,+ height: 50,+ vectorNetwork: {+ vertices: [{ x: 10, y: 20 }],+ segments: [],+ regions: []+ }+ })+ editor.graph.createNode('RECTANGLE', pageId, {+ x: 100,+ y: 0,+ width: 100,+ height: 100+ })+ const editState = {+ nodeId: vector.id,+ vertices: [{ x: 10, y: 20 }],+ segments: [],+ selectedVertexIndices: new Set([0]),+ selectedHandles: new Set<string>(),+ hoveredHandleInfo: null+ }++ const snapped = applyNodeEditSnap(createDrag(10, 20), 87, 0, editor, editState)++ expect(snapped).toEqual({ x: 90, y: 0 })+ expect(editor.state.snapGuides).toContainEqual({+ axis: 'x',+ position: 100,+ from: 0,+ to: 100+ })+ })++ test('snaps a dragged vertex to another vertex in the edited network', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const vector = editor.graph.createNode('VECTOR', pageId, {+ x: 0,+ y: 0,+ width: 100,+ height: 100,+ vectorNetwork: {+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ regions: []+ }+ })+ const editState = {+ nodeId: vector.id,+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ selectedVertexIndices: new Set([0]),+ selectedHandles: new Set<string>(),+ hoveredHandleInfo: null+ }++ const snapped = applyNodeEditSnap(createDrag(10, 20), 67, 37, editor, editState)++ expect(snapped).toEqual({ x: 70, y: 40 })+ expect(editor.state.snapGuides).toEqual(+ expect.arrayContaining([+ { kind: 'geometry', axis: 'x', position: 80, from: 60, to: 60 },+ { kind: 'geometry', axis: 'y', position: 60, from: 80, to: 80 }+ ])+ )+ })++ test('keeps the snap threshold constant in screen pixels across zoom levels', () => {+ const editor = createEditor()+ editor.state.zoom = 2+ const pageId = editor.state.currentPageId+ const vector = editor.graph.createNode('VECTOR', pageId, {+ x: 0,+ y: 0,+ width: 100,+ height: 100,+ vectorNetwork: {+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ regions: []+ }+ })+ const editState = {+ nodeId: vector.id,+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ selectedVertexIndices: new Set([0]),+ selectedHandles: new Set<string>(),+ hoveredHandleInfo: null+ }++ const outsideScreenThreshold = applyNodeEditSnap(createDrag(10, 20), 67, 0, editor, editState)+ const insideScreenThreshold = applyNodeEditSnap(createDrag(10, 20), 68, 0, editor, editState)++ expect(outsideScreenThreshold.x).toBe(67)+ expect(insideScreenThreshold.x).toBe(70)+ })++ test('respects independent geometry and object preferences', () => {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const vector = editor.graph.createNode('VECTOR', pageId, {+ x: 0,+ y: 0,+ width: 100,+ height: 100,+ vectorNetwork: {+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ regions: []+ }+ })+ editor.graph.createNode('RECTANGLE', pageId, { x: 100, y: 0, width: 100, height: 100 })+ const editState = {+ nodeId: vector.id,+ vertices: [+ { x: 10, y: 20 },+ { x: 80, y: 60 }+ ],+ segments: [],+ selectedVertexIndices: new Set([0]),+ selectedHandles: new Set<string>(),+ hoveredHandleInfo: null+ }++ editor.state.snappingPreferences = {+ ...DEFAULT_SNAPPING_PREFERENCES,+ objects: false+ }+ expect(applyNodeEditSnap(createDrag(10, 20), 87, 0, editor, editState).x).toBe(87)++ editor.state.snappingPreferences = {+ geometry: false,+ objects: true,+ pixelGrid: false+ }+ expect(applyNodeEditSnap(createDrag(10, 20), 67, 37, editor, editState)).toEqual({+ x: 67,+ y: 37+ })+ })++ test('snaps vector points to whole-pixel coordinates', () => {+ const editor = createEditor()+ editor.state.snappingPreferences = { geometry: false, objects: false, pixelGrid: true }+ const pageId = editor.state.currentPageId+ const vector = editor.graph.createNode('VECTOR', pageId, {+ x: 0,+ y: 0,+ width: 100,+ height: 100,+ vectorNetwork: { vertices: [{ x: 10.2, y: 20.4 }], segments: [], regions: [] }+ })+ const editState = {+ nodeId: vector.id,+ vertices: [{ x: 10.2, y: 20.4 }],+ segments: [],+ selectedVertexIndices: new Set([0]),+ selectedHandles: new Set<string>(),+ hoveredHandleInfo: null+ }++ const snapped = applyNodeEditSnap(createDrag(10.2, 20.4), 2.2, 3.3, editor, editState)++ expect(snapped.x).toBeCloseTo(1.8)+ expect(snapped.y).toBeCloseTo(3.6)+ expect(editor.state.snapGuides.map((guide) => guide.axis).sort()).toEqual(['x', 'y'])+ })+})diff --git a/tests/engine/vue/input/resize/snapping.test.ts b/tests/engine/vue/input/resize/snapping.test.tsnew file mode 100644index 000000000..d0ad68f3f--- /dev/null+++ b/tests/engine/vue/input/resize/snapping.test.ts@@ -0,0 +1,90 @@+import { describe, expect, test } from 'bun:test'++import { createEditor } from '@open-pencil/core/editor'++import { applyResize, commitResizePreview } from '#vue/shared/input/resize'+import type { DragResize } from '#vue/shared/input/types'++function setup(handle: DragResize['handle'] = 'se') {+ const editor = createEditor()+ const pageId = editor.state.currentPageId+ const node = editor.graph.createNode('RECTANGLE', pageId, {+ x: 10.25,+ y: 20.25,+ width: 100,+ height: 80+ })+ editor.select([node.id])+ const drag: DragResize = {+ type: 'resize',+ handle,+ startX: handle.includes('w') ? node.x : node.x + node.width,+ startY: handle.includes('n') ? node.y : node.y + node.height,+ origRect: { x: node.x, y: node.y, width: node.width, height: node.height },+ nodeId: node.id,+ origVectorNetwork: null,+ origFillGeometry: [],+ origStrokeGeometry: [],+ origDerivedTextGlyphs: null,+ origStrokes: [],+ origTextPathData: null,+ origTextPathBox: null,+ origChildren: null+ }+ return { editor, nodeId: node.id, drag }+}++describe('resize snapping preferences', () => {+ test('preserves fractional edges when pixel snapping is disabled', () => {+ const { editor, nodeId, drag } = setup()+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: false }++ applyResize(drag, drag.startX + 6.3, drag.startY + 7.4, false, editor)+ commitResizePreview(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ width: 106.3, height: 87.4 })+ })++ test('snaps east and south edges to whole pixels', () => {+ const { editor, nodeId, drag } = setup()+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: true }++ applyResize(drag, drag.startX + 6.3, drag.startY + 7.4, false, editor)+ commitResizePreview(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ width: 106.75, height: 87.75 })+ })++ test('snaps west edge while preserving the opposite edge', () => {+ const { editor, nodeId, drag } = setup('w')+ editor.state.snappingPreferences = { geometry: true, objects: false, pixelGrid: true }++ applyResize(drag, drag.startX + 4.3, drag.startY, false, editor)+ commitResizePreview(drag, editor)++ const resized = editor.graph.getNode(nodeId)+ expect(resized?.x).toBeCloseTo(15)+ expect(resized?.width).toBeCloseTo(95.25)+ })++ test('Control bypass preserves fractional resize geometry', () => {+ const { editor, nodeId, drag } = setup()++ applyResize(drag, drag.startX + 6.3, drag.startY + 7.4, false, editor, true)+ commitResizePreview(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ width: 106.3, height: 87.4 })+ expect(editor.state.snapGuides).toEqual([])+ })++ test('object edges take priority over the pixel grid', () => {+ const { editor, nodeId, drag } = setup('e')+ const pageId = editor.state.currentPageId+ editor.graph.createNode('RECTANGLE', pageId, { x: 150.4, y: 0, width: 50, height: 50 })++ applyResize(drag, 148, drag.startY, false, editor)+ commitResizePreview(drag, editor)++ expect(editor.graph.getNode(nodeId)).toMatchObject({ width: 140.15 })+ })+})