fix(super-editor): preserve per-script fonts and inline keys metadata (SD-2517)#2768
Merged
caio-pizzol merged 6 commits intoApr 10, 2026
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a044c9d1cd
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
decodeRPrFromMarks was flattening all font scripts (ascii, eastAsia, hAnsi, cs) to the ascii font value, ignoring the eastAsiaFontFamily attribute already preserved on the mark during encode. This caused getInlineRunProperties to falsely classify fontFamily as an inline override (mark says eastAsia=Arial, style says eastAsia=Times New Roman), which polluted runPropertiesInlineKeys and made the exporter emit w:rFonts on heading runs that should inherit from the paragraph style. The fix adds an eastAsiaFontFamily case to decodeRPrFromMarks so the per-script font data survives the mark round-trip. With correct data, the existing inline/style comparison works without heuristics.
caio-pizzol
force-pushed
the
caio/sd-2517-fix-calculateinlinerunpropertiesplugin-polluting-run-export
branch
from
April 10, 2026 14:17
7dcf4ae to
6562286
Compare
caio-pizzol
changed the title
… (SD-2517) Zero-edit round-trip was injecting 197 w:rFonts into heading runs. Root cause: decodeRPrFromMarks flattened all font scripts (eastAsia, cs) to the ascii font value. This made getInlineRunProperties falsely classify fontFamily as inline (mark says cs=Arial, style says cs=Times New Roman), polluting runPropertiesInlineKeys and causing the exporter to emit w:rFonts on runs that should inherit from the paragraph style. Two fixes applied together: 1. Mark round-trip fidelity (styles.js): Encode and decode eastAsiaFontFamily and csFontFamily as separate mark attributes so per-script fonts survive the mark round-trip per ECMA-376 §17.3.2.26. 2. Plugin inline keys guard (calculateInlineRunPropertiesPlugin.js): When the importer set runPropertiesInlineKeys to [] (nothing inline), don't add mark-derived keys unless the user genuinely applied new formatting (detected via hasNewInlineProps). This handles remaining edge cases where theme font resolution (hAnsiTheme) still causes false positives.
caio-pizzol
changed the title
…SD-2517) Address review findings: - Register eastAsiaFontFamily and csFontFamily as global attributes on the textStyle mark via FontFamily extension. Without schema registration, ProseMirror dropped these attrs during Mark.fromJSON(), making the per-script font decode paths unreachable (Codex review finding). - Strip csFontFamily from visual mark attrs in resolveFontFamily alongside eastAsiaFontFamily. Both are round-trip metadata, not CSS properties (Opus review finding: csFontFamily leaked to DOM). - Replace IIFE with plain const for overrideKeys in computeSegmentKeys (DX finding from both reviewers). Result: 468 → 153 rFonts (vs 183 without schema registration).
…pping (SD-2517) Cover the new csFontFamily handling in resolveFontFamily: - csFontFamily stripped from visual attrs for non-EA text - both eastAsiaFontFamily and csFontFamily stripped together - attrs returned unchanged when no per-script fonts present
…s them (SD-2517) The calculateInlineRunPropertiesPlugin was dropping inline keys that the importer explicitly set (e.g. fontFamily from w:rPr) when the plugin's getInlineRunProperties comparison falsely classified them as matching the style. This caused 118 runs to lose their explicit w:rFonts on export. When the importer set non-empty runPropertiesInlineKeys, restore any keys the plugin dropped back into runProperties from the original node attrs. The importer saw explicit w:rPr in the XML — that decision is authoritative over the plugin's mark-based recomputation. Result: INPUT 271 rFonts → BEFORE 468 → AFTER 275 (near-perfect, +4 from per-script encode edge cases, 0 injection).
End-to-end behavior test that loads a DOCX with localized Portuguese heading styles, exports without edits, and verifies the rFonts count didn't increase (the 197-injection regression).
caio-pizzol
enabled auto-merge
April 10, 2026 16:20
caio-pizzol
added this pull request to the merge queue
Apr 10, 2026
caio-pizzol
deleted the
caio/sd-2517-fix-calculateinlinerunpropertiesplugin-polluting-run-export
branch
April 10, 2026 16:25
Contributor
|
🎉 This PR is included in vscode-ext v1.1.0-next.80 |
Contributor
|
🎉 This PR is included in @superdoc-dev/react v1.0.0-next.34 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in template-builder v1.3.0-next.40 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in esign v2.2.0-next.38 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in superdoc v1.24.0-next.77 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in superdoc-cli v0.5.0-next.78 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in superdoc-sdk v1.3.0-next.79 |
Contributor
|
🎉 This PR is included in superdoc-sdk v1.4.0 |
Contributor
|
🎉 This PR is included in superdoc v1.25.0 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in superdoc-cli v0.6.0 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in vscode-ext v2.3.0-next.1 |
Contributor
|
🎉 This PR is included in template-builder v1.5.0-next.1 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in esign v2.3.0-next.1 The release is available on GitHub release |
Contributor
|
🎉 This PR is included in vscode-ext v2.3.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Zero-edit round-trip was injecting 197
w:rFontsinto heading runs that should inherit from the paragraph style. Most visible with localized Portuguese heading styles (Ttulo1,Ttulo2).Root cause:
decodeRPrFromMarksflattened per-script fonts (eastAsia, cs) to the ascii value, makinggetInlineRunPropertiesfalsely classifyfontFamilyas inline.Fix (3 layers):
Mark round-trip fidelity (
styles.js,font-family.js): Encode/decodeeastAsiaFontFamilyandcsFontFamilyas registered mark attributes so per-script fonts survive per ECMA-376 §17.3.2.26.Plugin guard (
calculateInlineRunPropertiesPlugin.js): When the importer setrunPropertiesInlineKeys: [], skip mark-derived key addition unless the user applied new formatting. Handles remaining edge cases (theme font resolution).Inline key preservation (
calculateInlineRunPropertiesPlugin.js): When the plugin drops keys the importer explicitly set (e.g. fontFamily on runs withw:rPr), restore them from the original node attrs.Result: INPUT 271 rFonts → BEFORE 468 (+197 injected) → AFTER 275 (+4 from per-script encoding, 0 injected)
112 unit tests passing, regression document uploaded to test corpus.
Closes SD-2517 / IT-907 / #2767