Skip to content

fix(pm-adapter): render bibliography/index/TOA inside documentPartObject (SD-3066)#3566

Merged
harbournick merged 1 commit into
tadeu/sd-3066-field-code-importfrom
tadeu/sd-3066-render-fields
May 31, 2026
Merged

fix(pm-adapter): render bibliography/index/TOA inside documentPartObject (SD-3066)#3566
harbournick merged 1 commit into
tadeu/sd-3066-field-code-importfrom
tadeu/sd-3066-render-fields

Conversation

@tupizz
Copy link
Copy Markdown
Contributor

@tupizz tupizz commented May 29, 2026

Note

📚 Stacked PRs — review bottom-up

Order PR Scope
1️⃣ #3538 Single-paragraph BIBLIOGRAPHY/INDEX/TOA crash (SD-3005)
2️⃣ #3565 super-editor — field-code import fidelity + DRY
3️⃣ #3566 pm-adapter — render fields inside documentPartObject 👈 this PR

Review order: #3538#3565#3566. Each PR's base auto-retargets to main as the one below it merges.


Summary

Word wraps a generated bibliography (and other block fields) in a docPartObject SDT, sometimes via a nested content control. The pm-adapter handler only converted paragraph and tableOfContents children to flow blocks, so the field's entry paragraphs were silently dropped — the heading rendered, the entries didn't.

Stacked on #3565 (which fixes the import side so these fields parse correctly). Base retargets to main as the stack merges.

Linear: SD-3066

Fix

  • documentPartObject now renders bibliography/index/tableOfAuthorities children via the shared handleParagraphContainerNode, and structuredContentBlock children via their handler.
  • structuredContentBlock recurses block-field children (transparent wrapper).

Section-counting invariant (the real hazard)

findParagraphsWithSectPr recurses bibliography but not structuredContentBlock. So:

  • direct bibliography → handler advances currentParagraphIndex per entry (matches analysis);
  • scb-wrapped → renders without advancing (matches analysis not recursing scb).

The prior code both dropped entries and under-counted, which could drift section breaks. Both paths are validated against the invariant.

Also extracts the shared handleParagraphContainerNode (previously three byte-identical copies in the bibliography/index/toa handlers).

Test plan

  • Regression tests for both nesting shapes + the counter behavior
  • pnpm --filter @superdoc/pm-adapter exec vitest run src/sdt src/sections src/internal.test.ts — 302 pass
  • Layout corpus (474 docs): 439 unchanged; the 35 changed are a verticalAlign schema-evolution + 7 image/table/section docs that contain zero docPartObj/bibliography — provably untouched by this change. No regressions attributable to the fix.
  • Browser-verified: bibliography+document.docx now renders the entries (matches Word)

…ect (SD-3066)

Word wraps a generated bibliography (and other block fields) in a docPartObject
SDT, sometimes via a nested content control. The handler only converted
paragraph and tableOfContents children to flow blocks, so the field's entry
paragraphs were silently dropped — the heading rendered but the entries did
not.

- documentPartObject now renders bibliography/index/tableOfAuthorities children
  via the shared paragraph-container handler, and structuredContentBlock
  children via their handler.
- structuredContentBlock recurses block-field children (transparent wrapper),
  rendering their paragraphs.

Section-counting invariant: findParagraphsWithSectPr recurses bibliography
(so the handler advances currentParagraphIndex per entry) but not
structuredContentBlock (so the scb path renders without advancing). Both paths
were validated against the invariant; the prior code dropped entries AND
under-counted, which could drift section breaks.

Also extracts the shared handleParagraphContainerNode used by the bibliography,
index and tableOfAuthorities handlers (previously three byte-identical copies).

Regression tests cover both nesting shapes and the counter behavior. pm-adapter
suite passes (302); layout corpus comparison shows no regressions attributable
to this change.

Linear: SD-3066
@linear-code
Copy link
Copy Markdown

linear-code Bot commented May 29, 2026

SD-3066

Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

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

1 issue found across 8 files

Reply with feedback, questions, or to request a fix.

Fix all with cubic | Re-trigger cubic

Comment thread packages/layout-engine/pm-adapter/src/sdt/document-part-object.ts
Copy link
Copy Markdown
Collaborator

@harbournick harbournick left a comment

Choose a reason for hiding this comment

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

LGTM

@harbournick harbournick merged commit 60ad9c0 into tadeu/sd-3066-field-code-import May 31, 2026
41 checks passed
@harbournick harbournick deleted the tadeu/sd-3066-render-fields branch May 31, 2026 19:58
harbournick pushed a commit that referenced this pull request May 31, 2026
…ect (SD-3066) (#3566)

Word wraps a generated bibliography (and other block fields) in a docPartObject
SDT, sometimes via a nested content control. The handler only converted
paragraph and tableOfContents children to flow blocks, so the field's entry
paragraphs were silently dropped — the heading rendered but the entries did
not.

- documentPartObject now renders bibliography/index/tableOfAuthorities children
  via the shared paragraph-container handler, and structuredContentBlock
  children via their handler.
- structuredContentBlock recurses block-field children (transparent wrapper),
  rendering their paragraphs.

Section-counting invariant: findParagraphsWithSectPr recurses bibliography
(so the handler advances currentParagraphIndex per entry) but not
structuredContentBlock (so the scb path renders without advancing). Both paths
were validated against the invariant; the prior code dropped entries AND
under-counted, which could drift section breaks.

Also extracts the shared handleParagraphContainerNode used by the bibliography,
index and tableOfAuthorities handlers (previously three byte-identical copies).

Regression tests cover both nesting shapes and the counter behavior. pm-adapter
suite passes (302); layout corpus comparison shows no regressions attributable
to this change.

Linear: SD-3066
harbournick pushed a commit that referenced this pull request May 31, 2026
…ty (SD-3066) (#3565)

* fix(super-converter): bibliography/index/TOA field-code import fidelity (SD-3066)

Real Word documents surfaced several import defects in the block field-code
family (BIBLIOGRAPHY, INDEX, XE, TOA). This addresses them and unifies the
shared shape behind one set of helpers.

Fixes:
- Multi-run instruction aggregation joined fragments with an injected separator
  space, corrupting instructions Word splits across runs (e.g.
  `XE " Building Standard "`). Join verbatim; literal spacing is preserved.
- Table of Authorities was dropped on import: the v2 importer had no
  `sd:tableOfAuthorities` handler, so the node was silently discarded. Register
  tableOfAuthoritiesImporter alongside index/bibliography.
- A content control wrapping a block field imported as an inline
  `structuredContent` node; inside a block-only documentPartObject this threw
  "Invalid content for node type documentPartObject" and the editor failed to
  mount. Classify an SDT whose content is a block field as
  structuredContentBlock.
- Bibliography neither captured nor replayed instructionTokens (unlike
  index/toa), so split BIBLIOGRAPHY instructions did not round-trip. Add the
  attribute and wire it through preprocessor, encode and decode.

Refactors (DRY/KISS):
- Extract buildBlockFieldNode (shared by the bibliography/index/toa
  preprocessors) and wrapParagraphsAsComplexField (shared by their translator
  decoders), mirroring the existing inline-field helpers.
- Centralize BLOCK_FIELD_XML_NAMES so the paragraph importer and SDT classifier
  agree on which sd:* nodes are block content.

Adds RED→GREEN unit tests for each fix and the new shared helpers. Full
super-converter suite passes (2990).

Linear: SD-3066 (parent of SD-3005)

* fix(pm-adapter): render bibliography/index/TOA inside documentPartObject (SD-3066) (#3566)

Word wraps a generated bibliography (and other block fields) in a docPartObject
SDT, sometimes via a nested content control. The handler only converted
paragraph and tableOfContents children to flow blocks, so the field's entry
paragraphs were silently dropped — the heading rendered but the entries did
not.

- documentPartObject now renders bibliography/index/tableOfAuthorities children
  via the shared paragraph-container handler, and structuredContentBlock
  children via their handler.
- structuredContentBlock recurses block-field children (transparent wrapper),
  rendering their paragraphs.

Section-counting invariant: findParagraphsWithSectPr recurses bibliography
(so the handler advances currentParagraphIndex per entry) but not
structuredContentBlock (so the scb path renders without advancing). Both paths
were validated against the invariant; the prior code dropped entries AND
under-counted, which could drift section breaks.

Also extracts the shared handleParagraphContainerNode used by the bibliography,
index and tableOfAuthorities handlers (previously three byte-identical copies).

Regression tests cover both nesting shapes and the counter behavior. pm-adapter
suite passes (302); layout corpus comparison shows no regressions attributable
to this change.

Linear: SD-3066

* feat(painter-dom): custom SDT styling variables under chrome:'none' (SD-3322)

Under modules.contentControls.chrome:'none' the painter erased the SDT look
entirely, so a consumer who wanted a custom field/clause appearance had to target
the painted wrapper with !important and reach into internal state classes
(.ProseMirror-selectednode, .sdt-group-hover) to keep it stable across hover and
selection. That's the wrong "best practice" to teach.

Make the chrome-none reset read a --sd-content-controls-custom-* variable layer
with default-preserving fallbacks (0-width transparent border, no background /
radius / padding). chrome:'none' stays visually empty by default - existing
consumers see no change - but a consumer can now paint inline and block controls
by setting variables on a data-sdt-* selector. The painter applies them across
rest, hover, and selected, so the box stays stable (no jitter) and no !important
or state-class selectors are needed. `border` is a full shorthand; block adds a
`-border-left` accent rail; background vars cascade (hover from rest, selected
from hover).

- variables.css: document the custom-* surface; note the built-in chrome still
  uses the existing --sd-content-controls-* variables.
- docs: add a "Style the controls in place" section to the custom-UI content
  controls guide.
- test: assert the surface is wired and default-preserving; existing chrome-none
  selector + source-order tests are unchanged and still pass (painter-dom 1178/1178).

* fix(painter-dom): custom hover wins on locked SDTs under chrome:'none' (SD-3322)

The custom hover background was overridden for LOCKED controls under chrome:'none'.
The base lock-hover rules (a built-in tint on inline, transparent on block) have
equal specificity to the plain custom hover rules but come later in source order,
so they won; the chrome-none lock-hover reset only reset z-index, not background.

Re-assert the custom hover background in that reset block - it carries the extra
.superdoc-cc-chrome-none class, so it outranks the base lock-hover rules. A locked
control now follows --sd-content-controls-custom-*-hover-bg. With no custom var
set the default is empty, so the built-in lock-hover tint no longer leaks under
chrome:'none' for locked controls (consistently empty). Only the contract-templates
demo has locked chrome-none controls, and it wants the custom hover, not the tint.

Add a regression test asserting the custom hover vars are re-asserted after the
base lock-hover rules (source order = it wins). painter-dom 1179/1179 green.

* docs(theming): point chrome:'none' styling at the custom SDT variables (SD-3322)

The content-controls theming table themes the built-in chrome. Add a one-line
note that under chrome:'none' you style controls with the
--sd-content-controls-custom-* variables instead, linking the custom UI guide.

* demo/docs: contract-templates use the custom SDT styling variables (SD-3322)

Rewrite the contract-templates demo's SDT styling onto SuperDoc's public
--sd-content-controls-custom-* variables (from #3590), proving the new API in the
real legal-template use case. The demo now styles its inline fields and block
clauses with zero !important and zero internal state selectors
(.ProseMirror-selectednode, .sdt-group-hover); the painter applies the variables
across rest, hover, selected, and locked-hover. This is the copy-pasteable
pattern for styling custom SDTs under chrome:'none'.

- style.css: replace the per-state !important rules with one variable-setting
  rule per tag (inline + block); update the host-owned-styling comment.
- test: add state coverage - the custom hover background drives a painted field
  (and wins over the built-in lock-hover tint), the border stays constant across
  states (no jitter), and no built-in label/chrome leaks. Demo suite 13/13.
- docs (Document API > Content controls): correct the contentLocked wording (it
  rejects Document API content writes too, not just the editor); document the
  locked-template pattern (unlock -> write -> relock, incl. a locked parent for
  nested fields); add the single-use governed clause-library pattern alongside
  versioned reusable sections (kept - it's a valid pattern).
- docs (Custom UI > Content controls): add a "Build a custom field system"
  walkthrough; describe the demo as a full custom contract-template UI.
- README: note the demo styles through the public custom variables.

Stacked on #3590 (the painter variable layer); retarget to main once it merges.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants