* refactor(core): decompose editor factory and action modules Split the monolithic editor factory and large action modules into focused domain helpers: - create.ts assembles context through bridge modules (clipboard, components, structure, undo) and delegates to graph-reads, graph-events, layout-runner, component-sync, and state factory - structure.ts delegates to group, container-wrap, auto-layout-wrap, reorder, and state-toggle helpers - selection.ts delegates to hit-test, overlays, container navigation, and read helpers - clipboard.ts delegates to subtree-history, images, export, copy, fonts, and placement helpers - shapes.ts delegates to pen actions and section-adopt - components.ts delegates to focus and instances helpers - alignment.ts delegates to flip-rotate helper - text.ts uses explicit TextEditSession for snapshot comparison New focused modules: nudge, variable-bindings, layout-mode, page-viewports, tool-registry, color-space Undo: history/position and history/snapshot helpers, hardened batch/rollback with nested batch support and configurable limit * refactor(core): split tool definitions by domain Split the monolithic tool registry into domain-specific modules: - read/ — selection, find, pages, fonts, components, nodes, query, jsx - create/ — basic shapes, components, vector, JSX render - modify/ — paint, effects, geometry, layout, state, text, update - structure/ — basic, arrange, batch, hierarchy, replace, tree - variables/ — bindings, collections, read, values - vector/ — boolean, path, export, viewport - analyze/ — colors, typography, spacing, clusters, diff, eval - describe/ — summaries, tree, roles, layout-issues - stock-photo/ — providers, requests, apply - codegen/ — component-map, tokens Split registry into core/extended tiers; refine schema and AI adapter * refactor(core): restructure kiwi codec and instance overrides Reorganize the Kiwi .fig codec into domain subdirectories: - binary/ — codec, schema, protocol - fig/ — file, import, parse (core, worker, transfer) - node-change/ — convert, export-node, serialize, plugin-data - instance-overrides/ — constraints, dsd, populate, props, resolve, symbol-overrides, symbol-props, sync, types Vendored kiwi-schema/ left isolated * refactor(core): split profiler, icons, IO, and add subpath exports Profiler: speedscope-export, capture-session, hud-controller Icons: api, svg, types, render, create-icons tool IO: format registry and subpath exports Canvas/color/text/vector: targeted cleanup Add deliberate subpath exports: random, xpath, vector, color, canvas, scene-graph, kiwi, design-jsx, io, tools, editor, layout, canvaskit, profiler, text, lint, rpc, figma-api, constants * refactor(vue): decompose canvas input, surface lifecycle, and controls Canvas surface: gl-surface, kit-loader, render-loop, resize-observer Canvas input handlers: - move: drop-target, move-snap, duplicate-drag - select: select-move, select-hover, select-hit - resize: resize-rect, resize-vector, resize-start - transform: rotation, marquee, pan, text-selection - text-edit: navigation, clipboard, textarea lifecycle - Shared: click-count, space-key, pan, pan-zoom, draw, raf-scheduler Editor composition: - commands split: actions, context, metadata, edit, selection, view - menu-model split: command-groups, builders, types - Gradient stop composable reuse in primitive root Controls: fill, layout, typography, appearance, effects, stroke, okhcl, prop-scrub, node-props, undo-batch, color-variable-binding Variables/i18n/document/export helpers Organize canvas, primitives, controls, editor, and variables into cohesive module directories with package-local import aliases Expose MenuActionNode/MenuSeparatorNode from public API * refactor(app): split document IO, editor session, and automation bridge Document IO: source-state, naming, writer, reload-source, reload-state, imported-document, watch-targets, save-targets Editor session: create, modules, types, accessors, computed, refs Editor canvas: loader-overlay, collaboration-awareness, context-selection, menu-actions, menu-model Automation bridge: eval, tools, exports, files, selection, RPC fallback AI/ACP: transport, map-update, permission, debug, chat effects/storage Collab: awareness, graph-bindings, yjs-sync, follow, session, types Shell keyboard: actions, bindings, clipboard, focus, nudging, raw-events, registry, reserved, shortcuts, space-tool Shell menu: app-menu, document-name, entry, files Demo: colors, effects, helpers, section builders (components, app-preview, effects, standalone, variables) — document.ts reduced from 981 to 32 lines as pure orchestrator Move app modules under src/app/ with organized domain structure: editor, document, ai, collab, shell, automation, demo, tabs * refactor(app): decompose UI components with provide/inject context Split monolithic components using Reka UI-inspired namespace folders with scoped provide/inject context — no prop drilling: - CollabPanel/ — context, avatars, share, connected, join - ColorPickerPanel/ — context, area, format, field groups, sliders - MobileHud/ — context, action toast, tool badge, file menu, presence - ProviderSettings/ — context, API key/type, endpoint, tokens, photos - Toolbar/ — actions, types, desktop, mobile, tool button, flyout - LayoutSection/ — types, auto-layout, flex, grid, padding, size, clip Properties helpers: fill-okhcl adapter, fill-label, color-style-row Menu: entry helpers, document-name rename, stale type removal * refactor(mcp): split server into focused modules - browser-rpc — WebSocket client management - mcp-sessions — session lifecycle - tool-output — response formatting - tool-schema — Zod schema generation from ToolDefs - jsx-preprocess — JSX source transformation - result — result helpers - tool-registration — MCP tool wiring - auth — API key validation - http-options — CORS/request handling - stdio-bridge — stdio transport adapter * refactor(cli): split analyze subcommands and shared helpers - Analyze subcommands: clusters, colors, spacing, typography - RPC data loading helper - Migrate imports to targeted core subpath exports * refactor(docs): split VitePress config and shared table component Config helpers: sdk-sidebar, seo, labels, sidebars, locale-theme, root-theme, locales Shared SdkDataTable component replaces duplicated table markup in SdkPropsTable, SdkEventsTable, and SdkSlotsTable Update contributing and testing docs * refactor(tauri): decompose desktop entrypoint Split lib.rs into focused service modules: - fig_container.rs — .fig archive/compression commands - fonts.rs — font cache and system font enumeration - menu.rs — native menu construction - menu_events.rs — menu event dispatch and devtools toggle - window.rs — main window show/focus lifecycle * test: share domain test factories and migrate fixtures New shared helpers: - tests/helpers/scene.ts — makeSceneGraph factory - tests/helpers/vector-network.ts — vertex/segment/network builders - tests/helpers/fig-traversal.ts — all-node collection, type counts - tests/helpers/undo.ts — undo test utilities - tests/helpers/editor-history.ts — editor history test helpers Migrate render, vector, fig-roundtrip, and undo tests to use shared factories instead of inline fixture construction * build: add structural lint rules, split vite config, update docs Structural lint (oxlint.structure.json + lint/plugin.js): - 20+ custom rules enforcing package boundaries, lifecycle patterns, naming conventions, and import discipline Vite config split: raw-markdown, canvaskit-assets, pwa, server, aliases, automation plugins Remove legacy shims and utils superseded by SDK/core modules Update AGENTS.md, CONTRIBUTING.md, eval-command docs, tsconfig * fix(vue): normalize canvas directory casing and remove duplicate export - Rename Canvas/ to canvas/ in git index to match #vue/canvas/* imports (PascalCase was correct for component primitives but canvas/ is a non-component domain directory) - Remove duplicate ./random subpath export in core package.json * fix: add #vue and #core Vite resolve aliases for dev server * refactor(core): reduce remaining large modules Split the remaining large core hotspots into cohesive domain modules while preserving public facades and behavior. - Extract scene graph types, variables, node defaults, and vector-network helpers - Decompose canvas renderer orchestration, state, paints, colors, lifecycle, labels, and delegated domain methods into renderer/ and labels/ subfolders - Split Kiwi node-change, binary variable binding, layout, RPC, vector, JSX export, clipboard, design JSX, and Figma proxy helpers - Replace collision-driven *Fn import aliases with namespace imports and enforce the pattern in lint Validation: - bun run check - bun --filter @open-pencil/vue build - bun run test:dupes * fix(app): forward color input attrs * fix(app): cover section drawing errors * fix(editor): undo option-drag duplicates * docs: document domain subfolder convention * fix(app): handle undo redo on keydown * refactor(app): dispatch shortcuts from keydown * refactor: group prefixed domain modules * refactor(app): use tinykeys for shortcuts * refactor(core): group symbol override modules * refactor(core): group fig kiwi container helper * refactor(canvas): split overlay rendering modules * refactor(vue): remove unused internal barrels * fix(app): lay out demo components before instancing * fix(app): restore demo badge spacing * perf(canvas): split scene and overlay rendering * refactor(vue): wrap wheel gesture lifecycle * fix(canvas): wait for fonts before hiding loader * docs: update unreleased changelog
376 lines
10 KiB
TypeScript
376 lines
10 KiB
TypeScript
import { resolveNodeTextDirection } from './direction'
|
|
|
|
import type { SkiaRenderer } from '#core/canvas'
|
|
import type { SceneNode } from '#core/scene-graph'
|
|
import type { Rect } from '#core/types'
|
|
import type { CanvasKit, Paragraph } from 'canvaskit-wasm'
|
|
|
|
export interface TextCaret {
|
|
x: number
|
|
y0: number
|
|
y1: number
|
|
}
|
|
|
|
export interface TextEditorState {
|
|
nodeId: string
|
|
text: string
|
|
cursor: number
|
|
selectionAnchor: number | null
|
|
paragraph: Paragraph | null
|
|
textDirection: 'LTR' | 'RTL'
|
|
}
|
|
|
|
export class TextEditor {
|
|
private ck: CanvasKit
|
|
private renderer: SkiaRenderer | null = null
|
|
private _state: TextEditorState | null = null
|
|
caretVisible = true
|
|
|
|
constructor(ck: CanvasKit) {
|
|
this.ck = ck
|
|
}
|
|
|
|
private prepareMove(extend: boolean): TextEditorState | null {
|
|
const s = this._state
|
|
if (!s) return null
|
|
if (extend && s.selectionAnchor === null) s.selectionAnchor = s.cursor
|
|
if (!extend) s.selectionAnchor = null
|
|
return s
|
|
}
|
|
|
|
private replaceRange(start: number, end: number, text: string): TextEditorState | null {
|
|
const s = this._state
|
|
if (!s) return null
|
|
s.text = s.text.slice(0, start) + text + s.text.slice(end)
|
|
s.cursor = start + text.length
|
|
s.selectionAnchor = null
|
|
return s
|
|
}
|
|
|
|
private currentLineMetrics() {
|
|
const s = this._state
|
|
if (!s?.paragraph) return null
|
|
const lineNum = s.paragraph.getLineNumberAt(s.cursor)
|
|
return lineNum < 0 ? null : s.paragraph.getLineMetricsAt(lineNum)
|
|
}
|
|
|
|
private collapseSelectionTo(edge: 0 | 1): boolean {
|
|
const s = this._state
|
|
if (!s || !this.hasSelection()) return false
|
|
const range = this.getSelectionRange()
|
|
if (range) s.cursor = range[edge]
|
|
s.selectionAnchor = null
|
|
return true
|
|
}
|
|
|
|
get state(): TextEditorState | null {
|
|
return this._state
|
|
}
|
|
|
|
get isActive(): boolean {
|
|
return this._state !== null
|
|
}
|
|
|
|
get nodeId(): string | null {
|
|
return this._state?.nodeId ?? null
|
|
}
|
|
|
|
setRenderer(renderer: SkiaRenderer | null): void {
|
|
this.renderer = renderer
|
|
}
|
|
|
|
start(node: SceneNode): void {
|
|
this._state = {
|
|
nodeId: node.id,
|
|
text: node.text,
|
|
cursor: node.text.length,
|
|
selectionAnchor: null,
|
|
paragraph: null,
|
|
textDirection: resolveNodeTextDirection(node)
|
|
}
|
|
this.rebuildParagraph(node)
|
|
}
|
|
|
|
stop(): { nodeId: string; text: string } | null {
|
|
if (!this._state) return null
|
|
const result = { nodeId: this._state.nodeId, text: this._state.text }
|
|
this._state.paragraph?.delete()
|
|
this._state = null
|
|
return result
|
|
}
|
|
|
|
rebuildParagraph(node: SceneNode): void {
|
|
const s = this._state
|
|
if (!s || !this.renderer) return
|
|
s.paragraph?.delete()
|
|
s.textDirection = resolveNodeTextDirection(node)
|
|
s.paragraph = this.renderer.buildParagraph(node)
|
|
}
|
|
|
|
hasSelection(): boolean {
|
|
const s = this._state
|
|
return s !== null && s.selectionAnchor !== null && s.selectionAnchor !== s.cursor
|
|
}
|
|
|
|
getSelectionRange(): [number, number] | null {
|
|
const s = this._state
|
|
if (!s || s.selectionAnchor === null || s.selectionAnchor === s.cursor) return null
|
|
const lo = Math.min(s.cursor, s.selectionAnchor)
|
|
const hi = Math.max(s.cursor, s.selectionAnchor)
|
|
return [lo, hi]
|
|
}
|
|
|
|
getSelectedText(): string {
|
|
const range = this.getSelectionRange()
|
|
if (!range || !this._state) return ''
|
|
return this._state.text.slice(range[0], range[1])
|
|
}
|
|
|
|
selectAll(): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
s.selectionAnchor = 0
|
|
s.cursor = s.text.length
|
|
}
|
|
|
|
selectWord(pos: number): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
const text = s.text
|
|
let start = pos
|
|
let end = pos
|
|
while (start > 0 && !isWordBoundary(text[start - 1])) start--
|
|
while (end < text.length && !isWordBoundary(text[end])) end++
|
|
s.selectionAnchor = start
|
|
s.cursor = end
|
|
}
|
|
|
|
setCursorAt(x: number, y: number, extend = false): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
const pos = s.paragraph.getGlyphPositionAtCoordinate(x, y).pos
|
|
if (extend) {
|
|
if (s.selectionAnchor === null) s.selectionAnchor = s.cursor
|
|
} else {
|
|
s.selectionAnchor = null
|
|
}
|
|
s.cursor = pos
|
|
}
|
|
|
|
selectLine(pos: number): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
const lineNum = s.paragraph.getLineNumberAt(pos)
|
|
if (lineNum < 0) return
|
|
const metrics = s.paragraph.getLineMetricsAt(lineNum)
|
|
if (!metrics) return
|
|
s.selectionAnchor = metrics.startIndex
|
|
s.cursor = metrics.endExcludingWhitespaces
|
|
}
|
|
|
|
selectWordAt(x: number, y: number): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
const pos = s.paragraph.getGlyphPositionAtCoordinate(x, y).pos
|
|
this.selectWord(pos)
|
|
}
|
|
|
|
selectLineAt(x: number, y: number): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
const pos = s.paragraph.getGlyphPositionAtCoordinate(x, y).pos
|
|
this.selectLine(pos)
|
|
}
|
|
|
|
insert(text: string, node: SceneNode): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
const range = this.getSelectionRange() ?? [s.cursor, s.cursor]
|
|
this.replaceRange(range[0], range[1], text)
|
|
this.rebuildParagraph(node)
|
|
}
|
|
|
|
backspace(node: SceneNode): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
const range = this.getSelectionRange() ?? (s.cursor > 0 ? [s.cursor - 1, s.cursor] : null)
|
|
if (range) this.replaceRange(range[0], range[1], '')
|
|
this.rebuildParagraph(node)
|
|
}
|
|
|
|
delete(node: SceneNode): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
const range =
|
|
this.getSelectionRange() ?? (s.cursor < s.text.length ? [s.cursor, s.cursor + 1] : null)
|
|
if (range) this.replaceRange(range[0], range[1], '')
|
|
this.rebuildParagraph(node)
|
|
}
|
|
|
|
private moveHorizontal(extend: boolean, visualDirection: 'left' | 'right'): void {
|
|
const s = this._state
|
|
if (!s) return
|
|
if (!extend && this.collapseSelectionTo(visualDirection === 'left' ? 0 : 1)) return
|
|
this.prepareMove(extend)
|
|
const movesForward = (visualDirection === 'left') === (s.textDirection === 'RTL')
|
|
const step = movesForward ? 1 : -1
|
|
const next = s.cursor + step
|
|
if (next >= 0 && next <= s.text.length) s.cursor = next
|
|
}
|
|
|
|
moveLeft(extend = false): void {
|
|
this.moveHorizontal(extend, 'left')
|
|
}
|
|
|
|
moveRight(extend = false): void {
|
|
this.moveHorizontal(extend, 'right')
|
|
}
|
|
|
|
private moveVertical(extend: boolean, edge: 'up' | 'down'): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
this.prepareMove(extend)
|
|
const caret = this.getCaretRect()
|
|
if (!caret) return
|
|
const fontSize = s.paragraph.getLineMetrics()[0]?.height ?? 14
|
|
const y = edge === 'up' ? caret.y0 - fontSize / 2 : caret.y1 + fontSize / 2
|
|
s.cursor = s.paragraph.getGlyphPositionAtCoordinate(caret.x, y).pos
|
|
}
|
|
|
|
moveUp(extend = false): void {
|
|
this.moveVertical(extend, 'up')
|
|
}
|
|
|
|
moveDown(extend = false): void {
|
|
this.moveVertical(extend, 'down')
|
|
}
|
|
|
|
private moveToLineEdge(extend: boolean, edge: 'start' | 'end'): void {
|
|
const s = this._state
|
|
if (!s?.paragraph) return
|
|
this.prepareMove(extend)
|
|
const metrics = this.currentLineMetrics()
|
|
if (!metrics) return
|
|
const isRtlStart = s.textDirection === 'RTL' && edge === 'start'
|
|
const isLtrEnd = s.textDirection !== 'RTL' && edge === 'end'
|
|
s.cursor = isRtlStart || isLtrEnd ? metrics.endExcludingWhitespaces : metrics.startIndex
|
|
}
|
|
|
|
moveToLineStart(extend = false): void {
|
|
this.moveToLineEdge(extend, 'start')
|
|
}
|
|
|
|
moveToLineEnd(extend = false): void {
|
|
this.moveToLineEdge(extend, 'end')
|
|
}
|
|
|
|
private moveWord(extend: boolean, direction: 'left' | 'right'): void {
|
|
const s = this.prepareMove(extend)
|
|
if (!s) return
|
|
const movingLeft = direction === 'left'
|
|
let pos = this.skipWordBoundaryRun(s.text, s.cursor, movingLeft)
|
|
pos = this.skipWordInteriorRun(s.text, pos, movingLeft)
|
|
s.cursor = pos
|
|
}
|
|
|
|
private skipWordBoundaryRun(text: string, start: number, movingLeft: boolean): number {
|
|
return this.advanceWhile(text, start, movingLeft, (boundary) => movingLeft === boundary)
|
|
}
|
|
|
|
private skipWordInteriorRun(text: string, start: number, movingLeft: boolean): number {
|
|
return this.advanceWhile(text, start, movingLeft, (boundary) => movingLeft !== boundary)
|
|
}
|
|
|
|
private advanceWhile(
|
|
text: string,
|
|
start: number,
|
|
movingLeft: boolean,
|
|
shouldMove: (isBoundary: boolean) => boolean
|
|
): number {
|
|
let pos = start
|
|
const step = movingLeft ? -1 : 1
|
|
while (movingLeft ? pos > 0 : pos < text.length) {
|
|
const char = movingLeft ? text[pos - 1] : text[pos]
|
|
if (!shouldMove(isWordBoundary(char))) break
|
|
pos += step
|
|
}
|
|
return pos
|
|
}
|
|
|
|
moveWordLeft(extend = false): void {
|
|
this.moveWord(extend, 'left')
|
|
}
|
|
|
|
moveWordRight(extend = false): void {
|
|
this.moveWord(extend, 'right')
|
|
}
|
|
|
|
getCaretRect(): TextCaret | null {
|
|
const s = this._state
|
|
if (!s?.paragraph) return null
|
|
|
|
const text = s.text
|
|
const cursor = s.cursor
|
|
|
|
if (text.length === 0) {
|
|
const metrics = s.paragraph.getLineMetrics()
|
|
if (metrics.length === 0) return null
|
|
const line = metrics[0]
|
|
return { x: line.left, y0: 0, y1: line.height }
|
|
}
|
|
|
|
let lo: number
|
|
let hi: number
|
|
let useRight = false
|
|
|
|
if (cursor === 0) {
|
|
lo = 0
|
|
hi = 1
|
|
useRight = s.textDirection === 'RTL'
|
|
} else if (cursor >= text.length) {
|
|
lo = text.length - 1
|
|
hi = text.length
|
|
useRight = s.textDirection !== 'RTL'
|
|
} else {
|
|
lo = cursor
|
|
hi = cursor + 1
|
|
}
|
|
|
|
const rects = s.paragraph.getRectsForRange(
|
|
lo,
|
|
hi,
|
|
this.ck.RectHeightStyle.Max,
|
|
this.ck.RectWidthStyle.Tight
|
|
)
|
|
if (rects.length === 0) return null
|
|
const [left, top, right, bottom] = rects[0].rect
|
|
return {
|
|
x: useRight ? right : left,
|
|
y0: top,
|
|
y1: bottom
|
|
}
|
|
}
|
|
|
|
getSelectionRects(): Rect[] {
|
|
const s = this._state
|
|
if (!s?.paragraph) return []
|
|
const range = this.getSelectionRange()
|
|
if (!range) return []
|
|
|
|
const rects = s.paragraph.getRectsForRange(
|
|
range[0],
|
|
range[1],
|
|
this.ck.RectHeightStyle.Max,
|
|
this.ck.RectWidthStyle.Tight
|
|
)
|
|
return rects.map((r) => {
|
|
const [left, top, right, bottom] = r.rect
|
|
return { x: left, y: top, width: right - left, height: bottom - top }
|
|
})
|
|
}
|
|
}
|
|
|
|
function isWordBoundary(ch: string): boolean {
|
|
return /\s|[.,;:!?()[\]{}"'`<>/\\|@#$%^&*~+=\-_]/.test(ch)
|
|
}
|