Skip to content

🔄 Sync stable → main (conflicts)#2885

Closed
superdoc-bot[bot] wants to merge 1 commit intomainfrom
sync/stable-to-main-20260421-231815
Closed

🔄 Sync stable → main (conflicts)#2885
superdoc-bot[bot] wants to merge 1 commit intomainfrom
sync/stable-to-main-20260421-231815

Conversation

@superdoc-bot
Copy link
Copy Markdown
Contributor

@superdoc-bot superdoc-bot Bot commented Apr 21, 2026

Summary

Merges latest stable patches into main. Has merge conflicts that need manual resolution.

Release artifact conflicts were auto-resolved, but other conflicts remain.


Auto-created by sync-patches workflow.

@superdoc-bot superdoc-bot Bot added patch-sync Patch sync from release branch review: thorough labels Apr 21, 2026
@github-actions
Copy link
Copy Markdown
Contributor

Status: FAIL

The OOXML-relevant change is the new isStOnOffEnabled helper and its use in isAlternatingHeadersOddEven. The element and attribute are real and correctly identified, but there's one spec issue.


on / off are not valid ST_OnOff values

packages/super-editor/src/editors/v1/core/super-converter/v2/importer/docxImporter.js, line ~1247

const ST_ON_OFF_TRUE_VALUES = new Set(['1', 'true', 'on']);

Per ECMA-376 §22.9.2.7, ST_OnOff is a restriction of the W3C XML Schema boolean datatype — its only legal lexical values are 1 and true (on) and 0 and false (off). The strings on and off are not part of this type and would never appear in a conforming document. Including them silently accepts malformed XML as valid.

The w:evenAndOddHeaders element (§17.10.1) uses the common boolean property definition (§17.17.4), which types w:val as ST_OnOff. So the fix is simply to drop 'on' from the set (and correspondingly, 'off' should never be treated as a distinct falsy value — it already falls through to false naturally, but the test scaffolding implies it's an expected value).

Everything else about the implementation is correct:

  • w:evenAndOddHeaders is a real settings element — ✓
  • w:val is the right attribute name — ✓
  • Absent w:val when the element is present defaults to true — ✓ (spec: "This is the default value for this attribute, and is implied when the parent element is present, but this attribute is omitted")
  • Absent element defaults to false — ✓ (spec: "If this element is omitted, then its value shall be assumed to be false")

More detail: https://ooxml.dev/spec?q=evenAndOddHeaders | https://ooxml.dev/spec?q=ST_OnOff

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: aa6cc40e8b

ℹ️ 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".

Comment on lines +1102 to +1104
<<<<<<< HEAD
page.columns = { count: activeColumns.count, gap: activeColumns.gap, withSeparator: activeColumns.withSeparator };
=======
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P0 Badge Resolve merge conflict markers before committing

This file still contains unresolved merge markers (<<<<<<<, =======, >>>>>>>), which makes the TypeScript source unparsable and blocks builds/tests for this package. Because these markers appear in committed source (not just comments), any CI job that compiles layout-engine will fail until the conflict is manually resolved and only one branch’s code remains.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

patch-sync Patch sync from release branch review: thorough

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant