diff --git a/Cargo.lock b/Cargo.lock index 306660864..04c8da5f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1785,7 +1785,7 @@ checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693" [[package]] name = "figcraft" -version = "0.18.0" +version = "0.18.1" dependencies = [ "arboard", "craft-menu", @@ -1817,7 +1817,7 @@ dependencies = [ [[package]] name = "figcraft-cli" -version = "0.18.0" +version = "0.18.1" dependencies = [ "clap", "clap_complete", @@ -1835,7 +1835,7 @@ dependencies = [ [[package]] name = "figcraft-collab" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "chrono", @@ -1853,7 +1853,7 @@ dependencies = [ [[package]] name = "figcraft-collab-net" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "figcraft-collab", @@ -1876,7 +1876,7 @@ dependencies = [ [[package]] name = "figcraft-color" -version = "0.18.0" +version = "0.18.1" dependencies = [ "kurbo", "serde", @@ -1885,7 +1885,7 @@ dependencies = [ [[package]] name = "figcraft-doc" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-color", "figcraft-geom", @@ -1898,7 +1898,7 @@ dependencies = [ [[package]] name = "figcraft-engine" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "craft-docpath", @@ -1932,7 +1932,7 @@ dependencies = [ [[package]] name = "figcraft-format" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-doc", "figcraft-layout", @@ -1949,7 +1949,7 @@ dependencies = [ [[package]] name = "figcraft-geom" -version = "0.18.0" +version = "0.18.1" dependencies = [ "kurbo", "serde", @@ -1957,7 +1957,7 @@ dependencies = [ [[package]] name = "figcraft-layout" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-doc", "figcraft-geom", @@ -1965,7 +1965,7 @@ dependencies = [ [[package]] name = "figcraft-mcp" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "figcraft-collab-net", @@ -1981,7 +1981,7 @@ dependencies = [ [[package]] name = "figcraft-pathops" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-doc", "figcraft-geom", @@ -1990,7 +1990,7 @@ dependencies = [ [[package]] name = "figcraft-pdf" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-color", "figcraft-doc", @@ -2007,7 +2007,7 @@ dependencies = [ [[package]] name = "figcraft-plugin" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-color", "serde", @@ -2020,7 +2020,7 @@ dependencies = [ [[package]] name = "figcraft-render" -version = "0.18.0" +version = "0.18.1" dependencies = [ "crc32fast", "figcraft-color", @@ -2039,7 +2039,7 @@ dependencies = [ [[package]] name = "figcraft-server" -version = "0.18.0" +version = "0.18.1" dependencies = [ "chrono", "crc32fast", @@ -2064,7 +2064,7 @@ dependencies = [ [[package]] name = "figcraft-svg" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "figcraft-color", @@ -2080,7 +2080,7 @@ dependencies = [ [[package]] name = "figcraft-text" -version = "0.18.0" +version = "0.18.1" dependencies = [ "core-text", "craft-font-catalog", @@ -2098,7 +2098,7 @@ dependencies = [ [[package]] name = "figcraft-ui-egui" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "chrono", @@ -2126,7 +2126,7 @@ dependencies = [ [[package]] name = "figcraft-vectordrawable" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-color", "figcraft-doc", @@ -2140,7 +2140,7 @@ dependencies = [ [[package]] name = "figcraft-web" -version = "0.18.0" +version = "0.18.1" dependencies = [ "base64 0.22.1", "craft-web-api", @@ -6763,7 +6763,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee" [[package]] name = "xtask" -version = "0.18.0" +version = "0.18.1" dependencies = [ "figcraft-engine", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 4a5c019be..80ca99a27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ exclude = ["plugins"] # default-members = ["crates/*", "apps/figcraft", "apps/figcraft-cli", "xtask"] [workspace.package] -version = "0.18.0" +version = "0.18.1" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.95" diff --git a/ROADMAP.md b/ROADMAP.md index dc6204b44..74638c4cc 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -2,7 +2,7 @@ **Stage: alpha** · next: beta, ~26 points and ~162–292 h away (one Opus 5.5 agent; ~33–67 h wall-clock with 5 agents) -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-07 · **Change:** patch (the handoff mode reads Developer Mode in the interface, its ids and saved fields unchanged; the left rail's and tab strip's icons are larger, 20 pt (#553); Suggest auto layout adds nested auto layout frames by rows and columns and keeps the placement of the design, as the help center describes (#1823); the Local variables window selects several variables (click, Shift+click for a range, Cmd/Ctrl+click to toggle, Escape to clear) and delete, move to a group and scope act on the selected local variables in one undo step (#2002); the desktop UI takes a system face for Ethiopic, Devanagari, Gurmukhi, Gujarati, Tamil, Telugu, Kannada and Malayalam, Sinhala, Lao, Myanmar, Khmer, Armenian and Georgian as it did for Hebrew and Arabic, so a String variable's Amharic value draws in the panels instead of boxes (#2014); a layer's effect binding takes only a field its effect has; ; the boolean operation menu leads each entry with an original icon (#2003); glass takes one sample instead of its dispersion window where the colours split under 1/256 px; glass bends towards its core, and rounded rectangles work it out in closed form; glass's light is a line on its bevel and splay turns the bend towards the centre; glass bends with a thick-lens profile and splits its colours over 8 steps; glass effects take variables and keep their frost within 0–100; web host bridge: `?host=parent` or `data-host="page"` hands a page the app's files, documented in the hosting guide; a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); an image copied in another app pastes again on the desktop, and in the browser for the first time (#492); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; the object a stamp will stick to is outlined while the stamp tool is over it or a stamp is dragged over it, and board objects take no drops (gap 24); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); team library analytics count detached instances per component and file (gap 10); skipping the Open link notice by command is saved with the preferences at once (gap 15); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); `.fig` connector labels without a saved snapshot are kept, centred on their line (gap 1); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); Bosnian (`bs`) draft catalog; text style dedupe is O(spans) via a last-two cache and fingerprint buckets (#1102); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); progress docs cleaned of what merges left twice: rows merged into one, repeated status items removed, and `cargo xtask docs` (in `ci`) fails on a repeated table row or status item; a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); `.fig` elbowed and curved connectors without a saved path are routed like board connectors instead of drawn straight (gap 1); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; `figcraft-cli connect publish` publishes a code repository's code connect mappings to a design file (gap 16); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); components can't contain their own instances, directly or through other components; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); offline Penpot 2.x import/export (#1143); optional batch continue-on-error with per-step outcomes (#1386); the Design panel's sections on one grid (#858); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); images placed at their own size, 2x screenshots in points (#1360); the toolbar on one 32 pt grid, without its Resources button (#1210); M4: zero-length round-capped dashes draw dots; dash expansion uses the existing safety budget; extracted from #1143; Arabic draft catalog; scaled instances keep their scale when their main is rebuilt (#922); .fig embedded images are copied once per blob, not once per hash (#1059); page ruler guides survive save and reopen (#1476); colour picker LCH and OKLCH models; non-ASCII layer names transliterate in code export (#1235); branches in live sessions and branch history entries, gap 17; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; Installed weights of an embedded font family (#1246); `.sketch` import, best effort (Sketch 48 and newer); CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, the iteration marks 〱–〵 and the halfwidth parentheses, with behaviour cases for each; Adobe Fonts found on macOS (#298); egui 0.37 hidden-capture deadline contract; Dev Mode measurements kept on the canvas and a read-only layers panel; boards: a board area row and progress entry; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-10 · **Change:** minor (mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); the handoff mode reads Developer Mode in the interface, its ids and saved fields unchanged; the left rail's and tab strip's icons are larger, 20 pt (#553); Suggest auto layout adds nested auto layout frames by rows and columns and keeps the placement of the design, as the help center describes (#1823); the Local variables window selects several variables (click, Shift+click for a range, Cmd/Ctrl+click to toggle, Escape to clear) and delete, move to a group and scope act on the selected local variables in one undo step (#2002); the desktop UI takes a system face for Ethiopic, Devanagari, Gurmukhi, Gujarati, Tamil, Telugu, Kannada and Malayalam, Sinhala, Lao, Myanmar, Khmer, Armenian and Georgian as it did for Hebrew and Arabic, so a String variable's Amharic value draws in the panels instead of boxes (#2014); a layer's effect binding takes only a field its effect has; ; the boolean operation menu leads each entry with an original icon (#2003); glass takes one sample instead of its dispersion window where the colours split under 1/256 px; glass bends towards its core, and rounded rectangles work it out in closed form; glass's light is a line on its bevel and splay turns the bend towards the centre; glass bends with a thick-lens profile and splits its colours over 8 steps; glass effects take variables and keep their frost within 0–100; web host bridge: `?host=parent` or `data-host="page"` hands a page the app's files, documented in the hosting guide; a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); an image copied in another app pastes again on the desktop, and in the browser for the first time (#492); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; the object a stamp will stick to is outlined while the stamp tool is over it or a stamp is dragged over it, and board objects take no drops (gap 24); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); team library analytics count detached instances per component and file (gap 10); skipping the Open link notice by command is saved with the preferences at once (gap 15); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); `.fig` connector labels without a saved snapshot are kept, centred on their line (gap 1); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); Bosnian (`bs`) draft catalog; text style dedupe is O(spans) via a last-two cache and fingerprint buckets (#1102); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); progress docs cleaned of what merges left twice: rows merged into one, repeated status items removed, and `cargo xtask docs` (in `ci`) fails on a repeated table row or status item; a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); `.fig` elbowed and curved connectors without a saved path are routed like board connectors instead of drawn straight (gap 1); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; `figcraft-cli connect publish` publishes a code repository's code connect mappings to a design file (gap 16); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); components can't contain their own instances, directly or through other components; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); offline Penpot 2.x import/export (#1143); optional batch continue-on-error with per-step outcomes (#1386); the Design panel's sections on one grid (#858); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); images placed at their own size, 2x screenshots in points (#1360); the toolbar on one 32 pt grid, without its Resources button (#1210); M4: zero-length round-capped dashes draw dots; dash expansion uses the existing safety budget; extracted from #1143; Arabic draft catalog; scaled instances keep their scale when their main is rebuilt (#922); .fig embedded images are copied once per blob, not once per hash (#1059); page ruler guides survive save and reopen (#1476); colour picker LCH and OKLCH models; non-ASCII layer names transliterate in code export (#1235); branches in live sessions and branch history entries, gap 17; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; Installed weights of an embedded font family (#1246); `.sketch` import, best effort (Sketch 48 and newer); CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, the iteration marks 〱–〵 and the halfwidth parentheses, with behaviour cases for each; Adobe Fonts found on macOS (#298); egui 0.37 hidden-capture deadline contract; Dev Mode measurements kept on the canvas and a read-only layers panel; boards: a board area row and progress entry; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) FigCraft is a clean-room, open-source, pure-Rust reimplementation of the Figma design workflow, native on macOS, Windows, Linux and FreeBSD and in the browser, fully drivable by agents through @@ -365,6 +365,7 @@ Ranked; detail and milestones in [`docs/roadmap.md`](docs/roadmap.md). | Date | Change | Summary | |---|---|---| +| 2026-11-10 | minor | M12, #2226 (step 1 of 4): mind maps in the document and engine. `board.mindMap` places a first node with three children on curved branches and `board.mindMapAdd` adds a child or a sibling; the normalize pass lays a touched map out again from its first node (88 between columns, 48 between siblings, stacks centred on their parents). No toolbar entry yet; numbers unchanged. | | 2026-11-03 | minor | Traditional Chinese (Taiwan) (`zh-Hant`, 繁體中文（台灣）) draft catalog: every UI string (1,975), command label (641) and menu wording (31), translated clean-room from the English source; `zh-TW`, `zh-HK`, `zh-MO` and `zh-Hant` read it while an explicit Hans stays Simplified; the desktop UI prefers an installed Noto Sans CJK TC, then Microsoft JhengHei, PingFang TC and Heiti TC; no font is bundled; native review pending. Numbers unchanged | | 2026-11-06 | patch | M1, #2028: Edit ▸ Set default properties gives new rectangles, ellipses, polygons and stars drawn with the tools (and, set from a text layer, new text) the selected layer's properties; it only copied them for Paste properties. Tests: `default_props_tests` (3). Numbers unchanged | | 2026-11-06 | patch | M5, #2027: `proto.settings` refuses an unknown device name with the list of devices (it saved any string, and the presenter showed no device), takes known names in any case, and answers the page's prototype settings, so `proto.settings {}` reads them back over MCP. Test: `proto_present_tests::unknown_devices_are_refused_and_settings_read_back`. Numbers unchanged | diff --git a/crates/collab/src/board_sync_tests.rs b/crates/collab/src/board_sync_tests.rs index 422d60134..442388477 100644 --- a/crates/collab/src/board_sync_tests.rs +++ b/crates/collab/src/board_sync_tests.rs @@ -29,6 +29,7 @@ fn a_boards_kind_and_its_objects_metadata_sync() { to: End::Point { x: 5.0, y: 5.0 }, routing: Routing::Elbow, path: None, + branch: false, })); let mut r = host.clone(); r.apply(&diff(&host, &edited).unwrap().changes, Mode::Strict).unwrap(); @@ -38,6 +39,7 @@ fn a_boards_kind_and_its_objects_metadata_sync() { to: End::Point { x: 9.0, y: 1.0 }, routing: Routing::Straight, path: None, + branch: false, })); let d = diff(&r, &moved).unwrap(); assert!(matches!(d.changes.as_slice(), [Change::Set { prop: Prop::Board, .. }]), "{:?}", d.changes); diff --git a/crates/doc/src/board.rs b/crates/doc/src/board.rs index 89413b2e9..bcd6452e8 100644 --- a/crates/doc/src/board.rs +++ b/crates/doc/src/board.rs @@ -62,18 +62,29 @@ pub enum BoardItem { /// A table: a frame of row frames holding cell frames with text (its column lines are thin /// rectangles laid over it). Table, + /// A mind map's node: a frame hugging its text, with no outline. What it hangs from is the + /// branch (a connector with `branch`) arriving at it. + MindNode, } impl BoardItem { /// Objects selected and moved as a whole: a click on their text or outline picks them, and /// they never take other layers in. pub fn is_atom(&self) -> bool { - matches!(self, BoardItem::Sticky { .. } | BoardItem::Shape { .. } | BoardItem::Label { .. } | BoardItem::Stamp { .. } | BoardItem::Table) + matches!( + self, + BoardItem::Sticky { .. } + | BoardItem::Shape { .. } + | BoardItem::Label { .. } + | BoardItem::Stamp { .. } + | BoardItem::Table + | BoardItem::MindNode + ) } /// Objects whose first text layer is their text (a double-click or Enter edits it). pub fn has_text(&self) -> bool { - matches!(self, BoardItem::Sticky { .. } | BoardItem::Shape { .. } | BoardItem::Label { .. }) + matches!(self, BoardItem::Sticky { .. } | BoardItem::Shape { .. } | BoardItem::Label { .. } | BoardItem::MindNode) } /// Who made it (stickies and stamps; empty when unknown). @@ -115,6 +126,7 @@ impl BoardItem { BoardItem::Stamp { .. } => "stamp", BoardItem::Ink => "ink", BoardItem::Table => "table", + BoardItem::MindNode => "mindNode", } } } @@ -619,4 +631,7 @@ pub struct Connector { /// Its path as reshaped by hand; `None`: routed by itself. #[serde(default, skip_serializing_if = "Option::is_none")] pub path: Option, + /// A mind map's branch: `from` is the parent, `to` the child. The map's shape is read from these. + #[serde(default, skip_serializing_if = "crate::node::is_default")] + pub branch: bool, } diff --git a/crates/doc/src/board_mindmap.rs b/crates/doc/src/board_mindmap.rs new file mode 100644 index 000000000..53b72fbc3 --- /dev/null +++ b/crates/doc/src/board_mindmap.rs @@ -0,0 +1,138 @@ +//! Mind map layout: where the nodes of a map go, from their sizes and their tree. Pure geometry, +//! like `board_route`; the engine's normalize pass reads the tree from the branches and moves the +//! layers (#2226). + +use figcraft_geom::{Point, Rect}; + +use crate::NodeId; + +/// The room between a node's column and its children's column. +pub const MIND_GAP_X: f64 = 88.0; +/// The room between a node (with everything under it) and the next one below. +pub const MIND_GAP_Y: f64 = 48.0; +/// The most nodes one map is laid out with (a larger one is left as it is). +pub const MIND_MAX_NODES: usize = 2000; +/// The deepest level of a map that is laid out (the first node is level 0). +pub const MIND_MAX_DEPTH: usize = 64; + +/// One node of a mind map as the layout sees it. +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct MindBox { + pub id: NodeId, + /// Its box on the page now. The root's stays; of the others only the size counts, and the + /// centre's y, which orders siblings. + pub rect: Rect, + /// Its parent's index in the slice (`None`: the root, entry 0). Always a smaller index. + pub parent: Option, + /// Left of the root. Read on the root's children only: deeper nodes follow their parent. + pub left: bool, +} + +fn finite(r: Rect) -> bool { + [r.x0, r.y0, r.x1, r.y1].iter().all(|v| v.is_finite()) +} + +/// Where every node but the root goes: its box's top-left on the page. Nodes whose parent isn't +/// an earlier entry, that are deeper than [`MIND_MAX_DEPTH`] or that would land off the finite +/// plane are left out; a slice that is empty, longer than [`MIND_MAX_NODES`], whose first entry +/// has a parent or that holds a box that is not finite is left alone altogether. +pub fn mind_layout(nodes: &[MindBox]) -> Vec<(NodeId, Point)> { + let n = nodes.len(); + let Some(root) = nodes.first().filter(|r| r.parent.is_none()) else { return Vec::new() }; + if n > MIND_MAX_NODES || !nodes.iter().all(|b| finite(b.rect)) { + return Vec::new(); + } + // The tree: who is a child of whom, which side of the root it is on, how deep. + let (mut left, mut depth, mut valid) = (vec![false; n], vec![0_usize; n], vec![false; n]); + if let Some(v) = valid.first_mut() { + *v = true; + } + // Children by parent and side (0: right, 1: left; below the root only the parent's side is used). + let mut kids: Vec<[Vec; 2]> = vec![[Vec::new(), Vec::new()]; n]; + for (i, b) in nodes.iter().enumerate().skip(1) { + let Some(p) = b.parent.filter(|p| *p < i && valid.get(*p).copied().unwrap_or(false)) else { continue }; + let d = depth.get(p).copied().unwrap_or(0) + 1; + if d > MIND_MAX_DEPTH { + continue; + } + let side = if p == 0 { b.left } else { left.get(p).copied().unwrap_or(false) }; + if let (Some(v), Some(l), Some(dp)) = (valid.get_mut(i), left.get_mut(i), depth.get_mut(i)) { + (*v, *l, *dp) = (true, side, d); + } + if let Some(k) = kids.get_mut(p) { + k[usize::from(side)].push(i); + } + } + // Siblings keep the order they are in: by their middles, then by id. + for k in kids.iter_mut().flatten() { + k.sort_by(|a, b| { + let (x, y) = (nodes.get(*a), nodes.get(*b)); + match (x, y) { + (Some(x), Some(y)) => x.rect.center().y.total_cmp(&y.rect.center().y).then(x.id.cmp(&y.id)), + _ => std::cmp::Ordering::Equal, + } + }); + } + let height = |i: usize| nodes.get(i).map_or(0.0, |b| b.rect.height()); + let width = |i: usize| nodes.get(i).map_or(0.0, |b| b.rect.width()); + // Span, backward: a node's room is its own height or its children's stack, whichever is more. + let stack = |span: &[f64], list: &[usize]| { + let total: f64 = list.iter().map(|c| span.get(*c).copied().unwrap_or(0.0)).sum(); + total + MIND_GAP_Y * list.len().saturating_sub(1) as f64 + }; + let mut span = vec![0.0_f64; n]; + for i in (1..n).rev() { + let own = kids.get(i).map_or(0.0, |k| stack(&span, &k[usize::from(left.get(i).copied().unwrap_or(false))])); + if let Some(s) = span.get_mut(i) { + *s = height(i).max(own); + } + } + // Place, forward. `column[i]`: where node i's children's column begins (its left edge on the + // right side, its right edge on the left side); `centre[i]`: its middle. + let mut column = vec![0.0_f64; n]; + let mut centre = vec![0.0_f64; n]; + let mut out = Vec::new(); + let root_c = root.rect.center().y; + if let Some(c) = centre.first_mut() { + *c = root_c; + } + let mut ok = vec![false; n]; + if let Some(o) = ok.first_mut() { + *o = true; + } + for i in 0..n { + if !ok.get(i).copied().unwrap_or(false) { + continue; + } + let Some(k) = kids.get(i) else { continue }; + for side in [false, true] { + let list = k[usize::from(side)].as_slice(); + if list.is_empty() { + continue; + } + // The column the group starts in: past the widest node of its parent's own group. + let x = + if i == 0 { if side { root.rect.x0 - MIND_GAP_X } else { root.rect.x1 + MIND_GAP_X } } else { column.get(i).copied().unwrap_or(0.0) }; + let widest = list.iter().map(|c| width(*c)).fold(0.0, f64::max); + let mut top = centre.get(i).copied().unwrap_or(0.0) - stack(&span, list) / 2.0; + for &c in list { + let s = span.get(c).copied().unwrap_or(0.0); + let mid = top + s / 2.0; + let at = Point::new(if side { x - width(c) } else { x }, mid - height(c) / 2.0); + top += s + MIND_GAP_Y; + if !(at.x.is_finite() && at.y.is_finite() && mid.is_finite()) { + continue; + } + if let (Some(m), Some(col), Some(o)) = (centre.get_mut(c), column.get_mut(c), ok.get_mut(c)) { + *m = mid; + *col = if side { x - widest - MIND_GAP_X } else { x + widest + MIND_GAP_X }; + *o = true; + } + if let Some(b) = nodes.get(c) { + out.push((b.id, at)); + } + } + } + } + out +} diff --git a/crates/doc/src/board_mindmap_tests.rs b/crates/doc/src/board_mindmap_tests.rs new file mode 100644 index 000000000..add424574 --- /dev/null +++ b/crates/doc/src/board_mindmap_tests.rs @@ -0,0 +1,99 @@ +//! Mind map layout (`board_mindmap`): columns 88 apart, siblings 48 apart, stacks centred on their +//! parents (#2226). + +use figcraft_geom::{Point, Rect}; + +use crate::NodeId; +use crate::board_mindmap::{MIND_GAP_X, MIND_GAP_Y, MIND_MAX_NODES, MindBox, mind_layout}; + +/// The first node, always at the origin, 200 x 36. +fn root() -> MindBox { + MindBox { id: NodeId(1), rect: Rect::new(0.0, 0.0, 200.0, 36.0), parent: None, left: false } +} + +/// A node `w` x `h` whose current top is `y` (only its middle, which orders siblings, counts). +fn node(id: u64, parent: usize, (w, h): (f64, f64), y: f64) -> MindBox { + MindBox { id: NodeId(id), rect: Rect::new(0.0, y, w, y + h), parent: Some(parent), left: false } +} + +fn at(placed: &[(NodeId, Point)], id: u64) -> (f64, f64) { + let p = placed.iter().find(|(n, _)| *n == NodeId(id)).map(|(_, p)| *p).unwrap_or_else(|| panic!("node {id} not placed in {placed:?}")); + (p.x, p.y) +} + +/// The root and three children (100, 60 and 80 wide) whose middles are in that order; `middle` is +/// the second child's size. +fn three(middle: (f64, f64)) -> Vec { + vec![root(), node(2, 0, (100.0, 24.0), 0.0), node(3, 0, middle, 22.0 - middle.1 / 2.0), node(4, 0, (80.0, 24.0), 20.0)] +} + +/// The root, two children (100 and 60 wide) under it, two more under the first and one under the second. +fn six() -> Vec { + vec![ + root(), + node(2, 0, (100.0, 24.0), 0.0), + node(3, 0, (60.0, 24.0), 10.0), + node(4, 1, (40.0, 24.0), 0.0), + node(5, 1, (40.0, 24.0), 10.0), + node(6, 2, (40.0, 24.0), 0.0), + ] +} + +#[test] +fn three_children_stand_88_right_of_the_root_72_apart_centred_on_it() { + assert_eq!((MIND_GAP_X, MIND_GAP_Y), (88.0, 48.0)); + let placed = mind_layout(&three((60.0, 24.0))); + assert_eq!([at(&placed, 2), at(&placed, 3), at(&placed, 4)], [(288.0, -66.0), (288.0, 6.0), (288.0, 78.0)]); + assert!(placed.iter().all(|(n, _)| *n != NodeId(1)), "the first node stays where it is"); +} + +#[test] +fn a_taller_node_pushes_its_neighbours_half_its_growth_each_way() { + let placed = mind_layout(&three((60.0, 72.0))); + assert_eq!([at(&placed, 2), at(&placed, 3), at(&placed, 4)], [(288.0, -90.0), (288.0, -18.0), (288.0, 102.0)]); +} + +#[test] +fn grandchildren_share_a_column_past_the_widest_sibling_and_their_parents_make_room() { + let nodes = six(); + let placed = mind_layout(&nodes); + // 476 = 288 + 100 + 88, although B is only 60 wide. + let got: Vec<(f64, f64)> = (2..=6).map(|i| at(&placed, i)).collect(); + assert_eq!(got, [(288.0, -30.0), (288.0, 78.0), (476.0, -66.0), (476.0, 6.0), (476.0, 78.0)]); +} + +#[test] +fn left_children_mirror_the_right_ones() { + let mut l = node(2, 0, (80.0, 24.0), 0.0); + l.left = true; + let placed = mind_layout(&[root(), l, node(3, 1, (50.0, 24.0), 0.0)]); + assert_eq!((at(&placed, 2), at(&placed, 3)), ((-168.0, 6.0), (-306.0, 6.0))); +} + +#[test] +fn the_layout_is_a_fixed_point_ties_go_by_id_and_junk_is_skipped() { + let nodes = six(); + let placed = mind_layout(&nodes); + let again: Vec = nodes + .iter() + .map(|b| { + let p = placed.iter().find(|(n, _)| *n == b.id).map_or(b.rect.origin(), |(_, p)| *p); + MindBox { rect: Rect::from_origin_size(p, b.rect.size()), ..*b } + }) + .collect(); + assert_eq!(mind_layout(&again), placed, "a laid out map is left as it is"); + // The same height: the lower id goes first. + let tied = mind_layout(&[root(), node(9, 0, (10.0, 24.0), 5.0), node(7, 0, (10.0, 24.0), 5.0)]); + assert!(at(&tied, 7).1 < at(&tied, 9).1); + // Junk: nothing placed, nothing panics. + assert!(mind_layout(&[]).is_empty()); + let mut nan = three((60.0, 24.0)); + nan[2].rect = Rect::new(f64::NAN, 0.0, 1.0, 1.0); + assert!(mind_layout(&nan).is_empty()); + let mut orphan = three((60.0, 24.0)); + orphan.push(node(8, 9, (10.0, 24.0), 0.0)); + assert!(!mind_layout(&orphan).iter().any(|(n, _)| *n == NodeId(8)), "a parent that doesn't come first"); + let mut huge = vec![root()]; + huge.extend((0..MIND_MAX_NODES as u64).map(|i| node(i + 2, 0, (10.0, 24.0), i as f64))); + assert!(mind_layout(&huge).is_empty()); +} diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs index 81760d718..6a0c2aedf 100644 --- a/crates/doc/src/lib.rs +++ b/crates/doc/src/lib.rs @@ -9,6 +9,7 @@ #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)] pub mod board; +mod board_mindmap; mod board_route; pub mod colors; pub mod comments; @@ -27,6 +28,7 @@ pub mod vector_faces; pub mod vector_regions; pub use board::*; +pub use board_mindmap::{MIND_GAP_X, MIND_GAP_Y, MIND_MAX_DEPTH, MIND_MAX_NODES, MindBox, mind_layout}; pub use board_route::{END_GAP, MAX_RUNS, RouteEnd, attach_points, attached_sides, path_handles, reshaped, route_along, route_points}; pub use colors::*; pub use comments::*; @@ -1314,6 +1316,8 @@ fn remap_action(a: &mut proto::Action, map: &BTreeMap) { #[cfg(test)] mod blur_tests; #[cfg(test)] +mod board_mindmap_tests; +#[cfg(test)] mod board_route_tests; #[cfg(test)] mod board_shape_tests; diff --git a/crates/doc/src/props.rs b/crates/doc/src/props.rs index 99b9d9c39..15d557d88 100644 --- a/crates/doc/src/props.rs +++ b/crates/doc/src/props.rs @@ -1399,6 +1399,10 @@ impl ExportSize { Some((i, c)) if c.is_ascii_alphabetic() => (s.get(..i)?.trim(), Some(c)), _ => (s.as_str(), None), }; + // Plain decimal only: no sign, exponent, "inf" or "nan". + if !num.bytes().all(|b| b.is_ascii_digit() || b == b'.') { + return None; + } let value: f64 = num.parse().ok()?; match unit { None | Some('x') => ExportSize::Scale { value }, diff --git a/crates/engine/src/board_mindmap_tests.rs b/crates/engine/src/board_mindmap_tests.rs new file mode 100644 index 000000000..19bb459ae --- /dev/null +++ b/crates/engine/src/board_mindmap_tests.rs @@ -0,0 +1,385 @@ +//! Mind maps (#2226): `board.mindMap` and `board.mindMapAdd` make nodes and branches, and the +//! normalize pass lays a touched map out again from its first node after every edit. + +use figcraft_color::{Color, Paint}; +use figcraft_doc::{BoardItem, Connector, Document, END_GAP, End, LetterSpacing, LineHeight, NodeId, NodeKind, Routing, Side, StrokeCap}; +use figcraft_geom::{Point, Rect}; +use serde_json::{Value, json}; + +use crate::Session; +use crate::board::text_of; +use crate::board_tests::{board, connector, drawn, id, near, node}; +use crate::collab_live_tests::Room; + +fn bx(s: &Session, id: NodeId) -> Rect { + s.doc().unwrap().world_bounds(id).unwrap() +} + +fn same(a: f64, b: f64) -> bool { + (a - b).abs() < 1e-6 +} + +/// `board.mindMap` at (100, 200): the first node, its three children and their branches. +fn map(s: &mut Session) -> (NodeId, [NodeId; 3], [NodeId; 3]) { + let out = s.execute("board.mindMap", &json!({"x": 100, "y": 200})).unwrap(); + let kids: Vec = out["children"].as_array().unwrap().clone(); + let (c, k): (Vec, Vec) = kids.iter().map(|v| (id(v, "id"), id(v, "connector"))).unzip(); + (id(&out, "id"), [c[0], c[1], c[2]], [k[0], k[1], k[2]]) +} + +fn text_data(s: &Session, n: NodeId) -> figcraft_doc::TextData { + let t = text_of(s.doc().unwrap(), n).unwrap(); + match node(s, t).kind { + NodeKind::Text(td) => td, + other => panic!("not text: {other:?}"), + } +} + +fn is_mind_node(s: &Session, n: NodeId) -> bool { + node(s, n).board == Some(BoardItem::MindNode) +} + +/// The nodes hanging off `parent`, top to bottom, in `doc`. +fn kids(doc: &Document, parent: NodeId) -> Vec { + let mut v: Vec<(f64, NodeId)> = doc + .nodes() + .filter_map(|n| match &n.board { + Some(BoardItem::Connector(Connector { from: End::Node { node, .. }, to: End::Node { node: to, .. }, branch: true, .. })) + if *node == parent => + { + doc.world_bounds(*to).map(|b| (b.center().y, *to)) + } + _ => None, + }) + .collect(); + v.sort_by(|a, b| a.0.total_cmp(&b.0)); + v.into_iter().map(|p| p.1).collect() +} + +fn places(s: &Session, ids: &[NodeId]) -> Vec { + ids.iter().map(|i| bx(s, *i)).collect() +} + +fn branches(s: &Session) -> Vec { + s.doc().unwrap().nodes().filter(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.branch)).map(|n| n.id).collect() +} + +/// Starter child `i` (`k`, on branch `line`) of the first node: its text, its place and its branch. +fn check_child(s: &Session, root: NodeId, (k, line): (NodeId, NodeId), i: usize) { + let r = bx(s, root); + let td = text_data(s, k); + assert_eq!(td.characters, ["Idea 1", "Idea 2", "Idea 3"][i]); + assert_eq!((td.style.font_size, td.style.font_style.as_str()), (16.0, "Medium")); + assert_eq!((td.style.line_height, td.style.letter_spacing), (LineHeight::Percent(150.0), LetterSpacing::Percent(-1.1))); + let b = bx(s, k); + assert!(same(b.x0, r.x1 + 88.0), "child {i}: 88 right of the root"); + assert_eq!(b.height(), 24.0); + let t = bx(s, text_of(s.doc().unwrap(), k).unwrap()); + assert!(same(b.width(), t.width()), "child {i}: the node is its text, no padding"); + assert!(is_mind_node(s, k)); + let want = Connector { + from: End::Node { node: root, side: Side::Right, at: None }, + to: End::Node { node: k, side: Side::Left, at: None }, + routing: Routing::Curved, + path: None, + branch: true, + }; + assert_eq!(connector(s, line), want); + let l = node(s, line); + assert_eq!((l.stroke.cap_start, l.stroke.cap_end), (StrokeCap::Round, StrokeCap::Round)); + assert_eq!((l.stroke.weight, l.strokes), (4.0, vec![Paint::solid(Color::from_rgb8_const(0x75, 0x75, 0x75))])); + let pts = drawn(s, line); + assert!(near(pts[0], Point::new(r.x1 + END_GAP, r.center().y)), "{pts:?}"); + assert!(near(*pts.last().unwrap(), Point::new(b.x0 - END_GAP, b.center().y)), "{pts:?}"); +} + +#[test] +fn a_mind_map_is_a_first_node_with_three_children_on_branches() { + let mut s = board(); + let before = s.doc().unwrap().ids().count(); + let depth = s.undo_depth().0; + let (root, kids, lines) = map(&mut s); + assert_eq!(node(&s, root).board, Some(BoardItem::MindNode)); + assert!(node(&s, root).is_board_atom()); + let r = bx(&s, root); + assert_eq!((r.x0, r.y0), (100.0, 200.0)); + let td = text_data(&s, root); + assert_eq!((td.characters.as_str(), td.style.font_size, td.style.font_style.as_str()), ("Topic", 24.0, "Bold")); + assert_eq!((td.style.line_height, td.style.letter_spacing), (LineHeight::Percent(150.0), LetterSpacing::Percent(-1.9))); + assert_eq!(r.height(), 36.0, "one line at 150%"); + let text = text_of(s.doc().unwrap(), root).unwrap(); + assert_eq!(node(&s, text).fills, vec![Paint::solid(Color::from_rgb8_const(0x1E, 0x1E, 0x1E))]); + for (i, pair) in kids.into_iter().zip(lines).enumerate() { + check_child(&s, root, pair, i); + } + let h = bx(&s, kids[0]).height(); + assert!(same(bx(&s, kids[1]).center().y, r.center().y)); + assert!(same(bx(&s, kids[0]).center().y, r.center().y - h - 48.0)); + assert!(same(bx(&s, kids[2]).center().y, r.center().y + h + 48.0)); + assert_eq!(s.selection(), vec![root]); + assert_eq!(s.undo_depth().0, depth + 1); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().ids().count(), before); +} + +#[test] +fn a_new_child_goes_below_its_siblings_and_the_stack_stays_centred() { + let mut s = board(); + let (root, kids3, _) = map(&mut s); + let h = bx(&s, kids3[0]).height(); + let was = places(&s, &kids3); + s.ui_requests.clear(); + let out = s.execute("board.mindMapAdd", &json!({"id": root, "text": "Four", "edit": true})).unwrap(); + let new = id(&out, "id"); + assert!(is_mind_node(&s, new)); + assert_eq!(text_data(&s, new).style.font_size, 16.0); + let order = kids(s.doc().unwrap(), root); + assert_eq!(order, [kids3[0], kids3[1], kids3[2], new]); + let cy: Vec = order.iter().map(|n| bx(&s, *n).center().y).collect(); + assert!(cy.windows(2).all(|w| same(w[1] - w[0], h + 48.0)), "{cy:?}"); + assert!(same((cy[0] + cy[3]) / 2.0, bx(&s, root).center().y)); + assert!(same(bx(&s, kids3[0]).y0, was[0].y0 - (h + 48.0) / 2.0), "the first one moved up 36"); + assert_eq!(s.selection(), vec![new]); + assert!(s.ui_requests.iter().any(|q| q.kind == "board.editText" && q.data["id"] == json!(new))); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(places(&s, &kids3), was, "the three are back exactly"); + // Without an id the selected first node is the one. + s.execute("select.set", &json!({"ids": [root]})).unwrap(); + s.execute("board.mindMapAdd", &json!({})).unwrap(); + assert_eq!(kids(s.doc().unwrap(), root).len(), 4); +} + +#[test] +fn a_childs_child_starts_the_next_column_and_a_sibling_goes_right_after() { + let mut s = board(); + let (root, [c0, c1, c2], _) = map(&mut s); + let h = bx(&s, c0).height(); + let g1 = id(&s.execute("board.mindMapAdd", &json!({"id": c0})).unwrap(), "id"); + let g2 = id(&s.execute("board.mindMapAdd", &json!({"id": c0})).unwrap(), "id"); + let column = [c0, c1, c2].iter().map(|n| bx(&s, *n).x1).fold(f64::MIN, f64::max) + 88.0; + assert!(same(bx(&s, g1).x0, column) && same(bx(&s, g2).x0, column), "past the widest of the three"); + assert!(same(bx(&s, g2).center().y - bx(&s, g1).center().y, h + 48.0)); + assert!(same((bx(&s, g1).center().y + bx(&s, g2).center().y) / 2.0, bx(&s, c0).center().y)); + for g in [g1, g2] { + let line = s.doc().unwrap().nodes().find(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.to.node() == Some(g))).unwrap().id; + assert!(matches!(connector(&s, line).from, End::Node { node, side: Side::Right, .. } if node == c0)); + } + assert!(same(bx(&s, c1).center().y - bx(&s, c0).center().y, (2.0 * h + 48.0) / 2.0 + 48.0 + h / 2.0), "108 below"); + let new = id(&s.execute("board.mindMapAdd", &json!({"id": c1, "relation": "sibling"})).unwrap(), "id"); + let line = s.doc().unwrap().nodes().find(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.to.node() == Some(new))).unwrap().id; + assert!(matches!(connector(&s, line).from, End::Node { node, .. } if node == root)); + assert_eq!(kids(s.doc().unwrap(), root), [c0, c1, new, c2]); +} + +#[test] +fn more_lines_push_the_siblings_apart() { + let mut s = board(); + let (root, [c0, c1, c2], _) = map(&mut s); + let (h, was) = (bx(&s, c1).height(), places(&s, &[c0, c1, c2])); + let t = text_of(s.doc().unwrap(), c1).unwrap(); + s.execute("node.set", &json!({"id": t, "props": {"characters": "one\ntwo\nthree"}})).unwrap(); + let h3 = bx(&s, c1).height(); + assert_eq!((h, h3), (24.0, 72.0)); + assert!(same(bx(&s, c1).center().y, bx(&s, root).center().y)); + for k in [c0, c2] { + assert!(same((bx(&s, k).center().y - bx(&s, c1).center().y).abs(), (h + h3) / 2.0 + 48.0)); + } + assert!(same(bx(&s, c0).y0, was[0].y0 - (h3 - h) / 2.0), "24 up"); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(places(&s, &[c0, c1, c2]), was); +} + +#[test] +fn the_first_node_carries_the_map_and_a_child_moved_by_hand_goes_back_or_swaps() { + let mut s = board(); + let (root, kids3, lines) = map(&mut s); + let was = places(&s, &kids3); + s.execute("transform.move", &json!({"ids": [root], "dx": 50, "dy": 30})).unwrap(); + for (k, w) in kids3.iter().zip(&was) { + let b = bx(&s, *k); + assert!(same(b.x0, w.x0 + 50.0) && same(b.y0, w.y0 + 30.0), "{b:?} from {w:?}"); + } + for l in lines { + assert!(near(drawn(&s, l)[0], Point::new(bx(&s, root).x1 + END_GAP, bx(&s, root).center().y))); + } + let now = places(&s, &kids3); + s.execute("transform.move", &json!({"ids": [kids3[2]], "dx": 300, "dy": 5})).unwrap(); + assert_eq!(places(&s, &kids3), now, "it goes back"); + s.execute("transform.move", &json!({"ids": [kids3[0]], "dx": 0, "dy": 100})).unwrap(); + assert_eq!(kids(s.doc().unwrap(), root), [kids3[1], kids3[0], kids3[2]], "past the middle one's middle: they swap"); + assert!(same(bx(&s, kids3[1]).center().y, bx(&s, root).center().y - 72.0)); +} + +#[test] +fn a_deleted_node_leaves_its_children_in_place_and_takes_its_branches() { + let mut s = board(); + let (root, [c0, c1, c2], _) = map(&mut s); + let h = bx(&s, c0).height(); + let g = id(&s.execute("board.mindMapAdd", &json!({"id": c1})).unwrap(), "id"); + let at = bx(&s, g); + let (undo, _) = s.undo_depth(); + s.execute("edit.delete", &json!({"ids": [c1]})).unwrap(); + let left = branches(&s); + assert_eq!(left.len(), 2, "the root's two others"); + for l in &left { + assert!(!matches!(connector(&s, *l).to, End::Node { node, .. } if node == c1 || node == g), "none to the gone node or its child"); + } + assert_eq!(bx(&s, g), at, "the child stays where it was"); + assert!(is_mind_node(&s, g)); + let r = bx(&s, root).center().y; + assert!(same(bx(&s, c0).center().y, r - (h + 48.0) / 2.0) && same(bx(&s, c2).center().y, r + (h + 48.0) / 2.0)); + let line = s.doc().unwrap().nodes().find(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.to.node() == Some(c2))).unwrap().id; + let spot = bx(&s, c2); + s.execute("edit.delete", &json!({"ids": [line]})).unwrap(); + assert_eq!(bx(&s, c2), spot, "a detached node stays"); + assert!(same(bx(&s, c0).center().y, r)); + assert_eq!(branches(&s).len(), 1); + s.execute("edit.undo", &json!({})).unwrap(); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(s.undo_depth().0, undo); + assert_eq!(branches(&s).len(), 4); + assert!(s.doc().unwrap().contains(c1)); +} + +#[test] +fn two_people_adding_at_once_end_with_one_layout() { + let mut s = board(); + let (root, [c0, ..], _) = map(&mut s); + let h = bx(&s, c0).height(); + let mut room = Room::new(s.doc().unwrap().clone(), 2, 7); + for i in 0..2 { + room.s(i).execute("board.mindMapAdd", &json!({"id": root})).unwrap(); + } + room.settle(); + room.check(); + let doc = room.server.document(); + let order = kids(doc, root); + assert_eq!(order.len(), 5); + let centres = |doc: &Document, order: &[NodeId]| order.iter().map(|n| doc.world_bounds(*n).unwrap().center().y).collect::>(); + let cy = centres(doc, &order); + assert!(cy.windows(2).all(|w| w[1] > w[0] && same(w[1] - w[0], h + 48.0)), "{cy:?}"); + assert!(same((cy[0] + cy[4]) / 2.0, doc.world_bounds(root).unwrap().center().y)); + // One makes a child three lines tall while the other adds one. + let t = text_of(doc, order[1]).unwrap(); + room.s(0).execute("node.set", &json!({"id": t, "props": {"characters": "one\ntwo\nthree"}})).unwrap(); + room.s(1).execute("board.mindMapAdd", &json!({"id": root})).unwrap(); + room.settle(); + room.check(); + let doc = room.server.document(); + let order = kids(doc, root); + assert_eq!(order.len(), 6); + let (boxes, mut gap_ok) = (order.iter().map(|n| doc.world_bounds(*n).unwrap()).collect::>(), true); + for w in boxes.windows(2) { + gap_ok &= same(w[1].y0 - w[0].y1, 48.0); + } + assert!(gap_ok, "48 between every pair: {boxes:?}"); + assert!(boxes.iter().any(|b| same(b.height(), 3.0 * h))); + let (top, bottom) = (boxes[0].y0, boxes[5].y1); + assert!(same((top + bottom) / 2.0, doc.world_bounds(root).unwrap().center().y)); +} + +#[test] +fn refusals_saved_files_and_a_second_pass_changes_nothing() { + let mut d = Session::new(); + d.execute("file.new", &json!({})).unwrap(); + for cmd in ["board.mindMap", "board.mindMapAdd"] { + assert!(matches!(d.execute(cmd, &json!({})), Err(crate::EngineError::Disabled(..))), "{cmd} on a design file"); + } + let mut s = board(); + let (root, ..) = map(&mut s); + let sticky = id(&s.execute("board.sticky", &json!({"x": 900, "y": 0})).unwrap(), "id"); + for p in [json!({"id": sticky}), json!({"id": root, "relation": "cousin"}), json!({"id": root, "relation": "sibling"})] { + assert!(s.execute("board.mindMapAdd", &p).is_err(), "{p}"); + } + s.execute("select.none", &json!({})).unwrap(); + assert!(s.execute("board.mindMapAdd", &json!({})).is_err(), "nothing selected"); + let twenty_one: Vec = (0..21).map(|i| format!("n{i}")).collect(); + assert!(s.execute("board.mindMap", &json!({"children": twenty_one})).is_err()); + assert!(s.execute("board.mindMap", &json!({"children": "x"})).is_err()); + let doc = s.doc().unwrap(); + let (back, _) = figcraft_format::from_json(&figcraft_format::to_json(doc).unwrap().to_string()).unwrap(); + assert_eq!(back.nodes().filter(|n| n.board == Some(BoardItem::MindNode)).count(), 4); + assert_eq!(back.nodes().filter(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.branch)).count(), 3); + // An ordinary connector writes no `branch`; a file without it reads `false`. + let mut plain = board(); + let a = id(&plain.execute("board.sticky", &json!({"x": 0, "y": 0})).unwrap(), "id"); + let b = id(&plain.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id"); + plain.execute("board.connector", &json!({"from": a, "to": b})).unwrap(); + assert!(!figcraft_format::to_json(plain.doc().unwrap()).unwrap().to_string().contains("\"branch\"")); + let item: BoardItem = serde_json::from_value(json!({"type": "connector", "from": {"x": 0, "y": 0}, "to": {"x": 1, "y": 1}})).unwrap(); + assert!(matches!(item, BoardItem::Connector(c) if !c.branch)); + // Every layer touched again: a laid out map is not an edit. + let mut again = doc.clone(); + again.mark_dirty(doc.ids().collect::>()); + crate::normalize(&mut again, doc); + assert!(again == *doc, "a second pass changes nothing"); +} + +/// Every layer touched again on a copy of `s`'s document: a map in place is left as it is. +fn second_pass_is_a_no_op(s: &Session) { + let doc = s.doc().unwrap(); + let mut again = doc.clone(); + again.mark_dirty(doc.ids().collect::>()); + crate::normalize(&mut again, doc); + assert!(again == *doc, "a second pass changes nothing"); +} + +#[test] +fn a_map_around_its_own_container_stays_put() { + let mut s = board(); + let sec = id(&s.execute("node.create", &json!({"type": "section", "x": 0, "y": 0, "width": 800, "height": 600})).unwrap(), "id"); + let out = s.execute("board.mindMap", &json!({"parent": sec, "x": 40, "y": 40})).unwrap(); + let line = id(&out["children"][1], "connector"); + s.execute("board.reattach", &json!({"id": line, "end": "to", "target": sec})).unwrap(); + let was = bx(&s, sec); + second_pass_is_a_no_op(&s); + s.execute("node.set", &json!({"id": id(&out, "id"), "props": {"name": "again"}})).unwrap(); + assert_eq!(bx(&s, sec), was, "the section stays where it is"); + second_pass_is_a_no_op(&s); +} + +#[test] +fn a_branch_moved_by_its_start_leaves_no_gap_and_odd_structures_settle() { + let mut s = board(); + let (root, [c0, c1, c2], lines) = map(&mut s); + let (h, at) = (bx(&s, c1).height(), bx(&s, c1)); + s.execute("board.reattach", &json!({"id": lines[1], "end": "from", "target": {"x": 900, "y": 900}})).unwrap(); + assert_eq!(branches(&s).len(), 2, "one branch fewer"); + assert_eq!(bx(&s, c1), at, "that child stays where it was"); + let r = bx(&s, root).center().y; + assert!(same(bx(&s, c0).center().y, r - (h + 48.0) / 2.0), "{:?}", bx(&s, c0)); + assert!(same(bx(&s, c2).center().y, r + (h + 48.0) / 2.0), "{:?}", bx(&s, c2)); + second_pass_is_a_no_op(&s); + + // Two branches arrive at one node: the lower connector id stays its parent. + let mut s = board(); + let (root, [c0, c1, _], lines) = map(&mut s); + let g = id(&s.execute("board.mindMapAdd", &json!({"id": c0})).unwrap(), "id"); + let gl = branches(&s).into_iter().find(|b| !lines.contains(b)).unwrap(); + s.execute("board.reattach", &json!({"id": gl, "end": "to", "target": c1})).unwrap(); + assert_eq!(kids(s.doc().unwrap(), root).len(), 3); + assert!(same(bx(&s, c1).x0, bx(&s, root).x1 + 88.0), "c1 stays in the root's column"); + assert!(is_mind_node(&s, g)); + second_pass_is_a_no_op(&s); + + // A cycle: nothing in it moves, and nothing changes after. + let mut s = board(); + let (_, [c0, ..], lines) = map(&mut s); + let g = id(&s.execute("board.mindMapAdd", &json!({"id": c0})).unwrap(), "id"); + let gg = id(&s.execute("board.mindMapAdd", &json!({"id": g})).unwrap(), "id"); + s.execute("board.reattach", &json!({"id": lines[0], "end": "from", "target": gg})).unwrap(); + let ring = places(&s, &[c0, g, gg]); + second_pass_is_a_no_op(&s); + assert_eq!(places(&s, &[c0, g, gg]), ring); +} + +#[test] +fn the_caps_refuse_what_is_too_far_and_cut_what_is_too_long() { + let mut s = board(); + assert!(s.execute("board.mindMap", &json!({"x": 2.0e9})).is_err()); + assert!(s.execute("board.mindMap", &json!({"y": -2.0e9})).is_err()); + let long = "x".repeat(600); + let out = s.execute("board.mindMap", &json!({"text": long, "children": [long]})).unwrap(); + assert_eq!(text_data(&s, id(&out, "id")).characters.chars().count(), 500); + assert_eq!(text_data(&s, id(&out["children"][0], "id")).characters.chars().count(), 500); +} diff --git a/crates/engine/src/board_tests.rs b/crates/engine/src/board_tests.rs index 9e99bd1c9..5ddd4e1be 100644 --- a/crates/engine/src/board_tests.rs +++ b/crates/engine/src/board_tests.rs @@ -206,6 +206,7 @@ fn routes_are_the_same_for_the_same_document() { to: End::Point { x: 300.0, y: 500.0 }, routing: Routing::Elbow, path: None, + branch: false, }; let doc = s.doc().unwrap(); let r = route(doc, &c).unwrap(); @@ -357,6 +358,7 @@ fn board_commands_survive_junk() { json!({"path": "M0 0 L 1e308 1e308", "points": [[0, 0], [1e308, 1]]}), json!({"end": "from", "target": {"x": 1e308, "y": -1e308}, "side": "inside", "style": "curved"}), json!({"id": 99_999, "end": 7, "target": [1], "style": "wavy"}), + json!({"id": 99_999, "relation": 7, "children": "x", "text": [1], "x": "NaN", "y": 1e308}), ]; let ids: Vec<&str> = crate::cmd::all_commands() .iter() diff --git a/crates/engine/src/board_tools_tests.rs b/crates/engine/src/board_tools_tests.rs index 6ed291e13..1e306a7d9 100644 --- a/crates/engine/src/board_tools_tests.rs +++ b/crates/engine/src/board_tools_tests.rs @@ -96,7 +96,8 @@ fn routes_take_named_sides_and_free_points() { let a = id(&s.execute("board.shape", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap(), "id"); let b = id(&s.execute("board.shape", &json!({"x": 300, "y": 300, "width": 100, "height": 100})).unwrap(), "id"); let doc = s.doc().unwrap(); - let elbow = |from, to| route(doc, &figcraft_doc::Connector { from, to, routing: figcraft_doc::Routing::Elbow, path: None }).unwrap(); + let elbow = + |from, to| route(doc, &figcraft_doc::Connector { from, to, routing: figcraft_doc::Routing::Elbow, path: None, branch: false }).unwrap(); let side = |n, side| End::Node { node: n, side, at: None }; let p = |x, y| End::Point { x, y }; let pt = Point::new; @@ -109,8 +110,16 @@ fn routes_take_named_sides_and_free_points() { assert_eq!(elbow(p(0.0, 0.0), p(100.0, 40.0)), vec![pt(0.0, 0.0), pt(50.0, 0.0), pt(50.0, 40.0), pt(100.0, 40.0)]); assert_eq!(elbow(p(0.0, 0.0), p(100.0, 0.0)), vec![pt(0.0, 0.0), pt(100.0, 0.0)]); // An automatic side faces the other end. - let straight = - route(doc, &figcraft_doc::Connector { from: side(a, Side::Auto), to: p(50.0, 500.0), routing: figcraft_doc::Routing::Straight, path: None }); + let straight = route( + doc, + &figcraft_doc::Connector { + from: side(a, Side::Auto), + to: p(50.0, 500.0), + routing: figcraft_doc::Routing::Straight, + path: None, + branch: false, + }, + ); assert_eq!(straight.unwrap(), vec![pt(50.0, 104.0), pt(50.0, 500.0)]); assert_eq!(Side::from_id("TOP"), Some(Side::Top)); assert_eq!(Side::from_id("inside"), None); diff --git a/crates/engine/src/boards/board.rs b/crates/engine/src/boards/board.rs index 1a66eed22..99f43faea 100644 --- a/crates/engine/src/boards/board.rs +++ b/crates/engine/src/boards/board.rs @@ -25,6 +25,7 @@ mod connectors; mod derived; mod edit; mod items; +mod mindmap; mod reshape; mod tools; @@ -70,6 +71,7 @@ pub(crate) use items::add_text; pub use items::{CONNECTED_GAP, connected_place}; use items::{add_connected, ink_cmd, next_sticky, shape_cmd, stamp_cmd, sticky_cmd}; pub use items::{edit_text, owner_of_text, sticky_font_size, text_of}; +pub(crate) use mindmap::settle_mind_maps; pub(crate) use reshape::path_handle_at; pub use reshape::selected_connector_handles; @@ -176,6 +178,20 @@ pub fn specs() -> Vec { true, reshape::reshape ), + spec!( + "board.mindMap", + "Mind map", + "{x?, y? (the first node's top-left in the parent; default the middle of the view), text? (default Topic), children? (their texts, at most 20; default Idea 1, Idea 2, Idea 3), parent?, edit? (start typing in the first node; default false)} → {id, text, children: [{id, text, connector}...]} a first node with children on its right, joined by branches; the map lays itself out", + true, + mindmap::mind_map_cmd + ), + spec!( + "board.mindMapAdd", + "Add mind map node", + "{id? (a mind map node; default the selected or edited one), relation?: child|sibling (default child), text?, edit? (start typing in it; default false)} → {id, text, connector} a child below the node's other children, or a sibling right after it; the map lays itself out again", + true, + mindmap::mind_map_add + ), spec!("board.label", "Connector label", "{id (a connector; default the selection), text (empty removes it)} → {id, label}", true, label_cmd), spec!( "board.stamp", diff --git a/crates/engine/src/boards/board/connectors.rs b/crates/engine/src/boards/board/connectors.rs index f12a7792a..408de045a 100644 --- a/crates/engine/src/boards/board/connectors.rs +++ b/crates/engine/src/boards/board/connectors.rs @@ -65,7 +65,7 @@ pub(super) fn connector_cmd(s: &mut Session, p: &Value) -> Result { let end = cap_of(cmd, p, "endCap")?.unwrap_or(CAPS.1); let page = s.page()?; let doc = s.doc_mut()?; - let id = make(doc, page, Connector { from, to, routing, path: None }, (start, end))?; + let id = make(doc, page, Connector { from, to, routing, path: None, branch: false }, (start, end))?; let mut out = json!({"id": id}); if let Some(text) = string(p, "label").filter(|t| !t.trim().is_empty()) { out["label"] = json!(set_label(doc, id, &text)?); diff --git a/crates/engine/src/boards/board/edit.rs b/crates/engine/src/boards/board/edit.rs index 97be2ba96..88a38d438 100644 --- a/crates/engine/src/boards/board/edit.rs +++ b/crates/engine/src/boards/board/edit.rs @@ -84,7 +84,7 @@ pub(super) fn set_color(s: &mut Session, p: &Value) -> Result { n.strokes = vec![Paint::solid(line_shade(color))]; } BoardItem::Connector(_) | BoardItem::Ink => doc.get_mut(id)?.strokes = vec![Paint::solid(line_shade(color))], - BoardItem::Label { .. } | BoardItem::Stamp { .. } | BoardItem::Table => continue, + BoardItem::Label { .. } | BoardItem::Stamp { .. } | BoardItem::Table | BoardItem::MindNode => continue, } changed.push(id); } @@ -132,7 +132,7 @@ impl Restyle { }; // Text sizes: shapes' and labels' text (stickies size theirs to fit). let sized = match (self.size, &item) { - (Some(size), BoardItem::Shape { .. } | BoardItem::Label { .. }) => resize_text(doc, id, size), + (Some(size), BoardItem::Shape { .. } | BoardItem::Label { .. } | BoardItem::MindNode) => resize_text(doc, id, size), _ => false, }; Ok(changed || sized) diff --git a/crates/engine/src/boards/board/items.rs b/crates/engine/src/boards/board/items.rs index b409eeb90..2a264c5b5 100644 --- a/crates/engine/src/boards/board/items.rs +++ b/crates/engine/src/boards/board/items.rs @@ -250,6 +250,7 @@ pub(super) fn add_connected(s: &mut Session, p: &Value) -> Result { to: End::Node { node: id, side: to_side, at: None }, routing, path: None, + branch: false, }; let line = make(doc, page, connector, CAPS)?; s.set_selection(vec![id]); diff --git a/crates/engine/src/boards/board/mindmap.rs b/crates/engine/src/boards/board/mindmap.rs new file mode 100644 index 000000000..5e2cff1ce --- /dev/null +++ b/crates/engine/src/boards/board/mindmap.rs @@ -0,0 +1,380 @@ +//! Mind maps (#2226): a node is a frame hugging one text ([`BoardItem::MindNode`]) and a branch is +//! a connector with `branch` set, from the parent to the child. The tree is read from the branches +//! and from nothing else; [`settle_mind_maps`] lays a touched map out again in the normalize pass, +//! so the commands only make nodes and branches. + +use std::collections::{BTreeMap, BTreeSet}; + +use figcraft_color::{Color, Paint}; +use figcraft_doc::{ + AutoLayout, BoardItem, Connector, Document, End, LetterSpacing, LineHeight, MIND_GAP_X, MIND_GAP_Y, MIND_MAX_DEPTH, MIND_MAX_NODES, MindBox, + NodeId, NodeKind, Routing, Side, Sizing, StrokeCap, TextAlignH, TextAutoResize, mind_layout, +}; +use figcraft_geom::{Affine, Point, Rect}; +use serde_json::{Value, json}; + +use super::connectors::make; +use super::items::{add, add_text, owner_of_text}; +use super::{INK, Result, Session, bad, boolean, get, id, is_board, num_or, parent_of, require, string, textedit}; +use crate::EngineError; + +/// The first node's text size and the other nodes'. +const MIND_ROOT_SIZE: f64 = 24.0; +const MIND_NODE_SIZE: f64 = 16.0; +/// The line height of every node's text, in percent, and the letter spacing of the first node's +/// and the others' (percent of the size). +const MIND_LINE_HEIGHT: f64 = 150.0; +const MIND_ROOT_TRACKING: f64 = -1.9; +const MIND_NODE_TRACKING: f64 = -1.1; +/// A node's least width: an emptied one stays clickable. +const MIND_MIN_W: f64 = 8.0; +/// What `board.mindMap` puts in the first node and its children when it isn't told. +const MIND_ROOT_TEXT: &str = "Topic"; +const MIND_STARTERS: [&str; 3] = ["Idea 1", "Idea 2", "Idea 3"]; +/// The most children `board.mindMap` makes, and the longest text it puts in a node. +const MIND_MAX_STARTERS: usize = 20; +const MIND_MAX_TEXT: usize = 500; +/// How far from the page's middle a first node may be put. +const MIND_MAX_COORD: f64 = 1.0e9; +/// Branches' look. +const BRANCH: Color = Color::from_rgb8_const(0x75, 0x75, 0x75); +const BRANCH_WEIGHT: f64 = 4.0; + +/// A node's frame and its text, `text` at `size`: the frame hugs the text with no padding, and the +/// text grows on one line. +fn make_node(doc: &mut Document, parent: NodeId, at: (f64, f64), text: &str, root: bool) -> Result<(NodeId, NodeId)> { + let size = if root { MIND_ROOT_SIZE } else { MIND_NODE_SIZE }; + let line = size * MIND_LINE_HEIGHT / 100.0; + let frame = add(doc, parent, NodeKind::Frame, "Mind map node", at, (MIND_MIN_W, line), |n| { + n.fills.clear(); + n.clip = false; + n.layout = Some(AutoLayout { padding: [0.0; 4], ..AutoLayout::default() }); + n.child_layout.sizing_h = Sizing::Hug; + n.child_layout.sizing_v = Sizing::Hug; + n.child_layout.min_w = Some(MIND_MIN_W); + n.child_layout.min_h = Some(line); + n.board = Some(BoardItem::MindNode); + })?; + let label = add_text(doc, frame, text, size, INK, TextAlignH::Left, 1.0)?; + if let Some(n) = doc.node_mut(label) { + n.child_layout.sizing_h = Sizing::Hug; + if let NodeKind::Text(td) = &mut n.kind { + td.auto_resize = TextAutoResize::WidthAndHeight; + td.style.line_height = LineHeight::Percent(MIND_LINE_HEIGHT); + td.style.letter_spacing = LetterSpacing::Percent(if root { MIND_ROOT_TRACKING } else { MIND_NODE_TRACKING }); + if root { + td.style.font_style = "Bold".into(); + } else { + td.style.font_style = "Medium".into(); + } + } + } + Ok((frame, label)) +} + +/// The branch from `parent` to `child` (on its left side when `left`), on `page`. +fn branch(doc: &mut Document, page: NodeId, parent: NodeId, child: NodeId, left: bool) -> Result { + let (out, back) = if left { (Side::Left, Side::Right) } else { (Side::Right, Side::Left) }; + let c = Connector { + from: End::Node { node: parent, side: out, at: None }, + to: End::Node { node: child, side: back, at: None }, + routing: Routing::Curved, + path: None, + branch: true, + }; + let line = make(doc, page, c, (StrokeCap::Round, StrokeCap::Round))?; + let n = doc.get_mut(line)?; + n.strokes = vec![Paint::solid(BRANCH)]; + n.stroke.weight = BRANCH_WEIGHT; + Ok(line) +} + +/// A branch of a map as the tree reads it. +#[derive(Clone, Copy)] +struct Branch { + line: NodeId, + parent: NodeId, + child: NodeId, + left: bool, +} + +/// The branches of `doc` that join two different layers of their own page, by id. (Others are +/// the normalize pass's to remove.) +fn branches(doc: &Document) -> Vec { + let mut v: Vec = doc + .nodes() + .filter_map(|n| match &n.board { + Some(BoardItem::Connector(Connector { from: End::Node { node: a, side, .. }, to: End::Node { node: b, .. }, branch: true, .. })) + if a != b && doc.contains(*a) && doc.contains(*b) && doc.page_of(*a) == doc.page_of(n.id) && doc.page_of(*b) == doc.page_of(n.id) => + { + Some(Branch { line: n.id, parent: *a, child: *b, left: *side == Side::Left }) + } + _ => None, + }) + .collect(); + v.sort_by_key(|b| b.line); + v +} + +/// The branch arriving at `node`: the one with the lowest connector id, when it has several. +fn arriving(bs: &[Branch], node: NodeId) -> Option { + bs.iter().find(|b| b.child == node).copied() +} + +/// The children of `node` on one side, in layout order (by their middles, then id). +fn map_children(doc: &Document, bs: &[Branch], node: NodeId, left: bool) -> Vec { + let mut v: Vec<(f64, NodeId)> = bs + .iter() + .filter(|b| b.parent == node && b.left == left && arriving(bs, b.child).is_some_and(|a| a.line == b.line)) + .filter_map(|b| doc.world_bounds(b.child).map(|r| (r.center().y, b.child))) + .collect(); + v.sort_by(|a, b| a.0.total_cmp(&b.0).then(a.1.cmp(&b.1))); + v.into_iter().map(|p| p.1).collect() +} + +/// Whether `node` is on the left of its map (a first node: no). +fn map_side(bs: &[Branch], node: NodeId) -> bool { + let (mut at, mut left) = (node, false); + for _ in 0..MIND_MAX_DEPTH { + let Some(b) = arriving(bs, at) else { break }; + (at, left) = (b.parent, b.left); + } + left +} + +/// The text `p` gives for `key`, a node's at most [`MIND_MAX_TEXT`] characters. +fn text_param(p: &Value, key: &str) -> String { + string(p, key).unwrap_or_default().chars().take(MIND_MAX_TEXT).collect() +} + +/// A coordinate from the params, finite and within [`MIND_MAX_COORD`] of the origin. +fn coord(cmd: &str, p: &Value, key: &str, default: f64) -> Result { + let v = num_or(p, key, default); + if v.is_finite() && v.abs() <= MIND_MAX_COORD { Ok(v) } else { Err(bad(cmd, format!("`{key}` is a position within a billion of the origin"))) } +} + +/// `children?` of `board.mindMap`: the starter texts. +fn starters(cmd: &str, p: &Value) -> Result> { + match get(p, "children") { + None => Ok(MIND_STARTERS.iter().map(|t| (*t).to_string()).collect()), + Some(Value::Array(a)) if a.len() <= MIND_MAX_STARTERS => { + a.iter().map(|v| v.as_str().map(|t| t.chars().take(MIND_MAX_TEXT).collect()).ok_or_else(|| bad(cmd, "`children` holds texts"))).collect() + } + _ => Err(bad(cmd, format!("`children` is a list of at most {MIND_MAX_STARTERS} texts"))), + } +} + +pub(super) fn mind_map_cmd(s: &mut Session, p: &Value) -> Result { + let cmd = "board.mindMap"; + require(s, cmd)?; + let parent = parent_of(cmd, s, p)?; + let (vx, vy) = { + let v = &s.ds()?.view; + (v.cx, v.cy) + }; + let (x, y) = (coord(cmd, p, "x", vx)?, coord(cmd, p, "y", vy)?); + let texts = starters(cmd, p)?; + let root_text = string(p, "text").map_or_else(|| MIND_ROOT_TEXT.to_string(), |_| text_param(p, "text")); + let page = s.page()?; + let doc = s.doc_mut()?; + let (root, label) = make_node(doc, parent, (x, y), &root_text, true)?; + let mut made = Vec::new(); + // Anywhere below one another will do: the normalize pass puts them right, in this order. + let line = MIND_NODE_SIZE * MIND_LINE_HEIGHT / 100.0 + MIND_GAP_Y; + for (i, t) in texts.iter().enumerate() { + let (k, text) = make_node(doc, parent, (x + MIND_MIN_W + MIND_GAP_X, y + i as f64 * line), t, false)?; + let b = branch(doc, page, root, k, false)?; + made.push(json!({"id": k, "text": text, "connector": b})); + } + s.set_selection(vec![root]); + if boolean(p, "edit") == Some(true) { + s.request_ui("board.editText", json!({"id": root})); + } + Ok(json!({"id": root, "text": label, "children": made})) +} + +pub(super) fn mind_map_add(s: &mut Session, p: &Value) -> Result { + let cmd = "board.mindMapAdd"; + require(s, cmd)?; + let editing = s.ds()?.text_edit.as_ref().map(|t| t.id); + let doc = s.doc()?; + let from = id(p, "id") + .or_else(|| editing.and_then(|t| owner_of_text(doc, t))) + .or_else(|| s.selection().first().copied().map(|i| owner_of_text(doc, i).unwrap_or(i))) + .ok_or_else(|| EngineError::Disabled(cmd.into(), "select a mind map node first".into()))?; + let n = doc.get(from)?; + if n.board != Some(BoardItem::MindNode) { + return Err(bad(cmd, "that isn't a mind map node")); + } + let sibling = match string(p, "relation").as_deref() { + None | Some("child") => false, + Some("sibling") => true, + Some(other) => return Err(bad(cmd, format!("`relation` is child or sibling, not `{other}`"))), + }; + let (page, container) = (s.page()?, n.parent.ok_or_else(|| bad(cmd, "that node has no parent"))?); + if doc.page_of(from) != Some(page) { + return Err(bad(cmd, "that node is on another page")); + } + let bs = branches(doc); + let at = doc.world_bounds(from).ok_or_else(|| bad(cmd, "that node has no place"))?; + let new_h = MIND_NODE_SIZE * MIND_LINE_HEIGHT / 100.0; + // The parent, the side, and where the new node's top-left goes on the page. + let (parent, left, top_left) = if sibling { + let a = arriving(&bs, from).ok_or_else(|| bad(cmd, "the first node has no siblings: add a child"))?; + // Its middle lands between this node and the next sibling, so the order puts it right after. + (a.parent, a.left, Point::new(at.x0, at.y1 + MIND_GAP_Y / 2.0 - new_h / 2.0)) + } else { + let left = map_side(&bs, from); + let last = map_children(doc, &bs, from, left).last().and_then(|l| doc.world_bounds(*l)); + let top = last.map_or(at.center().y - new_h / 2.0, |l| l.y1 + MIND_GAP_Y); + (from, left, Point::new(if left { at.x0 - MIND_GAP_X - MIND_MIN_W } else { at.x1 + MIND_GAP_X }, top)) + }; + let local = doc.world_transform(container).inverse() * top_left; + if !(local.x.is_finite() && local.y.is_finite()) { + return Err(bad(cmd, "the new node can't be placed there")); + } + let text = text_param(p, "text"); + if editing.is_some() { + textedit::end(s)?; + } + let doc = s.doc_mut()?; + let (node, label) = make_node(doc, container, (local.x, local.y), &text, false)?; + let line = branch(doc, page, parent, node, left)?; + s.set_selection(vec![node]); + if boolean(p, "edit") == Some(true) { + s.request_ui("board.editText", json!({"id": node})); + } + Ok(json!({"id": node, "text": label, "connector": line})) +} + +/// The tree of a document's branches: for each layer its arriving branch (the lowest connector +/// id), and each parent's children by it. +type Children = BTreeMap>; + +fn children_of(bs: &[Branch]) -> (BTreeSet, Children) { + let mut arrived = BTreeSet::new(); + let mut kids: Children = BTreeMap::new(); + for b in bs { + if arrived.insert(b.child) { + kids.entry(b.parent).or_default().push(*b); + } + } + (arrived, kids) +} + +/// Every branch that no longer joins two layers of its own page is removed, and the layers it +/// joined that are still there count as stirred (so do the old ends of a touched branch: one that +/// is gone, or that was moved to join something else). +fn prune_branches(doc: &mut Document, before: &Document, touched: &BTreeSet) -> BTreeSet { + let mut stirred = BTreeSet::new(); + let ends = |c: &Connector| [c.from.node(), c.to.node()].into_iter().flatten().collect::>(); + for id in touched { + if let Some(BoardItem::Connector(c)) = before.node(*id).and_then(|n| n.board.as_ref()) + && c.branch + { + stirred.extend(ends(c)); + } + } + let mut gone = Vec::new(); + for n in doc.nodes() { + let Some(BoardItem::Connector(c)) = &n.board else { continue }; + let page = doc.page_of(n.id); + let joins = |e: &End| matches!(e, End::Node { node, .. } if doc.contains(*node) && page.is_some() && doc.page_of(*node) == page); + if c.branch && !(joins(&c.from) && joins(&c.to) && c.from.node() != c.to.node()) { + gone.push((n.id, ends(c))); + } + } + for (line, joined) in gone { + stirred.extend(joined); + let _ = doc.remove(line); + } + stirred.retain(|i| doc.contains(*i)); + stirred +} + +/// The boxes of the map under `root`, breadth first (so a parent always comes before its +/// children), and the connectors that hold it together. `None`: a box is missing, or the map has +/// more than [`MIND_MAX_NODES`] nodes (it is left as it is). +fn map_boxes(doc: &Document, root: NodeId, kids: &Children) -> Option<(Vec, Vec)> { + let first = doc.world_bounds(root)?; + let mut boxes = vec![MindBox { id: root, rect: first, parent: None, left: false }]; + let (mut lines, mut seen) = (Vec::new(), BTreeSet::from([root])); + let (mut at, mut depths) = (0, vec![0_usize]); + while let Some(b) = boxes.get(at).copied() { + let depth = depths.get(at).copied().unwrap_or(MIND_MAX_DEPTH); + for k in kids.get(&b.id).filter(|_| depth < MIND_MAX_DEPTH).into_iter().flatten() { + if !seen.insert(k.child) { + continue; + } + if boxes.len() >= MIND_MAX_NODES { + return None; + } + boxes.push(MindBox { id: k.child, rect: doc.world_bounds(k.child)?, parent: Some(at), left: k.left }); + depths.push(depth + 1); + lines.push(k.line); + } + at += 1; + } + Some((boxes, lines)) +} + +/// Move layer `id` by `d` on the page. +fn shift(doc: &mut Document, id: NodeId, d: Point) { + let parent = doc.node(id).and_then(|n| n.parent).map_or(Affine::IDENTITY, |p| doc.world_transform(p)); + let inverse = parent.inverse(); + if !inverse.as_coeffs().iter().all(|v| v.is_finite()) { + return; + } + if let Some(n) = doc.node_mut(id) { + let moved = inverse * Affine::translate((d.x, d.y)) * parent * n.transform; + if moved.as_coeffs().iter().all(|v| v.is_finite()) { + n.transform = moved; + } + } +} + +/// After layout and before connectors follow: the maps an edit touched are laid out again from +/// their first nodes (a map that is already in place is not written to, so the pass is idempotent). +/// A branch that no longer joins two layers of its page is removed first: the only structural +/// write, and what makes a deleted node's children float free and a detached node stay detached. +pub(crate) fn settle_mind_maps(doc: &mut Document, before: &Document, touched: &BTreeSet) { + if !is_board(doc) || touched.is_empty() { + return; + } + // One look at every layer: a board without a branch (nearly all) goes no further. + if !doc.nodes().any(|n| matches!(&n.board, Some(BoardItem::Connector(c)) if c.branch)) { + return; + } + let stirred = prune_branches(doc, before, touched); + let bs = branches(doc); + if bs.is_empty() { + return; + } + let hit = |doc: &Document, id: NodeId| touched.contains(&id) || doc.ancestors(id).iter().any(|a| touched.contains(a)); + let (arrived, kids) = children_of(&bs); + let roots: Vec = kids.keys().copied().filter(|p| !arrived.contains(p)).collect(); + for root in roots { + let Some((boxes, lines)) = map_boxes(doc, root, &kids) else { continue }; + if boxes.iter().any(|b| !(b.rect.x0.is_finite() && b.rect.y0.is_finite() && b.rect.x1.is_finite() && b.rect.y1.is_finite())) { + continue; + } + // A map holding a layer and something inside it would move that layer with its own + // children: leave it as it is. + let ids: BTreeSet = boxes.iter().map(|b| b.id).collect(); + if boxes.iter().any(|b| doc.ancestors(b.id).iter().any(|a| ids.contains(a))) { + continue; + } + let stale = boxes.iter().any(|b| stirred.contains(&b.id) || hit(doc, b.id)) || lines.iter().any(|l| hit(doc, *l)); + if !stale { + continue; + } + let now: BTreeMap = boxes.iter().map(|b| (b.id, b.rect)).collect(); + for (id, to) in mind_layout(&boxes) { + let Some(was) = now.get(&id) else { continue }; + let d = to - was.origin(); + if d.x.is_finite() && d.y.is_finite() && d.hypot() > 1e-6 { + shift(doc, id, Point::new(d.x, d.y)); + } + } + } +} diff --git a/crates/engine/src/boards/board/reshape.rs b/crates/engine/src/boards/board/reshape.rs index 2f441c7ce..2295b94b6 100644 --- a/crates/engine/src/boards/board/reshape.rs +++ b/crates/engine/src/boards/board/reshape.rs @@ -26,7 +26,7 @@ fn moved(doc: &Document, c: &Connector, portion: usize, p: Point) -> Option = - sel.iter().filter_map(|i| doc.node(*i).and_then(|n| n.parent)).filter(|p| !doc.node(*p).is_some_and(Node::is_page)).collect(); - if !parents.is_empty() { - let mut uniq = Vec::new(); - for p in parents { - if !uniq.contains(&p) { - uniq.push(p); - } - } - self.set_selection(uniq); - } else { - self.set_selection(vec![]); - } + // Escape clears the selection whatever its nesting (measured in Figma: it never selects the + // parent). + self.set_selection(vec![]); Ok(()) } diff --git a/crates/engine/src/derived.rs b/crates/engine/src/derived.rs index 454b395bf..54356e2c9 100644 --- a/crates/engine/src/derived.rs +++ b/crates/engine/src/derived.rs @@ -164,7 +164,10 @@ pub fn normalize(doc: &mut Document, before: &Document) { } } touched.extend(doc.take_dirty()); - // 4b. Board connectors follow the layers they join; their labels sit at their middles. + // 4b. Mind maps re-flow from their first nodes; then board connectors follow the layers they + // join and their labels sit at their middles. + board::settle_mind_maps(doc, before, &touched); + touched.extend(doc.take_dirty()); board::settle_routes(doc, before, &touched); board::settle_stamps(doc, before, &touched); touched.extend(doc.take_dirty()); diff --git a/crates/engine/src/devfocus_tests.rs b/crates/engine/src/devfocus_tests.rs index 0801746de..b7a4f9341 100644 --- a/crates/engine/src/devfocus_tests.rs +++ b/crates/engine/src/devfocus_tests.rs @@ -84,14 +84,20 @@ fn only_the_focused_frame_is_hit_and_escape_leaves() { click(&mut s, 75.0, 75.0); assert_eq!(s.selection(), vec![in_a], "the layer on top of it isn't hit either"); assert_ne!(s.selection(), vec![over]); - // Escape: selection up to the frame, then out of the focus view. + // Escape: the selection goes, then out of the focus view. s.escape().unwrap(); - assert_eq!(s.selection(), vec![a]); + assert!(s.selection().is_empty(), "Escape selects nothing, not the parent frame"); assert_eq!(focused(&s), Some(a)); s.escape().unwrap(); - assert_eq!(focused(&s), None, "Escape with the frame selected leaves"); + assert_eq!(focused(&s), None, "Escape with nothing selected leaves"); click(&mut s, 350.0, 100.0); assert_eq!(s.selection(), vec![b], "everything is hit again"); + // With the focused frame itself selected, one Escape leaves the focus view. + ex(&mut s, "dev.focus", json!({"id": a})); + ex(&mut s, "select.set", json!({"ids": [a]})); + assert_eq!(focused(&s), Some(a)); + s.escape().unwrap(); + assert_eq!(focused(&s), None, "Escape with the focused frame selected leaves at once"); } #[test] diff --git a/crates/engine/src/import_export_tests.rs b/crates/engine/src/import_export_tests.rs index 4acc86216..fdc8b29d4 100644 --- a/crates/engine/src/import_export_tests.rs +++ b/crates/engine/src/import_export_tests.rs @@ -283,7 +283,7 @@ fn export_sizes_parse_and_label() { assert_eq!(ExportSize::parse(text), Some(want), "{text}"); assert_eq!(ExportSize::parse(&want.label()), Some(want)); } - for bad in ["", "x", "0x", "-1x", "NaNx", "infx", "65x", "20000w", "2q", "2xx"] { + for bad in ["", "x", "0x", "-1x", "NaNx", "infx", "65x", "20000w", "2q", "2xx", "+2x", "+512w", "2e0x", "2E0x", "+0.5x"] { assert_eq!(ExportSize::parse(bad), None, "{bad}"); } let e = |size, suffix: &str, format| ExportSetting { size, suffix: suffix.into(), format, ..Default::default() }; diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index 89de7f22f..3e213d04b 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -213,6 +213,8 @@ mod board_connector_tests; #[cfg(test)] mod board_grid_tests; #[cfg(test)] +mod board_mindmap_tests; +#[cfg(test)] mod board_reshape_tests; #[cfg(test)] mod board_table_paste_tests; diff --git a/crates/engine/src/selection_behaviour_tests.rs b/crates/engine/src/selection_behaviour_tests.rs index c58527286..6498b8cb5 100644 --- a/crates/engine/src/selection_behaviour_tests.rs +++ b/crates/engine/src/selection_behaviour_tests.rs @@ -271,14 +271,26 @@ fn keyboard_selection() { ex(&mut s, cmd, json!({})); assert_eq!(sorted(s.selection()), sorted(after), "{why}"); } - // Esc steps out to the parent, then deselects. + // Esc clears the selection at once, whatever the nesting (measured in Figma). ex(&mut s, "select.set", json!({"ids": [k.a]})); s.escape().unwrap(); - assert_eq!(s.selection(), vec![k.g], "Esc selects the parent"); + assert_eq!(s.selection(), Vec::::new(), "Esc from a nested layer selects nothing, not the parent"); s.escape().unwrap(); - assert_eq!(s.selection(), vec![k.f]); - s.escape().unwrap(); - assert_eq!(s.selection(), Vec::::new(), "Esc on a top-level layer deselects"); + assert_eq!(s.selection(), Vec::::new()); + // A top-level layer, and several layers, nested or not: one Esc selects nothing. + let cases: Vec<(Vec, &str)> = vec![ + (vec![k.f], "a top-level frame"), + (vec![k.r], "a top-level layer"), + (vec![k.a, k.b], "two layers in one group (not their group)"), + (vec![k.a, k.d], "layers in different parents (not the parents)"), + (vec![k.a, k.r], "a nested layer and a top-level one"), + ]; + for (ids, why) in cases { + ex(&mut s, "select.set", json!({"ids": ids})); + assert_eq!(sorted(s.selection()), sorted(ids.clone()), "{why}: selected"); + s.escape().unwrap(); + assert_eq!(s.selection(), Vec::::new(), "Esc on {why} selects nothing"); + } } #[test] diff --git a/crates/ui-egui/src/canvas/board_bar.rs b/crates/ui-egui/src/canvas/board_bar.rs index d85f14901..e75116b66 100644 --- a/crates/ui-egui/src/canvas/board_bar.rs +++ b/crates/ui-egui/src/canvas/board_bar.rs @@ -140,7 +140,7 @@ fn has(app: &FigApp) -> Option { }); line.ids.push(n.id); } - Some(BoardItem::Label { .. }) => h.text = true, + Some(BoardItem::Label { .. } | BoardItem::MindNode) => h.text = true, Some(BoardItem::Table) => h.table = true, Some(BoardItem::Stamp { .. }) | None => {} } diff --git a/crates/ui-egui/src/field_tests.rs b/crates/ui-egui/src/field_tests.rs index e3bdad1dd..718d681f6 100644 --- a/crates/ui-egui/src/field_tests.rs +++ b/crates/ui-egui/src/field_tests.rs @@ -737,6 +737,199 @@ fn scrubbing_the_scale_panel_width_scales_live_in_one_undo_step() { assert_eq!((w, h, undo_steps(&u)), (60.0, 45.0, steps + 1), "40×30 scaled to a width of 60"); } +/// A 100 x 100 rectangle at the origin, selected, in a Ui with the Move tool. +fn scale_setup() -> (Ui, NodeId) { + let mut s = Session::new(); + let r = id(s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap()); + s.execute("select.set", &json!({"ids": [r]})).unwrap(); + let mut u = Ui::new(s); + u.frame(vec![]); + u.frame(vec![]); + (u, r) +} + +fn scale_field_focused(u: &Ui) -> bool { + u.ctx.memory(|m| m.has_focus(Id::unique("scale_k").with("te"))) +} + +/// Measured in Figma's web app (2026-11-09): K opens the Scale section with its input focused. +#[test] +fn pressing_k_focuses_the_scale_field_with_its_text_selected() { + let (mut u, _) = scale_setup(); + assert!(!scale_field_focused(&u)); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Scale); + assert!(scale_field_focused(&u), "the scale field has the keyboard"); + let state = egui::TextEdit::load_state(&u.ctx, Id::unique("scale_k").with("te")).expect("the editor exists"); + let range = state.cursor.char_range().expect("a selection"); + let shown = u.ctx.data(|d| d.get_temp::(Id::unique("scale_k").with("editing"))).expect("the field is being edited"); + let (lo, hi) = (range.primary.index.min(range.secondary.index), range.primary.index.max(range.secondary.index)); + assert_eq!((lo, hi), (egui::text::CCursor::new(0).index, egui::text::CCursor::new(shown.chars().count()).index), "all of its text is selected"); +} + +/// K with nothing selected, then a selection: the field doesn't take the keyboard from the canvas. +#[test] +fn a_selection_after_k_does_not_move_the_keyboard_to_the_scale_field() { + let (mut u, r) = scale_setup(); + u.app.run("select.set", json!({"ids": []})); + u.frame(vec![]); + key(&mut u, Key::K, Modifiers::NONE); + for _ in 0..3 { + u.frame(vec![]); + } + u.app.run("select.set", json!({"ids": [r]})); + for _ in 0..3 { + u.frame(vec![]); + } + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Scale); + assert!(!scale_field_focused(&u), "the canvas keeps the keyboard"); +} + +/// Ctrl+Enter in the factor field is not the tool's exit. +#[test] +fn ctrl_enter_in_the_scale_field_keeps_the_scale_tool() { + let (mut u, _) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + key(&mut u, Key::Enter, Modifiers::CTRL); + u.frame(vec![]); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Scale); +} + +/// An Enter on the first frame the panel is back from another tab (the field not yet focused again) +/// doesn't end the tool on a stale "had the keyboard" flag. +#[test] +fn enter_on_the_first_frame_back_from_another_tab_keeps_the_scale_tool() { + let (mut u, _) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + assert!(scale_field_focused(&u)); + u.app.ui.right_tab = crate::state::RightTab::Prototype; + u.frame(vec![]); + u.frame(vec![]); + u.app.ui.right_tab = crate::state::RightTab::Design; + key(&mut u, Key::Enter, Modifiers::NONE); + u.frame(vec![]); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Scale); +} + +/// The Scale tool chosen again while the Design tab was away (Prototype tab, Move, then K): the +/// field takes the keyboard again when the Design tab comes back. +#[test] +fn the_scale_field_takes_the_keyboard_again_after_another_tab() { + let (mut u, _) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + assert!(scale_field_focused(&u)); + u.app.ui.right_tab = crate::state::RightTab::Prototype; + u.frame(vec![]); + u.app.run("tool.set", json!({"tool": "move"})); + u.frame(vec![]); + u.app.run("tool.set", json!({"tool": "scale"})); + u.frame(vec![]); + u.app.ui.right_tab = crate::state::RightTab::Design; + u.frame(vec![]); + u.frame(vec![]); + assert!(scale_field_focused(&u), "the field has the keyboard again"); +} + +/// A value typed and left unsettled when the panel went away is dropped: back again, the field +/// shows the fresh value with all of its text selected, so typing replaces it. +#[test] +fn the_scale_field_comes_back_fresh_with_its_text_selected() { + let (mut u, r) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + u.frame(vec![Event::Text("7".to_string())]); + u.app.ui.right_tab = crate::state::RightTab::Prototype; + u.frame(vec![]); + u.frame(vec![]); + u.app.ui.right_tab = crate::state::RightTab::Design; + u.frame(vec![]); + u.frame(vec![]); + assert!(scale_field_focused(&u)); + let shown = u.ctx.data(|d| d.get_temp::(Id::unique("scale_k").with("editing"))).expect("the field is being edited"); + assert_ne!(shown, "7", "the leftover edit is gone"); + let state = egui::TextEdit::load_state(&u.ctx, Id::unique("scale_k").with("te")).expect("the editor exists"); + let range = state.cursor.char_range().expect("a selection"); + let (lo, hi) = (range.primary.index.min(range.secondary.index), range.primary.index.max(range.secondary.index)); + assert_eq!((lo, hi), (egui::text::CCursor::new(0).index, egui::text::CCursor::new(shown.chars().count()).index)); + assert_eq!(geom(&u, r), (0.0, 0.0, 100.0, 100.0)); +} + +/// Tab moves the keyboard from the factor field to the next one; an Enter there leaves the +/// Scale tool on. +#[test] +fn enter_in_another_field_after_tab_keeps_the_scale_tool() { + let (mut u, _) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + assert!(scale_field_focused(&u)); + // Tab, then Enter on the very next frame (as a quick Tab, Enter or a click and Enter would). + let ev = |key, pressed| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE }; + u.frame(vec![ev(Key::Tab, true), ev(Key::Tab, false)]); + assert!(!scale_field_focused(&u), "Tab moved the keyboard on"); + for _ in 0..4 { + u.frame(vec![]); + assert!(!scale_field_focused(&u), "the field doesn't take the keyboard back"); + } + u.frame(vec![ev(Key::Enter, true), ev(Key::Enter, false)]); + u.frame(vec![]); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Scale); +} + +/// K, 2, Enter: 100 x 100 becomes 200 x 200 about the panel's origin, the tool is Move, one undo step. +#[test] +fn k_two_enter_scales_the_selection_by_two() { + let (mut u, r) = scale_setup(); + let steps = undo_steps(&u); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + u.frame(vec![Event::Text("2".to_string())]); + key(&mut u, Key::Enter, Modifiers::NONE); + u.frame(vec![]); + // About the panel's origin, FigCraft's top-left default (Figma's grid starts at the centre). + assert_eq!(geom(&u, r), (0.0, 0.0, 200.0, 200.0)); + assert!(!scale_field_focused(&u), "the field let go of the keyboard"); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Move); + assert_eq!(u.app.session.ds().unwrap().selection, vec![r]); + assert_eq!(undo_steps(&u), steps + 1); + u.app.run("edit.undo", json!({})); + assert_eq!(geom(&u, r), (0.0, 0.0, 100.0, 100.0)); +} + +/// "2x" and "1.5" are factors too. +#[test] +fn the_scale_field_takes_2x_and_1_5() { + for (text, size) in [("2x", 200.0), ("1.5", 150.0)] { + let (mut u, r) = scale_setup(); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + u.frame(vec![Event::Text(text.to_string())]); + key(&mut u, Key::Enter, Modifiers::NONE); + u.frame(vec![]); + assert_eq!(geom(&u, r), (0.0, 0.0, size, size), "{text}"); + } +} + +/// Escape in the scale field closes it and changes nothing. +#[test] +fn escape_in_the_scale_field_closes_it_and_changes_nothing() { + let (mut u, r) = scale_setup(); + let steps = undo_steps(&u); + key(&mut u, Key::K, Modifiers::NONE); + u.frame(vec![]); + u.frame(vec![Event::Text("3".to_string())]); + key(&mut u, Key::Escape, Modifiers::NONE); + u.frame(vec![]); + assert_eq!(geom(&u, r), (0.0, 0.0, 100.0, 100.0)); + assert!(!scale_field_focused(&u), "the field let go of the keyboard"); + assert_eq!(u.app.session.tool.tool, figcraft_engine::ToolId::Move); + assert_eq!(u.app.session.ds().unwrap().selection, vec![r]); + assert_eq!(undo_steps(&u), steps); +} + /// The texts painted in the last frame: what they say, whether they end in an ellipsis, and where /// they show (within their clip). fn painted_texts(shapes: &[egui::epaint::ClippedShape]) -> Vec<(String, bool, egui::Rect)> { diff --git a/crates/ui-egui/src/panels/right.rs b/crates/ui-egui/src/panels/right.rs index bba57c778..84572016f 100644 --- a/crates/ui-egui/src/panels/right.rs +++ b/crates/ui-egui/src/panels/right.rs @@ -264,6 +264,9 @@ fn design(app: &mut FigApp, ui: &mut Ui) { let sel = ds.selection.clone(); let vector_edit = ds.vector_edit.clone(); if sel.is_empty() { + if app.session.tool.tool == figcraft_engine::ToolId::Scale { + crate::scale_panel::note_no_selection(ui); + } page_section(app, ui, &doc); return; } diff --git a/crates/ui-egui/src/panels/scale_panel.rs b/crates/ui-egui/src/panels/scale_panel.rs index fd3a100e8..dea30ae05 100644 --- a/crates/ui-egui/src/panels/scale_panel.rs +++ b/crates/ui-egui/src/panels/scale_panel.rs @@ -15,8 +15,36 @@ use crate::widgets::{self, FieldEdit, Lead}; /// The Scale section, shown in place of Position while the Scale tool is active. pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) { - let Some(b) = doc.bounds_of(sel) else { return }; + let Some(b) = doc.bounds_of(sel) else { + note_no_selection(ui); + return; + }; widgets::section_header(ui, tr("Scale"), &[], false); + // The factor field takes the keyboard, with its text selected, whenever the section shows + // after a frame without it: the tool was chosen, or the panel came back from another tab or a + // hidden UI. + let k_id = Id::unique("scale_k"); + let shown_id = Id::unique("scale_shown_frame"); + let frame = ui.ctx().cumulative_frame_nr(); + let last = ui.data(|d| d.get_temp::(shown_id)); + ui.data_mut(|d| d.insert_temp(shown_id, frame)); + let reappeared = last.is_none_or(|l| l.saturating_add(1) < frame); + if reappeared { + widgets::request_edit(ui, k_id); + } + // Enter or Escape in the factor field ends the tool (back to Move, the selection kept). Whether + // the field had the keyboard is read as it was when the last frame's widgets were done: the + // shortcut layer may let go of it before this frame's panel runs, and a click or Tab that moved + // it to another field during the last frame counts. + let in_k_id = Id::unique("scale_in_k"); + // A flag left from before a gap (another tab, a hidden panel) is stale: the field didn't have + // the keyboard on the frame before this one. + let in_k = !reappeared && ui.data(|d| d.get_temp::(in_k_id)).unwrap_or(false); + // Plain Enter or Escape only: Ctrl+Enter and Alt+Enter are not the tool's exit. + let (enter, esc) = ui.input(|i| { + let plain = !(i.modifiers.ctrl || i.modifiers.alt || i.modifiers.command); + (plain && i.key_pressed(egui::Key::Enter), plain && i.key_pressed(egui::Key::Escape)) + }); let col = widgets::col_width(ui.available_width()); // Anchor: column and row (0 start, 1 middle, 2 end) of the point that stays put. let anchor = app.session.tool.scale_anchor; @@ -41,9 +69,7 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) { widgets::sublabels(ui, tr("Scale"), Some(tr("Anchor"))); crate::right::block(ui, 52.0, 2.0, |ui| { // Relative to the layers as they are: a scrub applies once, when let go. - if let Some(FieldEdit::Set(k) | FieldEdit::Scrub(k, true)) = - widgets::number_field(ui, Id::unique("scale_k"), Lead::None, Some(1.0), "x", col, 0.1) - { + if let Some(FieldEdit::Set(k) | FieldEdit::Scrub(k, true)) = widgets::number_field(ui, k_id, Lead::None, Some(1.0), "x", col, 0.1) { factor = Some(k); } ui.add_space(8.0); @@ -70,6 +96,22 @@ pub fn section(app: &mut FigApp, ui: &mut Ui, doc: &Document, sel: &[NodeId]) { } } } + let focused_now = ui.memory(|m| m.has_focus(k_id.with("te"))); + ui.data_mut(|d| d.insert_temp(in_k_id, focused_now)); + if in_k && (enter || esc) { + app.run("tool.set", json!({"tool": "move"})); + } +} + +/// The Scale tool is on but nothing is selected, so the section isn't shown: the frame still +/// counts as shown (a selection that appears later is not the tool being chosen, and the field must +/// not take the keyboard from the canvas), and the field is not the one with the keyboard. +pub fn note_no_selection(ui: &Ui) { + let frame = ui.ctx().cumulative_frame_nr(); + ui.data_mut(|d| { + d.insert_temp(Id::unique("scale_shown_frame"), frame); + d.insert_temp(Id::unique("scale_in_k"), false); + }); } /// The factor (clamped to 0.01–100) and pivot for scaling `b` by `k` around `anchor`; None when diff --git a/crates/ui-egui/src/proto_editor_tests.rs b/crates/ui-egui/src/proto_editor_tests.rs index b16894425..45fbe4d65 100644 --- a/crates/ui-egui/src/proto_editor_tests.rs +++ b/crates/ui-egui/src/proto_editor_tests.rs @@ -328,8 +328,8 @@ fn edit_delete_from_the_menu_removes_the_open_interaction_not_the_layer() { } #[test] -fn escape_closes_prototype_editor_without_deselecting_layer() { - let (s, a, _b, btn) = setup(); +fn escape_closes_prototype_editor_and_the_next_deselects() { + let (s, _a, _b, btn) = setup(); let mut u = Ui::new(s); u.app.ui.right_tab = crate::RightTab::Prototype; u.run("select.set", json!({"ids": [btn]})); @@ -344,13 +344,9 @@ fn escape_closes_prototype_editor_without_deselecting_layer() { assert_eq!(crate::proto_panel::editor(&u.ctx), None); assert_eq!(u.app.session.selection(), vec![btn], "layer remains selected"); - // Second Escape steps out to parent frame. + // Second Escape clears the selection, not stepping out to the parent frame. u.key(pos2(100.0, 100.0), egui::Key::Escape); - assert_eq!(u.app.session.selection(), vec![a], "steps out to parent frame"); - - // Third Escape deselects all. - u.key(pos2(100.0, 100.0), egui::Key::Escape); - assert!(u.app.session.selection().is_empty(), "selection cleared on third escape"); + assert!(u.app.session.selection().is_empty(), "the second Escape deselects"); } /// After a click in the Pages list, Delete that removes an interaction ends the list's hold on the diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs index eae46fd81..252ae65af 100644 --- a/crates/ui-egui/src/widgets.rs +++ b/crates/ui-egui/src/widgets.rs @@ -223,6 +223,16 @@ pub fn number_field(ui: &mut Ui, id: Id, lead: Lead, value: Option, suffix: number_field_mixed(ui, id, lead, value, suffix, width, step)?.settled() } +/// Ask number field `id` to open for typing on its next frame, its text selected (a tool that +/// opens with its field focused, such as Scale). An edit left over from when the field was last +/// shown (it went away with the keyboard on it) is dropped first, or the request would be ignored. +pub fn request_edit(ui: &Ui, id: Id) { + ui.data_mut(|d| { + d.remove::(id.with("editing")); + d.insert_temp(id.with("beginedit"), true); + }); +} + /// Whether the edit of number field `id` began with a Cmd/Ctrl-click. A padding field edited /// that way sets every side (Guide to auto layout, Keyboard shortcut guide). pub fn edit_began_with_command(ui: &Ui, id: Id) -> bool { @@ -400,7 +410,8 @@ fn number_field_impl( } // Typing on a field the keyboard reached (Tab) edits it: the editor takes the typed text. let typed_now = editing.is_none() && on_field && ui.input(|i| i.events.iter().any(|e| matches!(e, egui::Event::Text(_)))); - let started = editing.is_none() && ((field_resp.clicked() && !alt_now) || typed_now); + let requested = ui.data_mut(|d| d.remove_temp::(id.with("beginedit"))).unwrap_or(false); + let started = editing.is_none() && ((field_resp.clicked() && !alt_now) || typed_now || requested); // The text the field would commit to no effect: what it showed when the edit began, or the // value the arrows last stepped it to. let kept_id = id.with("kept"); diff --git a/docs/boards-parity.md b/docs/boards-parity.md index 16456492c..11d4aaf41 100644 --- a/docs/boards-parity.md +++ b/docs/boards-parity.md @@ -1,13 +1,13 @@ # Boards parity -> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-11-04 · **Change:** minor (a `.jam` elbowed connector saved with its path keeps it on import instead of being routed again (#1910); a "+" handle dragged carries the preview: the next shape is made where it is let go, or a connector joins the object it is let go on (#1919); a connector attached to a side starts 4 pt outside the border, so its stroke never lies on the fill (#1916); a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a connector end dropped along a side of a shape attaches to that side (#1708); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a connector's bar sets its start and end points, dashes, weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); "+" handles beside a selected sticky or shape make the next one, joined by a connector (#1597); a FigJam `.jam` file opens as a board (#1342); board grid settings: dots, lines, graph paper or none, spacing, size and contrast; the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); templates and tables; facilitation: a shared timer and voting sessions; the dot grid, dragging a connector's end to re-attach it, curved connectors, elbows that go around what they join) · **Target:** the incumbent's whiteboard product (behaviour from its public help centre) +> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-11-10 · **Change:** minor (mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); a `.jam` elbowed connector saved with its path keeps it on import instead of being routed again (#1910); a "+" handle dragged carries the preview: the next shape is made where it is let go, or a connector joins the object it is let go on (#1919); a connector attached to a side starts 4 pt outside the border, so its stroke never lies on the fill (#1916); a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a connector end dropped along a side of a shape attaches to that side (#1708); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a connector's bar sets its start and end points, dashes, weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); "+" handles beside a selected sticky or shape make the next one, joined by a connector (#1597); a FigJam `.jam` file opens as a board (#1342); board grid settings: dots, lines, graph paper or none, spacing, size and contrast; the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); templates and tables; facilitation: a shared timer and voting sessions; the dot grid, dragging a connector's end to re-attach it, curved connectors, elbows that go around what they join) · **Target:** the incumbent's whiteboard product (behaviour from its public help centre) **Breadth ~47%, ready ~29% (estimated, erring low).** A board is a FigCraft file of its own kind (`file.newBoard`) with a dot grid on the page, sticky notes, shapes with text, connectors that follow what they join (straight, elbow or curved, their ends dragged onto other objects), marker, highlighter and eraser, stamps, text and sections, five built-in templates and tables, edited together in the existing live sessions, with a shared countdown and voting sessions to run a -workshop. Music, board widgets, mind maps and the rest of the tail are missing. Remaining: +workshop. Music, board widgets, the mind maps' toolbar entry and gestures, and the rest of the tail are missing. Remaining: ~20–44 h. Tracked as area 22 of [`target-app-parity.md`](target-app-parity.md) (not in its weighted sum: the target there is the design product). The work item is gap 24 in [`gaps.md`](gaps.md). @@ -61,7 +61,7 @@ all end with the same geometry. | Board widgets | missing | design-file widgets exist (`crates/engine/src/extensions/widgets.rs`), not wired to boards | | Templates (retrospective, brainstorm, flow chart…) | partial | five built-in templates drawn up for FigCraft (retrospective, brainstorm, weekly planner, flow chart, kanban board), placed from the toolbar's templates picker (each with a picture of itself) or `board.template {name, x?, y?}` as ordinary sections, stickies, shapes, connectors and text in one undo step; `board.templates` lists them. No community templates, no saving your own | | Tables | partial | `board.table {rows, columns, cells?, x?, y?}` (at most 50 × 20): an auto layout frame of rows of cells with text, a tinted header row and lines between rows and columns; a cell's row grows with its text; a double-click types in the cell under the pointer; add or remove a row or column from the bar over the selection or `board.tableEdit {id, action, index?}`; cells copied from a spreadsheet (tab-separated text, quoted cells kept whole) paste as a table, up to 50 × 20 with a note when there was more; undoable and synced in live sessions. No column resizing by dragging, no cell colours, no Tab between cells; comma-separated text pastes as text | -| Mind maps | missing | | +| Mind maps | partial | from commands only so far (#2226): `board.mindMap {x?, y?, text?, children?}` places a first node (bold, no box) with three children on its right, joined by curved branches; `board.mindMapAdd {id?, relation?: child\|sibling}` adds a node. Nodes are text that grows wider as it is typed and taller with line breaks; a node's children stand in one column 88 units right of the widest node of its own column, 48 apart, centred on it, and the map lays itself out again in the normalize pass after every edit, undo and live-session change; moving the first node moves the map; a deleted node's children stay where they are without their branch. Branches are board connectors (`branch`: stroke 4, #757575, round caps), so their style, end points, weight and colour change like any connector's. No toolbar entry, shortcuts, "+" handles, dragging a node onto another, left side or `.jam` import yet | | Washi tape, code blocks, image cropping on boards | missing | images can be placed as in design files | | Audio and huddles | missing | | | AI features (summaries, sorting stickies, generating boards) | missing | | @@ -72,6 +72,7 @@ all end with the same geometry. | Date | Change | Summary | |---|---|---| +| 2026-11-10 | minor | M12, #2226 (step 1 of 4): mind maps in the document and engine. A mind map node is a board object of its own (`BoardItem::MindNode`: text with no box) and a branch is a connector marked `branch`; the map's shape is read from its branches. `board.mindMap` places a first node with three children and `board.mindMapAdd` adds a child or a sibling, each one undo step. The normalize pass lays a touched map out again from its first node (`board::settle_mind_maps`, `figcraft_doc::mind_layout`): 88 between columns, 48 between siblings, each stack centred on its parent, numbers from a FigJam file saved and decoded. Tests: `board_mindmap_tests` in doc (five) and engine (eight). Numbers unchanged (no toolbar entry yet). | | 2026-11-03 | minor | M12, #1919: as the quick create help says ("Click to select and create the next shape in that direction, or drag the preview to any location on your board"; "A new shape is created with a connector and its text field active"), a "+" beside the selected sticky or shape can be dragged: the preview follows the pointer and, let go on empty board, the next one is made there, centred on the pointer, and joined by a connector leaving by the handle's side and arriving by the side facing it (`board.addConnected` gains `at: [x, y]`, a point of the page placed in the parent's coordinates); let go on another sticky or shape, inside a section or frame too (`board::sticky_or_shape_at`), a connector joins the two instead (`board.connector`), that object outlined while the pointer is over it; let go off the canvas or over the toolbar, nothing, and the bar above the selection stays away meanwhile, as for any drag. The click is as before. A shape picker on drop and choosing the connector type are not done (the help doesn't describe them). Tests: `board_connect_tests` (the drag ones), engine `board_connected_tests::the_next_one_goes_where_it_is_dropped`. Numbers unchanged. | | 2026-11-04 | minor | M12, #1916: a connector end attached to a side starts 4 pt outside the border (`board_route::END_GAP`), as FigJam's do (the issue's screenshots: the line starts a few pixels outside, with a round cap), so the stroke never lies on the fill; elbows leaving one side share their first run along its normal, curves leave tangent to it and straight ones fan out from the same point; the `.jam` importer's routes, re-attached ends, path handles and labels follow the route's points; an end placed by hand with Cmd/Ctrl held keeps its exact point. Tests: `board_route_tests` (three). Numbers unchanged. | | 2026-11-04 | patch | M6, #1910: a `.jam` elbowed connector saved with its path (FigJam's `connectorControlPoints`) keeps it on import: the points become the `ConnectorPath::Runs` a connector reshaped by hand has and the line is walked along them, so a connector drawn around a layer stays around it; one whose points don't make a path from its ends' sides is routed as before. Still a vector, not a native board object. Details in [`file-format-parity.md`](file-format-parity.md). | diff --git a/docs/gaps.md b/docs/gaps.md index f42b97e4e..ee855922c 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Where FigCraft falls short of Figma -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-31 · **Change:** minor (gap 10: library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; gap 6: widgets draw lines and SVG pictures (plugin API 6); gap 7: text reads only the fallback fonts it draws with; a board connector's path can be reshaped by dragging its path handles (#1710); gap 10: library analytics count insertions and show insertions and detachments over time; gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; gap 14: a collection of this file extends, following its edits at once; colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; gap 6: plugin widgets have hover styles; gap 7: the browser draws a zoom's full render a band at a time; `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); Arabic draft catalog; gap 7: the browser refines a zoom's preview once the zoom has paused; gap 17: branches in live sessions, branch history entries, the list-merge rows brought up to date; gap 6: plugin widgets take text input and a property menu (plugin API 4); gap 24: board templates and tables; gap 24: a shared timer and voting sessions; gap 24: the board dot grid, connector ends dragged to re-attach, curved connectors; egui/eframe 0.37 verified for gap 18; known gaps from the #1311 review in gaps 4, 14, 15 and 16; gap 16: measurements kept on the canvas, a read-only layers panel in Dev Mode; gap 24: boards and their tail; Dev Mode tail: import lines in layer trees, compare with versions, an inspect-only canvas; gap 5: reviewed Turkish, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail; the 2026-10-17 landings: `.fig` import fidelity, budgets for large files, the import report, a `.fig` copy from Save as and paste from another design app (gap 1); menus, the Actions palette, editor fixes, Selection colors and smart-selection spacing (gap 4); catalog counts re-measured (gap 5); bounded canvas pan overscan) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-10 · **Change:** minor (gap 24: mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); gap 10: library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; gap 6: widgets draw lines and SVG pictures (plugin API 6); gap 7: text reads only the fallback fonts it draws with; a board connector's path can be reshaped by dragging its path handles (#1710); gap 10: library analytics count insertions and show insertions and detachments over time; gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; gap 14: a collection of this file extends, following its edits at once; colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; gap 6: plugin widgets have hover styles; gap 7: the browser draws a zoom's full render a band at a time; `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); Arabic draft catalog; gap 7: the browser refines a zoom's preview once the zoom has paused; gap 17: branches in live sessions, branch history entries, the list-merge rows brought up to date; gap 6: plugin widgets take text input and a property menu (plugin API 4); gap 24: board templates and tables; gap 24: a shared timer and voting sessions; gap 24: the board dot grid, connector ends dragged to re-attach, curved connectors; egui/eframe 0.37 verified for gap 18; known gaps from the #1311 review in gaps 4, 14, 15 and 16; gap 16: measurements kept on the canvas, a read-only layers panel in Dev Mode; gap 24: boards and their tail; Dev Mode tail: import lines in layer trees, compare with versions, an inspect-only canvas; gap 5: reviewed Turkish, Czech and Indonesian drafts, the Japanese draft completed; reviewed Russian catalog and integer plurals; `.fig` export: instance sizes, variables with modes, shared styles, variable-width strokes; sharing with a join code; text box sizes measured against documents re-saved by other software; live sessions per document; .fig export checked by opening written files in other software; experimental .fig export; keyboard shortcut parity suite and bindings; Simplified Chinese draft catalog; Latin American Spanish overlay; prototyping tail: gamepad triggers, widgets in prototypes, mode lookups; plugin directory on figcraft-server; Japanese and Korean draft catalogs and CJK UI fonts; plugin widgets and the plugin panel tail; French, German and Brazilian Portuguese draft catalogs; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and edit tail; dev resources links; extended collections tail; branch version history and finer list merges; comments and version history behaviour suite and fixes; canvas navigation, guides and grids behaviour suite and fixes; `.fig` import: editable vector networks, more layer kinds, variable prototype actions; `.fig` import, best effort: gap 1 down to its tail; Windows QA pass: everyday workflows on Windows 11, eight fixes incl. unsaved work kept after a crash or a forced quit; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; localization layer with a draft Spanish catalog; hosting figcraft-server: wss in the desktop app, server releases, deployment guide; plugin panels and settings; canvas fixes: boolean hit testing on the result, group drags, frame outlines and slices; code connect; stretch and scatter brushes, pen pressure; text on a path and pattern fills; team libraries on the server and swap library; branches: create, update from main, review and merge; animated GIF fills and TIFF images; Open recent, outlines for the selection and mask outlines: menu breadth 100%; extended collections, variables import/export, gradient stop and variant bindings: gap 14 down to its tail; the 2026-10-17 landings: `.fig` import fidelity, budgets for large files, the import report, a `.fig` copy from Save as and paste from another design app (gap 1); menus, the Actions palette, editor fixes, Selection colors and smart-selection spacing (gap 4); catalog counts re-measured (gap 5); bounded canvas pan overscan) · **Target:** Figma Design (desktop app 126.10.7) Every known shortfall against Figma, one entry each, ranked by how much it stops a Figma user from doing real work in FigCraft. Agents: pick work from the top unless the owner says otherwise. The @@ -582,7 +582,7 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe connector's ends drag onto another object or empty canvas (`board.reattach`); curved connectors; elbows that go around the objects they join. - **Missing:** timer music, board widgets, saving your own templates, table column resizing and - cell colours, mind maps, washi tape, code blocks, audio and huddles, quick-create handles, + cell colours, the mind maps' toolbar entry, shortcuts, drag to re-parent and import, washi tape, code blocks, audio and huddles, quick-create handles, the stamp wheel, emotes and stickers, `.jam` files ([`boards-parity.md`](boards-parity.md)). - **User impact:** boards cover a brainstorm, a retrospective, a flow sketch and a timed, voted @@ -593,6 +593,7 @@ No alpha blockers: the alpha gate in [`roadmap.md`](roadmap.md#alpha-gate) passe | Date | Change | Summary | |---|---|---| +| 2026-11-10 | minor | Gap 24: mind maps, first step (`board.mindMap`, `board.mindMapAdd`; the map lays itself out again after every edit, #2226); the toolbar entry, shortcuts, drag to re-parent and `.jam` import are what is missing of them. | | 2026-11-03 | minor | Traditional Chinese (Taiwan) (`zh-Hant`) draft catalog: 1,975 UI strings, 641 command labels and 31 menu wordings, clean-room from the English source; zh-TW, zh-HK, zh-MO and zh-Hant read it, explicit Hans stays Simplified; Noto Sans CJK TC then Taiwan system faces; no bundled font; native review pending. Numbers unchanged | | 2026-10-31 | minor | Gap 10: library analytics list the layers and files using each style and variable; their insertions, detachments and modes stay on the missing list. | | 2026-10-31 | minor | Gap 15: the Controller menu names buttons as PlayStation and Switch controllers do; that item leaves the missing list. Estimate unchanged. Test: `present::tail_tests`. | diff --git a/docs/mcp.md b/docs/mcp.md index 04b37e1f0..170b316b0 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -470,7 +470,8 @@ Returns `{fitted: [{id, fontSize, lines, fits, orphan}]}`. Use case: a carousel A board is a file of its own kind for thinking together: `file.newBoard {name?}` opens one (its page is light; `inspect_document` says `kind: "board"`). Board objects are ordinary layers with a -`board` entry `get_node` shows (`{type: sticky|shape|connector|label|stamp|ink, …}`), so the usual +`board` entry `get_node` shows (`{type: sticky|shape|connector|label|stamp|ink|mindNode, …}`; a connector may say +`branch: true`), so the usual commands move, resize, recolour, copy, delete and undo them. On a design file the board commands refuse; on a board `proto.*`, `dev.*`, `view.prototype` and `view.devMode` refuse. Each of these is one undo step and returns the ids it made: @@ -488,6 +489,21 @@ one undo step and returns the ids it made: one, 80 units away, joined to it by a connector the way the Connector tool makes one; one undo step. With `edit: true` the app goes on typing in it (the "+" beside a selected sticky or shape in the app does both). +- `board.mindMap {x?, y?, text?, children?, parent?, edit?}` → `{id, text, children: [{id, text, connector}]}`: + a mind map: a first node (`mindNode`, bold 24, no box; `text` defaults to `Topic`, `x`/`y` to the + middle of the view) with up to 20 `children` (texts; default `Idea 1`, `Idea 2`, `Idea 3`) + on its right, each joined to it by a curved branch (a connector with `branch: true`: stroke 4, + `#757575`, round caps). The map lays itself out: children stand in one column 88 units right of + the widest node of their parent's column, 48 apart, centred on their parent; a node is its text, + sized to it. One undo step. A map's shape is read from its branches alone: the parent of a node + is the layer a branch arrives from. After every edit (a command, typing, a gesture, undo, a live + session's change) a touched map is laid out again from its first node, so moving the first node + moves the map, a child moved by hand goes back (or swaps with the sibling whose middle it + passed), and a deleted node's children stay where they are, without their branch. +- `board.mindMapAdd {id?, relation?: child|sibling, text?, edit?}` → `{id, text, connector}`: a node + of the map that the given (or selected, or edited) one belongs to: a child below its other + children, or a sibling right after it (the first node has none); the map lays itself out again. + One undo step. With `edit: true` the app goes on typing in it. - `board.shape {shape, x, y, width?, height?, text?, color?, parent?}` → `{id, text}`: a shape with centred, wrapping text: `rectangle roundedRectangle ellipse diamond triangle triangleDown parallelogramRight parallelogramLeft trapezoid pentagon hexagon octagon star plus arrowLeft arrowRight chevron speechBubble database document predefinedProcess manualInput internalStorage`. - `board.connector {from, to, fromSide?, toSide?, fromAt?, toAt?, style?: straight|elbow|curved, startCap?, endCap?, label?}` diff --git a/docs/roadmap.md b/docs/roadmap.md index f2dd92966..0e12d327c 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # FigCraft roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-07 · **Change:** patch (the handoff mode reads Developer Mode in the interface, its ids and saved fields unchanged; a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; compact layer trees with fields and outline (M0.9, part of #996); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a panic in a grouped closure outside any command rolls the group back like a failed group: documents, selection, undo and redo, history limit and journal as before (#1085); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); stored variable and collection references keep their identity when another object is named like their id (follow-up to #1542); a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); M8: mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); M2: components can't contain their own instances, directly or through others; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); M0.9: optional batch continue-on-error with per-step outcomes (#1386); Alt pressed during a drag duplicates (#1385); variables in paint props (M3, #1000); finding layers without selecting them (M0.9, part of #996); the attached MCP server reads the app's replies with a 512 MiB bound (#1113); a failed batch keeps the undo steps it undid (#1410); Arabic draft catalog; Android Vector Drawable export; a selected unfilled shape drags over a filled layer below it (#1370); text truncation fills the last line, survives resizing, and auto height takes Max lines (#1375, #1376, #1377); M11 widget fields and property menus; M12 Boards: timer and voting; Installed weights of an embedded font family (#1246); `.sketch` import, best effort; Adobe Fonts found on macOS (#298); M12 Boards; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-10 · **Change:** minor (mind maps, first step: a first node with three children on curved branches, laid out again after every edit (`board.mindMap`, `board.mindMapAdd`, #2226); the handoff mode reads Developer Mode in the interface, its ids and saved fields unchanged; a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; compact layer trees with fields and outline (M0.9, part of #996); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a panic in a grouped closure outside any command rolls the group back like a failed group: documents, selection, undo and redo, history limit and journal as before (#1085); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); stored variable and collection references keep their identity when another object is named like their id (follow-up to #1542); a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); M8: mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); M2: components can't contain their own instances, directly or through others; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); M0.9: optional batch continue-on-error with per-step outcomes (#1386); Alt pressed during a drag duplicates (#1385); variables in paint props (M3, #1000); finding layers without selecting them (M0.9, part of #996); the attached MCP server reads the app's replies with a 512 MiB bound (#1113); a failed batch keeps the undo steps it undid (#1410); Arabic draft catalog; Android Vector Drawable export; a selected unfilled shape drags over a filled layer below it (#1370); text truncation fills the last line, survives resizing, and auto height takes Max lines (#1375, #1376, #1377); M11 widget fields and property menus; M12 Boards: timer and voting; Installed weights of an embedded font family (#1246); `.sketch` import, best effort; Adobe Fonts found on macOS (#298); M12 Boards; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) Forward-looking plan. Where FigCraft stands today: [`ROADMAP.md`](../ROADMAP.md) and [`target-app-parity.md`](target-app-parity.md); the full ranked list: [`gaps.md`](gaps.md). Hours @@ -76,6 +76,7 @@ blockers. | Date | Change | Summary | |---|---|---| +| 2026-11-10 | minor | M12, #2226 (step 1 of 4): mind maps in the document and engine. `board.mindMap` places a first node with three children on curved branches and `board.mindMapAdd` adds a child or a sibling; the normalize pass lays a touched map out again from its first node (88 between columns, 48 between siblings, stacks centred on their parents). No toolbar entry yet; numbers unchanged. | | 2026-11-03 | minor | Traditional Chinese (Taiwan) (`zh-Hant`) draft catalog: 1,975 UI strings, 641 command labels and 31 menu wordings, clean-room from the English source; zh-TW, zh-HK, zh-MO and zh-Hant read it, explicit Hans stays Simplified; Noto Sans CJK TC then Taiwan system faces; no bundled font; native review pending. Numbers unchanged | | 2026-11-03 | patch | M4, #1747: a text layer still carrying the name its characters gave it is renamed as they are typed, so the Layers panel no longer shows the word a layer started with while the canvas shows another (`hello` typed into `hello there` read as `hello` in the panel). A name the author typed is kept, and only the editor follows the characters: commands leave the name alone, so the layer names `data.fill`, component property bindings and templates use as field keys stay put. Tests: `text_behaviour_tests::typing_renames_a_text_layer_that_still_carries_the_name_its_characters_gave_it`, `setting_characters_as_a_command_never_renames_the_layer`. Grade unchanged | | 2026-10-31 | minor | M12: as the help describes, holding Cmd/Ctrl while moving a connector's end places it on any part of an object instead of snapping to a side. It keeps that spot as a fraction of the object's box, so it follows the object when it moves or resizes, and without the key an end snaps as before. `board.connector {fromAt, toAt}` and `board.reattach {at}` take it; saved only when set. Numbers unchanged | diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 91569133e..0b68115fa 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI and interaction parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-10 · **Change:** minor (copy, cut and paste in vector edit mode act on the selected points and segments (#1875); the main menu and its submenus stay inside the window, moving up to fit and scrolling when taller (#2217); locked layers ignore the arrow keys and a locked parent's children can't be locked on their own (#1560); the left rail's and tab strip's icons are larger, 20 pt (#553); pick select: Tab while the keyboard selection box shows (or the chord again) puts a pink outline on a layer and the keys walk the layer tree from it, as Accessibility at Figma says (#1836); scrubbing a field faster or slower by the pointer's height, with a notice of the speed, as the help center's Scrub fields says (#1837); component rows in the Layers panel at AA contrast in the theme's component tint, with the rows inside a selected component in a tone of its row (#1903); Cmd/Ctrl-click on a padding field sets all four sides with the value typed, a documented auto layout shortcut; a fill per region of a vector: with regions selected in edit mode, the Fill section and the fill commands edit those regions' own fills, as Edit vector layers says (#1875); the Fill section of a text whose characters were coloured differently while editing shows mixed content, characters that all share fills the layer doesn't have show those, and a layer-level fill edit reaches every character (#1856); a number field scrubs when dragged with Alt held, as the help center's scrub section says, not only by its label; reuse visible layer selection roots (M8); ; with a shape or frame tool chosen and nothing selected, the arrows show a placement crosshair in the middle of the view and move it, and Enter places there, as Accessibility at Figma says (#1839); text direction per paragraph: Text ▸ Text direction forces a paragraph left to right or right to left, as Add right-to-left text says (#1830), with `text.direction`, `node.set textDirection`, the Type settings control once a right-to-left script is in the text, inspect, the CSS `direction` and the `.fig` lines' `sourceDirectionality`; the boolean operation menu in the Design panel leads each entry with an original icon drawn in code, a filled preview of the result (#2003); a press on the open gradient's handles or stops on the canvas keeps the colour picker open through the drag, as its own control (#1852); a click with the Bend tool on a sharp point curves it, its handles along the line between its neighbours, as Edit vector layers says (#1875); wrap style: Auto, Balance and Pretty on a text layer decide where its lines break, as Explore text properties says (#1827), with the Type settings control, `text.wrapStyle`, `node.set wrapStyle`, inspect and the CSS `text-wrap`; Backspace or Delete at the start of a list item keeps the item's indentation level, as the lists article says; max lines on auto-width text keep it auto width, hugging that many lines, as the text properties article says; superscript and subscript are synthesised where the font has no glyphs for them, from the standard glyphs shrunk and shifted by the font's OS/2 metrics, and a run mixing available and unavailable glyphs is synthesised whole, as Explore text properties says (#1828); Alt+Enter while editing text opens the link at the caret, as the accessibility page documents; Minimize, by its shortcut or the button by the file name, collapses the navigation bar and both sidebars as the help center says, with the right sidebar back while something is selected (#1835); the interface size keys of the help center's accessibility page: Cmd/Ctrl+Shift+Alt with =, - and 0 step the interface through the Preferences sizes and back to the system's size; Cmd/Ctrl+Alt+arrows rotate the selection a degree at a time, 15 with Shift, as the help center's accessibility page says; they resized before; the Layers panel answers Ctrl+1 as well as Alt+1 on Windows and Linux, the two keys the help center gives it; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the keyboard's Menu key opens the context menu, as Shift+F10 does; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; sidebar number and text fields keep their text vertically centered when focused, including typography spacing; with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; Corner smoothing: an original icon and the shared number-field drag gesture, preserving fractional baselines; guides snap to layers when dragged; Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); the Design panel's sections on one grid — 16 / 8 margins, 88 + 8 + 88 + 8 + 24 columns, 24 pt rows, 4 pt between a row's buttons (#858); the toolbar on one 32 pt grid, without its Resources button (#1210); colour picker LCH and OKLCH models; an XML (Android Vector Drawable) export format; Context menus: the Menu key reaches egui 0.37 but is unbound (row done → partial); the Text on a path tool; board tool keys pinned; community fixes: the text box by dragging, the font picker keys, the pen path on leaving Design, a still canvas in vector edit mode, a scrolling pages list, colour emoji, readable new text in frames, system theme on first run; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths; fields select their text on focus; Typography spacing icons support scrubbing (#373); CSS colour names in hex fields; a rename selects the whole name, so typing replaces it; Escape or Enter after a pen path stays on the same vector (#760); IME composition kept on through idle frames of a text edit, candidates at the caret (#747); Selection colors for mixed selections and smart-selection spacing (#753); submenus with a hover delay and a safe triangle; the Actions palette's tabs, ranked search, highlight and recents; menu items that ask for a value; editor fixes from the community batches) · **Target:** Figma Design UI3 (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-10 · **Change:** minor (copy, cut and paste in vector edit mode act on the selected points and segments (#1875); M8, #2146: K focuses the Scale tool's factor field with its text selected, so K, 2, Enter scales the selection by two about the panel's origin (FigCraft's starts at the top left; Figma's grid starts at the centre, left for a follow-up because the origin also sets where a handle drag pivots, which is not measured) in one undo step, after which the tool returns to Move with the selection kept; Escape in the field closes it with the tool back on Move and nothing changed (measured in Figma's web app, 2026-11-09; `pressing_k_focuses_the_scale_field_with_its_text_selected`, `k_two_enter_scales_the_selection_by_two`, `escape_in_the_scale_field_closes_it_and_changes_nothing`); the main menu and its submenus stay inside the window, moving up to fit and scrolling when taller (#2217); locked layers ignore the arrow keys and a locked parent's children can't be locked on their own (#1560); the left rail's and tab strip's icons are larger, 20 pt (#553); pick select: Tab while the keyboard selection box shows (or the chord again) puts a pink outline on a layer and the keys walk the layer tree from it, as Accessibility at Figma says (#1836); scrubbing a field faster or slower by the pointer's height, with a notice of the speed, as the help center's Scrub fields says (#1837); component rows in the Layers panel at AA contrast in the theme's component tint, with the rows inside a selected component in a tone of its row (#1903); Cmd/Ctrl-click on a padding field sets all four sides with the value typed, a documented auto layout shortcut; a fill per region of a vector: with regions selected in edit mode, the Fill section and the fill commands edit those regions' own fills, as Edit vector layers says (#1875); the Fill section of a text whose characters were coloured differently while editing shows mixed content, characters that all share fills the layer doesn't have show those, and a layer-level fill edit reaches every character (#1856); a number field scrubs when dragged with Alt held, as the help center's scrub section says, not only by its label; reuse visible layer selection roots (M8); ; with a shape or frame tool chosen and nothing selected, the arrows show a placement crosshair in the middle of the view and move it, and Enter places there, as Accessibility at Figma says (#1839); text direction per paragraph: Text ▸ Text direction forces a paragraph left to right or right to left, as Add right-to-left text says (#1830), with `text.direction`, `node.set textDirection`, the Type settings control once a right-to-left script is in the text, inspect, the CSS `direction` and the `.fig` lines' `sourceDirectionality`; the boolean operation menu in the Design panel leads each entry with an original icon drawn in code, a filled preview of the result (#2003); a press on the open gradient's handles or stops on the canvas keeps the colour picker open through the drag, as its own control (#1852); a click with the Bend tool on a sharp point curves it, its handles along the line between its neighbours, as Edit vector layers says (#1875); wrap style: Auto, Balance and Pretty on a text layer decide where its lines break, as Explore text properties says (#1827), with the Type settings control, `text.wrapStyle`, `node.set wrapStyle`, inspect and the CSS `text-wrap`; Backspace or Delete at the start of a list item keeps the item's indentation level, as the lists article says; max lines on auto-width text keep it auto width, hugging that many lines, as the text properties article says; superscript and subscript are synthesised where the font has no glyphs for them, from the standard glyphs shrunk and shifted by the font's OS/2 metrics, and a run mixing available and unavailable glyphs is synthesised whole, as Explore text properties says (#1828); Alt+Enter while editing text opens the link at the caret, as the accessibility page documents; Minimize, by its shortcut or the button by the file name, collapses the navigation bar and both sidebars as the help center says, with the right sidebar back while something is selected (#1835); the interface size keys of the help center's accessibility page: Cmd/Ctrl+Shift+Alt with =, - and 0 step the interface through the Preferences sizes and back to the system's size; Cmd/Ctrl+Alt+arrows rotate the selection a degree at a time, 15 with Shift, as the help center's accessibility page says; they resized before; the Layers panel answers Ctrl+1 as well as Alt+1 on Windows and Linux, the two keys the help center gives it; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the keyboard's Menu key opens the context menu, as Shift+F10 does; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; sidebar number and text fields keep their text vertically centered when focused, including typography spacing; with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); colour picker review fixes for text undo, fitted sidebars, moving controls and gradient variables; Corner smoothing: an original icon and the shared number-field drag gesture, preserving fractional baselines; guides snap to layers when dragged; Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); the Design panel's sections on one grid — 16 / 8 margins, 88 + 8 + 88 + 8 + 24 columns, 24 pt rows, 4 pt between a row's buttons (#858); the toolbar on one 32 pt grid, without its Resources button (#1210); colour picker LCH and OKLCH models; an XML (Android Vector Drawable) export format; Context menus: the Menu key reaches egui 0.37 but is unbound (row done → partial); the Text on a path tool; board tool keys pinned; community fixes: the text box by dragging, the font picker keys, the pen path on leaving Design, a still canvas in vector edit mode, a scrolling pages list, colour emoji, readable new text in frames, system theme on first run; the Small caps sample in Type settings drawn from capitals; recent files as cards; vector edit mode: hovering, hatching, selecting and dragging filled regions; home screen: Templates tab, first-run templates and Getting started tips; number fields: scrub rates, arrow steps, arithmetic with brackets, relative edits of mixed values; outline mode's hidden layers and object bounds; Hide when publishing; cursors per tool and modifier; panel widths; dark pages for files made in the dark theme; drag threshold and double-clicks into text in groups; rotation origin on Alt+R and placing with Enter: no documented shortcut missing; keyboard shortcut parity suite and bindings; cursor chat and spotlight in live sessions; layers and assets panels behaviour suite and fixes; vector multi-edit and the vector edit tail; canvas navigation, guides and grids behaviour suite and fixes; shapes and vector behaviour suite and fixes; paint and effects behaviour suite and fixes; frames, groups, sections and masks behaviour suite and fixes; layers panel keyboard: F2 rename, Shift+F10 context menu, F8 box selection; selection and transform behaviour suite and fixes; Display P3: gamut warning and soft-proof (true P3 blocked upstream); several windows; boolean hit testing on the result, group drags, frame outlines and slices; outlines for the selection, mask outlines; arc fields, live boolean editing, shape builder on strokes, one-sided widths; fields select their text on focus; Typography spacing icons support scrubbing (#373); CSS colour names in hex fields; a rename selects the whole name, so typing replaces it; Escape or Enter after a pen path stays on the same vector (#760); IME composition kept on through idle frames of a text edit, candidates at the caret (#747); Selection colors for mixed selections and smart-selection spacing (#753); submenus with a hover delay and a safe triangle; the Actions palette's tabs, ranked search, highlight and recents; menu items that ask for a value; editor fixes from the community batches) · **Target:** Figma Design UI3 (desktop app 126.10.7) Fine canvas control is what Figma users feel first: handles, snapping, nudging, modifier keys, drag behaviour, numeric precision. This checklist covers the tools, gestures and panels. Status: @@ -59,6 +59,7 @@ interaction feel not yet compared. | Click, Shift-click, marquee, Shift-marquee toggle | done | Shift-drag on a selected layer moves the selection, kept to one axis (#498); a marquee selects what it touches; from a top-level frame's background, the layers inside it; locked and hidden layers are skipped (`selection_behaviour_tests`) (a locked layer selected from the panel ignores the arrow keys and the nudge commands; its properties still edit; measured in Figma's web app, 2026-11-10) | | Deep select (Cmd/Ctrl-click, Cmd/Ctrl-marquee) | done | | | Select layer menu (every layer under the click) | done | | +| Escape with layers selected | done | clears the selection at once, whatever the nesting; it never selects the parent. Measured in the Figma web app (2026-11-08) with a rectangle in a group in a frame, selected from the canvas (a double-click into the group), from the Layers panel, and after Tab moved the selection to its sibling: one Escape selects nothing, a second leaves nothing selected. Escape still leaves text and vector editing, ends gestures and the pen first, and ends the focus view once nothing or the focused frame is selected (`selection_behaviour_tests`, `devfocus_tests`) | | Enter / Shift+Enter (children / parent), Tab / Shift+Tab (siblings) | done | Tab renames the next layer while renaming | | Resize handles: Shift keeps proportions, Alt from centre, constraints-aware | done | Alt shrinks too; past an edge flips (several layers mirror); groups and mixed rotations scale each layer along its own axes, keeping rotation and flip (no skew: children turned off a right angle are approximate); Cmd/Ctrl ignores a frame's constraints (`transform_behaviour_tests`) | | Rotate just outside a corner; Shift in 15° steps | done | rotated handle box when layers share a rotation | @@ -67,7 +68,7 @@ interaction feel not yet compared. | Enter with a shape or frame tool chosen | done | places what a click makes (100×100, lines 100 long, sections 400×300) in the middle of the view, selected (`tool.place`); from the toolbar, Enter on the chosen tool. With nothing selected, the arrows first show a crosshair in the middle of the view and then move it by the nudge amounts (`tool.crosshair`; Shift the large one), and Enter places there; Escape or a tool change takes it away ("Use the arrow keys to activate the crosshair cursor. It will appear in the middle of the viewport indicating where the new object will be placed", Accessibility at Figma; #1839) | | Alt-drag duplicate | done | the copy snaps to the layer it came from too (edges, centres, equal spacing); Duplicate (Cmd+D) then repeats the copy's offset, also after a Duplicate whose copy was moved, as long as the copies stay selected (the documentation doesn't say; pinned from community answers) | | Drag threshold; double-click into groups and text | done | a press moves or resizes only once the pointer has travelled 3 px on screen, so a click or double-click made with an unsteady hand drags nothing; a double-click goes one level into a group and the next one edits the text under it, wherever on the text it lands, with all of it selected (a double-click in the text being edited selects the word) (`double_click_tests`); Enter on a selected text does the same (all of it selected, typing replaces it) and Escape leaves editing with the layer still selected (`text_enter_tests`) | -| Scale tool (K): handles about an anchor, live factor, panel | done | | +| Scale tool (K): handles about an anchor, live factor, panel | done | Pressing K opens the Scale section with its factor field focused and its text selected; typing 2 (or 2x, 1.5) then Enter scales the selection by it about the panel's origin (FigCraft's starts at the top left; Figma's grid starts at the centre, left for a follow-up because the origin also sets where a handle drag pivots, which is not measured), as one undo step, then closes the section and returns to Move with the selection kept; Escape in the field closes it, back to Move, nothing changed. Measured in Figma's web app, 2026-11-09. Tests: `pressing_k_focuses_the_scale_field_with_its_text_selected`, `k_two_enter_scales_the_selection_by_two`, `escape_in_the_scale_field_closes_it_and_changes_nothing`. | | Nudge 1 / Shift 10 (preference), Cmd+arrows resize | done | arrows reorder auto layout children | | Smart guides: edges, centres, equal spacing (between two layers or continuing a row's gap, labelled), spacing labels, parent, layout grid, ruler guides | done | red, `snap.rs`; a guide dragged out of a ruler or moved snaps to layer edges and centres too (Snap to Objects; Cmd/Ctrl suspends), on its own axis only; page guides see the page's top-level layers, frame guides the frame's box, layout grids and every layer in it, along a rotated frame's own axes; thresholds not yet compared with Figma's (`guide_snap_tests`) | | Ctrl to suspend snapping while dragging (macOS) | done | Control on macOS (Cmd keeps working), Ctrl elsewhere; moving, resizing and drawing | @@ -188,6 +189,7 @@ in the table. `crates/ui-egui/src/shortcut_keys_tests.rs` drives the keys a look | Date | Change | Summary | |---|---|---| | 2026-11-08 | minor | Vector edit mode, #1875, measured in Figma (web, real keys): Copy with segments selected takes only those (with just a point selected, the segments touching it) and a paste outside edit mode is a new vector layer in place; Cut removes them, the path splitting into subpaths in the same layer with edit mode staying on, and a paste outside gives a new layer with the cut segments; Paste while editing a vector adds the clipboard's segments, or a copied layer's outline, to the same network in place, selecting the pasted points, with no new layer and the bounds growing. FigCraft copied the whole layer, Cut left nothing to paste and Paste did nothing. `edit.copy`, `edit.cut` and `edit.paste` act so with no `ids`/`parent` given (Ctrl+X is the real Cut again; Shift+Delete still heals); the copy carries the layer's look (fills, strokes, effects, opacity, blend; the width profile only when every segment is copied); layers with no outline are skipped. Tests: `vector_clipboard_tests` | +| 2026-11-08 | patch | Selection: Escape with layers selected clears the selection instead of stepping out to the parent first. Measured in the Figma web app with a rectangle in a group in a frame, selected from the canvas, from the Layers panel and after Tab: one Escape selects nothing. Editing, gestures and the pen still end first | | 2026-11-10 | patch | M5, #1560: locked layers follow Figma's rules (Lock and unlock layers; measured in Figma's web app): a locked layer selected in the Layers panel ignores the arrow keys and the nudge commands while its properties still edit, and a child of a locked layer keeps its padlock inert (the Layers panel padlock, Lock/Unlock and `object.toggleLock` without a value no longer lock the child on its own) | | 2026-11-10 | patch | #2217: the main menu's submenus (Object, say) ran past the window's bottom, behind the taskbar, with the lowest commands out of reach, because submenus were not constrained to the window (to keep them beside their row). Every menu panel now scrolls when taller than the window less 8 pt margins, and a submenu is held within the window's height (moved up, never above the top) while keeping its place beside its row, so menu-aim is unchanged. Tests: `menu_overflow_tests.rs`. Numbers unchanged. | | 2026-11-02 | patch | Shortcuts: a Cmd/Ctrl-click on a padding field (the horizontal or vertical pair, or a side with Individual padding open) makes the value typed go to all four sides, in one undo step (Guide to auto layout, Keyboard shortcut guide); a plain click still edits that axis or side alone. A documented gesture row: 134 documented, 133 bound. Test: `padding_individual_tests` | @@ -274,4 +276,5 @@ in the table. `crates/ui-egui/src/shortcut_keys_tests.rs` drives the keys a look | 2026-10-11 | minor | Canvas fixes: boolean groups clicked where their result is, a layer dragged inside a group stays in it, View ▸ Frame outlines and View ▸ Slices draw | | 2026-10-11 | minor | Outline mode done: outlines for the selection (the selected layers draw as outlines, the rest normally) and mask outlines | | 2026-10-11 | minor | Design panel arc fields, live boolean editing (operands on the canvas, live results, per-operand operations), shape builder on strokes and open paths, one-sided widths (Alt-drag a width handle) | +| 2026-11-09 | patch | M8, #2146: K focuses the Scale tool's factor field with its text selected, so K, 2, Enter scales the selection by two about the panel's origin (FigCraft's starts at the top left; Figma's grid starts at the centre, left for a follow-up because the origin also sets where a handle drag pivots, which is not measured) in one undo step, after which the tool returns to Move with the selection kept; Escape in the field closes it with the tool back on Move and nothing changed (measured in Figma's web app, 2026-11-09; `pressing_k_focuses_the_scale_field_with_its_text_selected`, `k_two_enter_scales_the_selection_by_two`, `escape_in_the_scale_field_closes_it_and_changes_nothing`) | | 2026-10-10 | major | Created from the ROADMAP's look-and-feel and interaction items, the keymap and the canvas code |