Skip to content

Fixes #3745 #3746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tom-material wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes #3745 #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f441a02
Fix nested block SDTs in layout adapter
tom-material Jun 16, 2026
1f664e5
Merge branch 'superdoc-dev:main' into tom/nested-block-sdts
tom-material Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions packages/layout-engine/tests/src/sdt-metadata.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,55 @@ describe('SDT metadata integration', () => {
});
});

it('preserves nested block structuredContent content and metadata', () => {
const nestedBlockDoc = {
type: 'doc',
content: [
{
type: 'structuredContentBlock',
attrs: {
id: 'outer-block-sdt',
tag: 'outer_block',
alias: 'Outer Block',
},
content: [
{
type: 'paragraph',
content: [{ type: 'text', text: 'Outer paragraph' }],
},
{
type: 'structuredContentBlock',
attrs: {
id: 'inner-block-sdt',
tag: 'inner_block',
alias: 'Inner Block',
},
content: [
{
type: 'paragraph',
content: [{ type: 'text', text: 'Inner paragraph' }],
},
],
},
],
},
],
};
const { blocks: nestedBlocks } = toFlowBlocks(nestedBlockDoc);
const innerParagraph = nestedBlocks.find(
(block) => block.kind === 'paragraph' && block.runs?.some((run) => run.text === 'Inner paragraph'),
);

expect(innerParagraph).toBeDefined();
expect(innerParagraph?.attrs?.sdt).toMatchObject({
type: 'structuredContent',
scope: 'block',
id: 'inner-block-sdt',
tag: 'inner_block',
alias: 'Inner Block',
});
});

it('handles nested structuredContent (inline within inline)', () => {
const nestedBlock = summary.find((b) => b.blockId === '2-paragraph');
const outerRun = nestedBlock?.runMetadata.find((r) => r.metadata?.id === 'nested-outer');
Expand Down
4 changes: 4 additions & 0 deletions packages/super-editor/src/editors/v1/core/layout-adapter/sdt/structured-content-block.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ export function handleStructuredContentBlockNode(node: PMNode, context: NodeHand
// inside this content control is likewise transparent here; render its entry
// paragraphs without advancing currentParagraphIndex, since
// findParagraphsWithSectPr does not recurse structuredContentBlock.
if (child.type === 'structuredContentBlock') {
handleStructuredContentBlockNode(child, context);

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve outer SDT metadata when recursing

When a block SDT directly contains another structuredContentBlock (especially outer SDT -> inner SDT -> paragraph with no direct paragraph/table children on the outer), this recursive call converts the inner subtree with only the inner node's metadata, so no emitted FlowBlock carries the outer structuredContentMetadata. The painter derives block-SDT grouping/chrome from attrs.sdt, so the outer content control effectively disappears from layout/rendering for this valid nested shape; pass the inherited metadata through or record it separately instead of dropping it at the recursion boundary.

Useful? React with 👍 / 👎.

return;
}
if (
Array.isArray(child.content) &&
(child.type === 'documentPartObject' ||
Expand Down
Loading