Skip to content

Write: fix empty heading and blockquote block markup in convertToBlocks #48544

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

Merged
kbrown9 merged 2 commits into from
May 6, 2026
+22 −7
Merged

Write: fix empty heading and blockquote block markup in convertToBlocks #48544

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
a638d1c
Write: strip lone <br> placeholders in convertToBlocks() to fix empty…
kbrown9 May 5, 2026
4c67f7c
Write: preserve empty headings, blockquotes, and lists in convertToBl…
kbrown9 May 6, 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
4 changes: 4 additions & 0 deletions projects/packages/jetpack-mu-wpcom/changelog/fix-write-empty-gb-blocks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Write: strip lone br placeholders in convertToBlocks to fix empty heading and blockquote block markup
25 changes: 18 additions & 7 deletions projects/packages/jetpack-mu-wpcom/src/features/write/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,16 @@ function convertToBlocks( html ) {
if ( node.nodeType !== Node.ELEMENT_NODE ) continue;

const tag = node.tagName.toLowerCase();
const inner = node.innerHTML.trim();
// Strip lone <br> placeholders left by contentEditable so empty
// blocks are not serialized with stale markup.
const inner = node.innerHTML.trim().replace( /^<br\s*\/?>$/, '' );

if ( ! inner && ! [ 'figure', 'img', 'hr' ].includes( tag ) ) continue;
if (
! inner &&
! [ 'figure', 'img', 'hr', 'blockquote', 'ul', 'ol' ].includes( tag ) &&
! /^h[1-6]$/.test( tag )
)
continue;

// Check for text alignment.
const align = node.style && node.style.textAlign;
Expand Down Expand Up @@ -347,11 +354,15 @@ function convertToBlocks( html ) {
);
} else if ( tag === 'ul' || tag === 'ol' ) {
// Wrap each <li> in wp:list-item block comments.
const listItems = Array.from( node.querySelectorAll( ':scope > li' ) )
.map(
li => `<!-- wp:list-item -->\n<li>${ li.innerHTML.trim() }</li>\n<!-- /wp:list-item -->`
)
.join( '\n' );
const liNodes = Array.from( node.querySelectorAll( ':scope > li' ) );
const listItems = liNodes.length
? liNodes
.map(
li =>
`<!-- wp:list-item -->\n<li>${ li.innerHTML.trim() }</li>\n<!-- /wp:list-item -->`
)
.join( '\n' )
: '<!-- wp:list-item -->\n<li></li>\n<!-- /wp:list-item -->';
const listTag = tag === 'ol' ? 'ol' : 'ul';
const attrs = tag === 'ol' ? ' {"ordered":true}' : '';
blocks.push(
Expand Down
Loading