openpencil/packages/core/src/canvas/strokes.ts

349 lines
9.5 KiB
TypeScript
Raw Normal View History

import type { Canvas, EmbindEnumEntity, Paint } from 'canvaskit-wasm'
Refactor architecture boundaries across core, app, and packages (#234) * 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
2026-04-30 12:14:19 +00:00
import type { SceneNode, Stroke } from '#core/scene-graph'
import type { Color } from '#core/types'
import type { SkiaRenderer } from './renderer'
import { makeSmoothRRectPath, nodeHasSmoothCorners } from './shapes'
export function getStrokeCapEntity(r: SkiaRenderer, cap: string | undefined): EmbindEnumEntity {
switch (cap) {
case 'ROUND':
return r.ck.StrokeCap.Round
case 'SQUARE':
return r.ck.StrokeCap.Square
default:
return r.ck.StrokeCap.Butt
}
}
export function getStrokeJoinEntity(r: SkiaRenderer, join: string | undefined): EmbindEnumEntity {
switch (join) {
case 'ROUND':
return r.ck.StrokeJoin.Round
case 'BEVEL':
return r.ck.StrokeJoin.Bevel
default:
return r.ck.StrokeJoin.Miter
}
}
function strokeInset(stroke: Stroke): number {
if (stroke.align === 'INSIDE') return stroke.weight / 2
if (stroke.align === 'OUTSIDE') return -stroke.weight / 2
return 0
}
export function drawDashedRRectWithSolidCorners(
r: SkiaRenderer,
canvas: Canvas,
node: SceneNode,
stroke: Stroke,
color: Color,
cornerRadius: number,
dashPhase = 0
): void {
const dash = stroke.dashPattern ?? []
const inset = strokeInset(stroke)
const left = inset
const top = inset
const right = node.width - inset
const bottom = node.height - inset
const radius = Math.max(0, cornerRadius - inset)
r.strokePaint.setColor(r.ck.Color4f(color.r, color.g, color.b, color.a))
r.strokePaint.setStrokeWidth(stroke.weight)
r.strokePaint.setAlphaf(stroke.opacity)
r.strokePaint.setStrokeCap(r.ck.StrokeCap.Butt)
r.strokePaint.setStrokeJoin(getStrokeJoinEntity(r, stroke.join))
r.strokePaint.setPathEffect(null)
canvas.drawArc(
r.ck.LTRBRect(left, top, left + radius * 2, top + radius * 2),
180,
90,
false,
r.strokePaint
)
canvas.drawArc(
r.ck.LTRBRect(right - radius * 2, top, right, top + radius * 2),
270,
90,
false,
r.strokePaint
)
canvas.drawArc(
r.ck.LTRBRect(right - radius * 2, bottom - radius * 2, right, bottom),
0,
90,
false,
r.strokePaint
)
canvas.drawArc(
r.ck.LTRBRect(left, bottom - radius * 2, left + radius * 2, bottom),
90,
90,
false,
r.strokePaint
)
r.strokePaint.setPathEffect(dash.length > 0 ? r.ck.PathEffect.MakeDash(dash, dashPhase) : null)
canvas.drawLine(left + radius, top, right - radius, top, r.strokePaint)
canvas.drawLine(right, top + radius, right, bottom - radius, r.strokePaint)
canvas.drawLine(right - radius, bottom, left + radius, bottom, r.strokePaint)
canvas.drawLine(left, bottom - radius, left, top + radius, r.strokePaint)
r.strokePaint.setPathEffect(null)
}
export function drawStyledRRectStroke(
r: SkiaRenderer,
canvas: Canvas,
rrect: Float32Array,
node: SceneNode,
stroke: Stroke,
color: Color,
dashPhase = 0
): void {
const dash = stroke.dashPattern ?? []
r.strokePaint.setColor(r.ck.Color4f(color.r, color.g, color.b, color.a))
r.strokePaint.setStrokeWidth(stroke.weight)
r.strokePaint.setAlphaf(stroke.opacity)
r.strokePaint.setStrokeCap(getStrokeCapEntity(r, stroke.cap))
r.strokePaint.setStrokeJoin(getStrokeJoinEntity(r, stroke.join))
r.strokePaint.setPathEffect(dash.length > 0 ? r.ck.PathEffect.MakeDash(dash, dashPhase) : null)
r.drawRRectStrokeWithAlign(canvas, rrect, node, stroke)
r.strokePaint.setPathEffect(null)
}
export function drawNodeStroke(
r: SkiaRenderer,
canvas: Canvas,
node: SceneNode,
rect: Float32Array,
hasRadius: boolean
): void {
switch (node.type) {
case 'VECTOR': {
const vps = r.getVectorPaths(node)
if (vps) {
for (const vp of vps) canvas.drawPath(vp, r.strokePaint)
}
break
}
case 'ELLIPSE': {
const fg = r.getFillGeometry(node)
if (fg) {
for (const p of fg) canvas.drawPath(p, r.strokePaint)
} else if (node.arcData) {
r.drawArc(canvas, node, r.strokePaint)
} else {
canvas.drawOval(rect, r.strokePaint)
}
break
}
case 'POLYGON':
case 'STAR': {
const path = r.makePolygonPath(node)
canvas.drawPath(path, r.strokePaint)
path.delete()
break
}
default:
if (nodeHasSmoothCorners(node)) {
const path = makeSmoothRRectPath(r, node)
canvas.drawPath(path, r.strokePaint)
path.delete()
} else if (hasRadius) {
canvas.drawRRect(r.makeRRect(node), r.strokePaint)
} else {
canvas.drawRect(rect, r.strokePaint)
}
}
}
export function drawStrokeWithAlign(
r: SkiaRenderer,
canvas: Canvas,
node: SceneNode,
rect: Float32Array,
hasRadius: boolean,
align: 'INSIDE' | 'CENTER' | 'OUTSIDE'
): void {
if (align === 'INSIDE') {
canvas.save()
r.clipNodeShape(canvas, node, rect, hasRadius)
const origWidth = r.strokePaint.getStrokeWidth()
r.strokePaint.setStrokeWidth(origWidth * 2)
r.drawNodeStroke(canvas, node, rect, hasRadius)
r.strokePaint.setStrokeWidth(origWidth)
canvas.restore()
} else if (align === 'OUTSIDE') {
canvas.save()
const bigRect = r.ck.LTRBRect(-node.width, -node.height, node.width * 2, node.height * 2)
const outerPath = new r.ck.Path()
outerPath.addRect(bigRect)
const innerPath = r.makeNodeShapePath(node, rect, hasRadius)
outerPath.op(innerPath, r.ck.PathOp.Difference)
innerPath.delete()
canvas.clipPath(outerPath, r.ck.ClipOp.Intersect, true)
outerPath.delete()
const origWidth = r.strokePaint.getStrokeWidth()
r.strokePaint.setStrokeWidth(origWidth * 2)
r.drawNodeStroke(canvas, node, rect, hasRadius)
r.strokePaint.setStrokeWidth(origWidth)
canvas.restore()
} else {
r.drawNodeStroke(canvas, node, rect, hasRadius)
}
}
export function drawRRectStrokeWithAlign(
r: SkiaRenderer,
canvas: Canvas,
rrect: Float32Array,
node: SceneNode,
stroke: Stroke
): void {
if (nodeHasSmoothCorners(node)) {
drawStrokeWithAlign(r, canvas, node, r.ck.LTRBRect(0, 0, node.width, node.height), true, stroke.align)
return
}
if (stroke.align === 'INSIDE') {
canvas.save()
canvas.clipRRect(rrect, r.ck.ClipOp.Intersect, true)
r.strokePaint.setStrokeWidth(stroke.weight * 2)
canvas.drawRRect(rrect, r.strokePaint)
r.strokePaint.setStrokeWidth(stroke.weight)
canvas.restore()
} else if (stroke.align === 'OUTSIDE') {
canvas.save()
const outerPath = new r.ck.Path()
outerPath.addRect(r.ck.LTRBRect(-node.width, -node.height, node.width * 2, node.height * 2))
const innerPath = new r.ck.Path()
innerPath.addRRect(rrect)
outerPath.op(innerPath, r.ck.PathOp.Difference)
innerPath.delete()
canvas.clipPath(outerPath, r.ck.ClipOp.Intersect, true)
outerPath.delete()
r.strokePaint.setStrokeWidth(stroke.weight * 2)
canvas.drawRRect(rrect, r.strokePaint)
r.strokePaint.setStrokeWidth(stroke.weight)
canvas.restore()
} else {
canvas.drawRRect(rrect, r.strokePaint)
}
}
export function drawIndividualSideStrokes(
r: SkiaRenderer,
canvas: Canvas,
node: SceneNode,
align: 'INSIDE' | 'CENTER' | 'OUTSIDE'
): void {
const w = node.width
const h = node.height
const inside = align === 'INSIDE'
const outside = align === 'OUTSIDE'
const tw = node.borderTopWeight
if (tw > 0) {
let y = 0
if (inside) y = tw / 2
else if (outside) y = -tw / 2
r.strokePaint.setStrokeWidth(tw)
canvas.drawLine(0, y, w, y, r.strokePaint)
}
const rw = node.borderRightWeight
if (rw > 0) {
let x = w
if (inside) x = w - rw / 2
else if (outside) x = w + rw / 2
r.strokePaint.setStrokeWidth(rw)
canvas.drawLine(x, 0, x, h, r.strokePaint)
}
const bw = node.borderBottomWeight
if (bw > 0) {
let y = h
if (inside) y = h - bw / 2
else if (outside) y = h + bw / 2
r.strokePaint.setStrokeWidth(bw)
canvas.drawLine(0, y, w, y, r.strokePaint)
}
const lw = node.borderLeftWeight
if (lw > 0) {
let x = 0
if (inside) x = lw / 2
else if (outside) x = -lw / 2
r.strokePaint.setStrokeWidth(lw)
canvas.drawLine(x, 0, x, h, r.strokePaint)
}
}
export function strokeNodeShape(
r: SkiaRenderer,
canvas: Canvas,
node: SceneNode,
paint: Paint
): void {
const rect = r.ck.LTRBRect(0, 0, node.width, node.height)
switch (node.type) {
case 'ELLIPSE':
canvas.drawOval(rect, paint)
return
case 'VECTOR': {
const vps = r.getVectorPaths(node)
if (vps) {
for (const vp of vps) canvas.drawPath(vp, paint)
}
return
}
case 'LINE':
canvas.drawLine(0, 0, node.width, node.height, paint)
return
case 'POLYGON':
case 'STAR': {
const path = r.makePolygonPath(node)
canvas.drawPath(path, paint)
path.delete()
return
}
}
const hasRadius =
node.cornerRadius > 0 ||
(node.independentCorners &&
(node.topLeftRadius > 0 ||
node.topRightRadius > 0 ||
node.bottomRightRadius > 0 ||
node.bottomLeftRadius > 0))
if (hasRadius) {
if (node.independentCorners) {
const rrect = new Float32Array([
0,
0,
node.width,
node.height,
node.topLeftRadius,
node.topLeftRadius,
node.topRightRadius,
node.topRightRadius,
node.bottomRightRadius,
node.bottomRightRadius,
node.bottomLeftRadius,
node.bottomLeftRadius
])
canvas.drawRRect(rrect, paint)
} else {
canvas.drawRRect(r.ck.RRectXY(rect, node.cornerRadius, node.cornerRadius), paint)
}
} else {
canvas.drawRect(rect, paint)
}
}