diff --git a/crates/engine/src/dev/codegen/css.rs b/crates/engine/src/dev/codegen/css.rs index c772367fd..d521674e9 100644 --- a/crates/engine/src/dev/codegen/css.rs +++ b/crates/engine/src/dev/codegen/css.rs @@ -311,7 +311,13 @@ fn text_decls(doc: &Document, n: &Node, tx: &figcraft_doc::TextData, t: &mut Tok let dir = tx.paragraphs.first().map(|p| p.direction).filter(|d| tx.paragraphs.iter().all(|p| p.direction == *d)); match dir { Some(figcraft_doc::TextDirection::Ltr) => put("direction", "ltr".into()), - Some(figcraft_doc::TextDirection::Rtl) => put("direction", "rtl".into()), + Some(figcraft_doc::TextDirection::Rtl) => { + put("direction", "rtl".into()); + // Left alignment is absolute on the canvas; `start` would be the right edge here. + if tx.align_h == TextAlignH::Left { + put("text-align", "left".into()); + } + } _ => {} } match s.case { diff --git a/crates/engine/src/text_behaviour_tests.rs b/crates/engine/src/text_behaviour_tests.rs index 6db19a1cc..025b3bc2b 100644 --- a/crates/engine/src/text_behaviour_tests.rs +++ b/crates/engine/src/text_behaviour_tests.rs @@ -393,6 +393,7 @@ fn text_direction_is_forced_per_paragraph() { assert_eq!(inspect(&s)["textDirection"], json!("rtl")); let css = |s: &mut Session| s.execute("inspect.code", &json!({"id": t})).unwrap()["code"].as_str().unwrap().to_string(); assert!(css(&mut s).contains("direction: rtl;"), "{}", css(&mut s)); + assert!(css(&mut s).contains("text-align: left;"), "Left stays the left edge, which `start` would not be: {}", css(&mut s)); s.execute("node.set", &json!({"id": t, "props": {"textDirection": "ltr"}})).unwrap(); assert_eq!(rtl(&s), [false, false, false]); assert_eq!(inspect(&s)["textDirection"], json!("ltr")); @@ -413,6 +414,12 @@ fn text_direction_is_forced_per_paragraph() { s.execute("text.edit.insert", &json!({"text": "\n"})).unwrap(); s.execute("text.edit.end", &json!({})).unwrap(); assert_eq!(rtl(&s), [false, true, true, false]); + // An empty last paragraph (after a final newline) keeps the direction forced on it. + s.execute("node.set", &json!({"id": t, "props": {"characters": "abc\n", "textDirection": "auto"}})).unwrap(); + s.execute("text.edit.begin", &json!({"id": t, "caret": 4})).unwrap(); + s.execute("text.directionRtl", &json!({})).unwrap(); + s.execute("text.edit.end", &json!({})).unwrap(); + assert_eq!(rtl(&s), [false, true], "the empty last line runs right to left"); // A direction the document has words for; junk is refused. s.execute("node.set", &json!({"id": t, "props": {"characters": "\u{05E9}\u{05DC}\u{05D5}\u{05DD} abc", "textDirection": "auto"}})).unwrap(); assert_eq!(rtl(&s), [true], "Hebrew first: right to left by detection"); diff --git a/crates/format/src/rest/text.rs b/crates/format/src/rest/text.rs index ca5c51d15..391fa4e1c 100644 --- a/crates/format/src/rest/text.rs +++ b/crates/format/src/rest/text.rs @@ -10,7 +10,7 @@ use figcraft_doc::{ use serde_json::Value; use super::Ctx; -use super::props::{flag, len, list, num, paints, text}; +use super::props::{flag, len, num, paints, text}; /// Most characters read from one text node. const MAX_CHARS: usize = 1 << 20; @@ -259,10 +259,11 @@ fn runs(cx: &mut Ctx, v: &Value, td: &TextData) -> Vec { /// Each paragraph's list type, nesting level, start number and base direction from `lineTypes`, /// `lineIndentations` and (from `.fig` files) `listStartOffsets` and `lineDirections`. fn lists(v: &Value, td: &mut TextData) { - let types = list(v, "lineTypes"); - let indents = list(v, "lineIndentations"); - let starts = list(v, "listStartOffsets"); - let dirs = list(v, "lineDirections"); + // One entry per paragraph: read up to the paragraph count (bounded by the text's size), not the + // general list limit, so a long text keeps every paragraph's settings. + let n = td.paragraph_count(); + let column = |k: &str| v.get(k).and_then(Value::as_array).map(|a| a.get(..a.len().min(n)).unwrap_or_default()).unwrap_or_default(); + let (types, indents, starts, dirs) = (column("lineTypes"), column("lineIndentations"), column("listStartOffsets"), column("lineDirections")); td.paragraphs = (0..types.len().max(dirs.len())) .map(|i| ParaList { list: match types.get(i).and_then(Value::as_str) { diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs index 732e59ec7..bbf498a96 100644 --- a/crates/text/src/layout.rs +++ b/crates/text/src/layout.rs @@ -265,7 +265,8 @@ impl Item { } } -/// Bidi embedding levels per char, and whether each char's paragraph runs right to left. +/// Bidi embedding levels per char, and whether each char's paragraph runs right to left; +/// `rtl_para` has one more entry, for the position after the last char (an empty last paragraph). pub(crate) struct Bidi { pub(crate) levels: Vec, pub(crate) rtl_para: Vec, @@ -296,6 +297,15 @@ impl Bidi { rtl_para.push(paras.peek().is_some_and(|q| q.level.is_rtl())); } } + // The position after the last char: in the last paragraph, or in the empty one after a + // final newline (its forced direction, else left to right), so an empty last line knows + // its direction too. + let after = if text.is_empty() || text.ends_with('\n') { + forced.get(text.matches('\n').count()).copied().flatten().unwrap_or(false) + } else { + rtl_para.last().copied().unwrap_or(false) + }; + rtl_para.push(after); Some(Bidi { levels, rtl_para }) } } @@ -1271,7 +1281,8 @@ pub fn layout(text: &TextData, box_width: Option, box_height: Option) // Letter spacing separates glyphs: none after the line's last visible one. let end_spacing = vis_end.checked_sub(1).filter(|i| *i >= *s).and_then(|i| items.get(i)).map_or(0.0, |it| it.spacing); let width: f64 = items.get(*s..vis_end).unwrap_or(&[]).iter().map(|it| it.adv).sum::() - end_spacing; - let first_char = items.get(*s).map(|it| it.char_start).unwrap_or(0); + // An empty last line has no item: the position after the last char is its paragraph's. + let first_char = items.get(*s).map_or(chars.len(), |it| it.char_start); let rtl_line = rtl_para_at(first_char); let line_indent = line_indent_of(*para, para_start_line, first_char); // Hanging punctuation at the line's edges (the visible text's first and last chars). diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index e38963855..0469a0cfc 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -423,17 +423,23 @@ fn forced_direction_sets_a_paragraphs_base_level() { // Latin letters forced right to left: an embedded left-to-right run (level 2) in a // right-to-left paragraph; the next paragraph, unforced, stays left to right. let b = Bidi::of("ab\ncd", &[Some(true), None]).unwrap(); - assert_eq!(b.rtl_para, [true, true, true, false, false]); + assert_eq!(b.rtl_para, [true, true, true, false, false, false], "and the position after the last char"); assert_eq!((b.levels.get(..2), b.levels.get(3..)), (Some(&[2, 2][..]), Some(&[0, 0][..]))); // Hebrew forced left to right: a right-to-left run (level 1) in a left-to-right paragraph. let b = Bidi::of("\u{5D0}\u{5D1}", &[Some(false)]).unwrap(); - assert_eq!(b.rtl_para, [false, false]); + assert_eq!(b.rtl_para, [false, false, false]); assert_eq!(b.levels, [1, 1]); // Forcing what the letters already say changes nothing; a paragraph past the forced list is // detected. let b = Bidi::of("\u{5D0}\n\u{5D1}", &[Some(true)]).unwrap(); - assert_eq!(b.rtl_para, [true, true, true]); + assert_eq!(b.rtl_para, [true, true, true, true]); assert_eq!((b.levels.first(), b.levels.last()), (Some(&1), Some(&1))); + // The empty paragraph after a final newline has its own direction: forced, else left to right. + let b = Bidi::of("ab\n", &[None, Some(true)]).unwrap(); + assert_eq!(b.rtl_para, [false, false, false, true]); + let b = Bidi::of("\u{5D0}\n", &[]).unwrap(); + assert_eq!(b.rtl_para, [true, true, false]); + assert_eq!(Bidi::of("", &[Some(true)]).map(|b| b.rtl_para), Some(vec![true])); } /// The x of the glyph for char `i`. diff --git a/docs/localization-parity.md b/docs/localization-parity.md index ac8f1c3f9..3a887c576 100644 --- a/docs/localization-parity.md +++ b/docs/localization-parity.md @@ -1,6 +1,6 @@ # Localization parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-29 · **Change:** minor (Bosnian draft catalog, one/few/other plurals; German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; partial review, catalog remains a draft; Arabic draft catalog, count-neutral plurals and web font gate; Thai draft catalog and Thai UI fonts; a missing translation fails no check: `cargo xtask i18n-report` lists them; Vietnamese draft catalog; string counts re-measured: 2,352 entries; Russian and Turkish catalogs reviewed by native speakers, Russian one/few/many plurals; Czech and Indonesian drafts; the Japanese draft completed; counts re-measured; Windows UI language from the first preferred language; draft catalogs catch up: every draft translates every string again; Simplified Chinese draft catalog; macOS finds its downloadable CJK system fonts (#406); string counts re-measured: 2,272 entries, the drafts at 95–99%; Swedish command labels and menu wordings; Russian, Swedish, Turkish, Czech and Indonesian listed; a duplicated paragraph removed) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-05 · **Change:** minor (documents: a paragraph's base direction can be forced with Text ▸ Text direction, as Add right-to-left text says (#1830); Bosnian draft catalog, one/few/other plurals; German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; partial review, catalog remains a draft; Arabic draft catalog, count-neutral plurals and web font gate; Thai draft catalog and Thai UI fonts; a missing translation fails no check: `cargo xtask i18n-report` lists them; Vietnamese draft catalog; string counts re-measured: 2,352 entries; Russian and Turkish catalogs reviewed by native speakers, Russian one/few/many plurals; Czech and Indonesian drafts; the Japanese draft completed; counts re-measured; Windows UI language from the first preferred language; draft catalogs catch up: every draft translates every string again; Simplified Chinese draft catalog; macOS finds its downloadable CJK system fonts (#406); string counts re-measured: 2,272 entries, the drafts at 95–99%; Swedish command labels and menu wordings; Russian, Swedish, Turkish, Czech and Indonesian listed; a duplicated paragraph removed) · **Target:** Figma Design (desktop app 126.10.7) FigCraft's interface has a localization layer with an English catalog, a Russian catalog reviewed by a native speaker, and Spanish (with a Latin American overlay), French, German, Brazilian diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 5092a08f2..d551c65d1 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -91,7 +91,7 @@ interaction feel not yet compared. | Boolean groups: clicked where the result is, double-click or Cmd/Ctrl-click into operands, live results while dragging or editing points, per-operand operations | done | a group past the path operations' caps (250 000 segments, 2 million possible crossings, 4 million segments swept over a fold) draws without its result, with a warning, and Flatten refuses it (#1104) | | Text: point, auto height, fixed; caret, words, lines, IME | done | Backspace or Delete at the start of a list item takes its marker and keeps its level, the paragraph starting where the item's text did ("delete the counter, but keep the same level of indentation", Create bulleted and numbered lists; `text_tail_tests::list_keys_at_list_items`, text crate `behaviour_tests`); max lines on auto-width text keep it auto width, hugging up to that many lines and growing with its longest line ("Text resizing is set to auto height or auto width", Explore text properties; `text_behaviour_tests::max_lines_on_auto_width_text_keeps_auto_width_and_hugs_that_many_lines`); Alt+Enter while editing opens the link at the caret, web and mail links only (`text.openLink`; "press ⌥Option Return/Alt Enter to activate a focused link", Accessibility at Figma; `text_link_tests`); the font picker previews a family on the canvas while hovered (no undo step; Escape restores, #653) and Up/Down step through it (#352); a selection highlight after a line break starts at that line's start and an empty last line shows its mark (#665); carets step over whole emoji and accented letters; colour emoji draw from their colour tables (#300); IME composition replayed in tests as macOS sends it, not yet checked on a Mac (#747); CJK words by script run (no dictionary); vertical trim in Type settings; no spell check | | Text: wrap style (Auto, Balance, Pretty) | done | per text layer (`wrapStyle` on `node.set`, `text.wrapStyle`, the Type settings control under Vertical trim, inspect, CSS `text-wrap: balance` or `pretty`): Auto breaks greedily; Balance narrows each paragraph as far as it goes without another line, so its lines come out close to the same length (what browsers do for `text-wrap: balance`); Pretty keeps lines full and, when the last line is one word, narrows one of the last four lines just enough to give a word to the lines after it (Explore text properties: "Auto: Figma fits as many words as possible on each line before wrapping to the next", "Balance: Figma distributes text as evenly as possible across every line, so each line is close to the same length", "Pretty: Figma keeps each line full, but adjusts the last four lines to avoid an orphan"). Saved line breaks from a file still win. Not yet included: per-paragraph settings, text-style support and the `.fig` import/export mapping (#1827). Test: `text_behaviour_tests::balance_and_pretty_wrap_styles_break_lines_as_documented` | -| Text: direction override (Text ▸ Text direction) | done | per paragraph (`ParaList::direction`: auto, ltr, rtl): Text ▸ Text direction ▸ Auto / Left to right / Right to left and `text.direction {direction, ids?}` set the edited paragraphs while editing, else every paragraph of the selected texts; `node.set textDirection` the layer's (or the chars `start`/`end` name); the Type settings control appears once a right-to-left script is in the text or a direction is forced; inspect reports `textDirection` when the paragraphs agree and `lineDirections` otherwise; Dev Mode's CSS writes `direction: ltr` or `rtl` when every paragraph is forced the same way; `.fig` import and export carry each line's `sourceDirectionality`. Layout gives the paragraph its base level, so a forced right-to-left paragraph of Latin letters starts at the right, mirrors its list gutter and indent and orders its runs right to left, and a forced left-to-right paragraph of Hebrew the other way ("By default, Figma automatically handles text direction based on language detection. However, controls are available to override text direction per paragraph", "Go to Text > Text direction. Select Left to right or Right to left", Add right-to-left text). Not included: a direction in text styles (the article names none). Tests: `text_behaviour_tests::text_direction_is_forced_per_paragraph`, `fig::text_direction_tests` | +| Text: direction override (Text ▸ Text direction) | done | per paragraph (`ParaList::direction`: auto, ltr, rtl): Text ▸ Text direction ▸ Auto / Left to right / Right to left and `text.direction {direction, ids?}` set the edited paragraphs while editing, else every paragraph of the selected texts; `node.set textDirection` the layer's (or the chars `start`/`end` name); the Type settings control appears once a right-to-left script is in the text or a direction is forced; inspect reports `textDirection` when the paragraphs agree and `lineDirections` otherwise; Dev Mode's CSS writes `direction: ltr` or `rtl` when every paragraph is forced the same way (with `text-align: left` beside `rtl`, as Left is absolute on the canvas); `.fig` import and export carry each line's `sourceDirectionality`, read up to the paragraph count. Layout gives the paragraph its base level, so a forced right-to-left paragraph of Latin letters starts at the right, mirrors its list gutter and indent and orders its runs right to left, and a forced left-to-right paragraph of Hebrew the other way ("By default, Figma automatically handles text direction based on language detection. However, controls are available to override text direction per paragraph", "Go to Text > Text direction. Select Left to right or Right to left", Add right-to-left text). Not included: a direction in text styles (the article names none). Tests: `text_behaviour_tests::text_direction_is_forced_per_paragraph`, `fig::text_direction_tests` | | Text: superscript and subscript | done | `sups` / `subs` use the font's own glyphs where it has the feature and every letter or digit of the run gets one; otherwise the standard glyphs are drawn shrunk and raised or lowered by the font's OS/2 superscript and subscript metrics (0.65 em at 0.35 em up or 0.14 em down without them), and a run mixing available and unavailable glyphs is synthesised whole, as Explore text properties says ("Figma draws a synthesized version by using the font's standard version of the character, shrinking it, and positioning it accordingly"; mixed glyphs "all update to the synthesized form for consistency"), #1828; tests `text::tests::superscript_native_or_synthesised_and_never_mixed`, `text_behaviour_tests::superscript_and_subscript_are_synthesised_without_glyphs_for_them` | | Eyedropper (I) | done | picks the colour seen under the pointer (opaque) into the selection's fill and the recent colours, one undo step (`fx_behaviour_tests`); with Cmd/Ctrl+Shift held it makes a colour style or variable of it instead, as the reference app's eyedropper does: a Create from color window asks which, its name (the next free "Color n") and a variable's collection (the file's first, or a new one made with it in the same undo step), and leaves the selection's fills alone (`eyedropper_create_tests`, `sampled_color_tests`) | | Comment (C), Shift+C to show/hide | done | local only |