Commit f31c05b
fix: align rtl date token rendering with word parity (#3250)
* fix: align rtl date token rendering with word parity
Fix RTL date rendering parity with Word per SD-3098. The browser's UBA does
not reorder numerics inside an RTL run the way Word does, and run-boundary
separator drift breaks mixed-direction date strings like `-03-23` + `2026`.
The fix is paint-time only - it never touches PM/model/export:
1. DomPainter sets dir="rtl" on the span when run.bidi.rtl === true (per-run
bidi isolation eliminates run-boundary separator drift)
2. DomPainter sets dir="ltr" on date-like LTR runs (per regex) inside RTL
contexts (prevents the third case where a non-rtl date inside an rtl
paragraph reorders unpredictably)
3. normalizeRtlDateTokenForWordParity injects U+200F (RLM) around `./- `
separators inside RTL date-like text so Word and SuperDoc render the
same visual order (e.g. XML `23/03/2026` -> visual `2026/03/23`)
Three test cases in rtl-dates.docx (the Linear-attached "Date Being Weird"
fixture):
- Header: single <w:rtl/> run `23/03/2026` -> Word visual `2026/03/23`
- Body 1: LTR run `-03-23` + RTL run `2026` -> Word visual `2026-03-23`
- Body 2 (control): single LTR run `2026/03/26` -> unchanged
Other changes:
- bidiCompatible guard in mergeAdjacentRuns: prevents a <w:rtl/> run from
merging with a plain run and silently losing the bidi flag
- run-visual-marks.ts and versionSignature.ts: include run.bidi in the
caching hashes so a rtl-only edit invalidates measure/DOM cache
- New painter unit tests (rtl-date-parity.test.ts) verifying dir + RLM
- New behavior spec (rtl-dates-word-parity.spec.ts) using the real fixture
This PR builds on the run-level bidi metadata SD-2781 (#3203) added to the
TextRun contract - reads from TextRun.bidi.rtl (the merged shape), not a
parallel RunMarks.bidiContext field.
* test(rtl-date-parity): cover bidi hash + block-version + painter edge cases
Adds pre-merge coverage for SD-3098 rendering invariants:
- hashRunVisualMarks: bidi field changes the dirty-run hash (rtl=true vs
absent, rtl=true vs rtl=false, embedding-only changes). Stale hashes
would let an edit that flips just <w:rtl/> reuse stale measure/DOM.
- deriveBlockVersion: bidi flips invalidate the cached block version.
Without this, the painter would reuse a cached block snapshot after
an rtl-only edit.
- DomPainter painter tests: mixed rtl + ltr runs on the same line stay
as separate spans with distinct dir attrs; non-date-like rtl runs
keep dir="rtl" without RLM injection; non-rtl plain text leaves the
span without a dir attribute.
Also adds rtl-mixed-run-line.docx + behavior spec as a negative test
asserting Hebrew + date + Hebrew paragraphs don't regress (Hebrew runs
stay rtl, date run is not RLM-injected since it isn't rtl-tagged).
---------
Co-authored-by: Caio Pizzol <caiopizzol@gmail.com>
Co-authored-by: Caio Pizzol <97641911+caio-pizzol@users.noreply.github.com>
Co-authored-by: Caio Pizzol <caio@superdoc.dev>1 parent d0db62c commit f31c05b
12 files changed
Lines changed: 399 additions & 5 deletions
File tree
- packages/layout-engine
- layout-bridge
- src
- test
- layout-resolved/src
- painters/dom/src
- pm-adapter/src/converters
- tests/behavior/tests/formatting
- fixtures
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
23 | 28 | | |
24 | 29 | | |
25 | 30 | | |
| |||
31 | 36 | | |
32 | 37 | | |
33 | 38 | | |
| 39 | + | |
34 | 40 | | |
35 | 41 | | |
Lines changed: 35 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
106 | 141 | | |
Lines changed: 40 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
271 | 271 | | |
272 | 272 | | |
273 | 273 | | |
| 274 | + | |
| 275 | + | |
274 | 276 | | |
275 | 277 | | |
276 | 278 | | |
| |||
459 | 461 | | |
460 | 462 | | |
461 | 463 | | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
462 | 467 | | |
463 | 468 | | |
464 | 469 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5567 | 5567 | | |
5568 | 5568 | | |
5569 | 5569 | | |
5570 | | - | |
| 5570 | + | |
| 5571 | + | |
| 5572 | + | |
| 5573 | + | |
5571 | 5574 | | |
5572 | 5575 | | |
5573 | 5576 | | |
| |||
5593 | 5596 | | |
5594 | 5597 | | |
5595 | 5598 | | |
5596 | | - | |
| 5599 | + | |
| 5600 | + | |
| 5601 | + | |
| 5602 | + | |
| 5603 | + | |
| 5604 | + | |
| 5605 | + | |
5597 | 5606 | | |
5598 | 5607 | | |
5599 | 5608 | | |
| |||
6352 | 6361 | | |
6353 | 6362 | | |
6354 | 6363 | | |
| 6364 | + | |
6355 | 6365 | | |
6356 | 6366 | | |
6357 | 6367 | | |
| |||
8266 | 8276 | | |
8267 | 8277 | | |
8268 | 8278 | | |
| 8279 | + | |
| 8280 | + | |
| 8281 | + | |
| 8282 | + | |
| 8283 | + | |
| 8284 | + | |
| 8285 | + | |
| 8286 | + | |
| 8287 | + | |
| 8288 | + | |
| 8289 | + | |
| 8290 | + | |
| 8291 | + | |
| 8292 | + | |
| 8293 | + | |
Lines changed: 162 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
0 commit comments