Skip to content

Fix: Delete key on empty heading transforms following paragraph into heading #78779

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
ellatrix merged 15 commits into from
Aug 13, 2026
Merged

Fix: Delete key on empty heading transforms following paragraph into heading #78779

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03329e5
fix: improve block merging behavior for empty blocks
coderGtm May 28, 2026
6209531
test: add tests for empty block removal merge behavior
coderGtm May 28, 2026
61fb091
Merge branch 'trunk' into fix/heading-block-delete-flow
coderGtm May 28, 2026
671b18c
Merge branch 'trunk' into fix/heading-block-delete-flow
coderGtm May 29, 2026
e826df6
Merge branch 'trunk' into fix/heading-block-delete-flow
coderGtm Jun 9, 2026
44531a2
fix: refine block merging logic for empty blocks
coderGtm Jun 10, 2026
34d9b45
fix: enhance merging behavior for nested list items during deletion
coderGtm Jun 10, 2026
27a3d1c
Merge branch 'trunk' into fix/heading-block-delete-flow
coderGtm Jun 10, 2026
d132e07
fix: update tests for refined logic
coderGtm Jun 10, 2026
08d1191
Restore the nested list item merge behaviour
ellatrix Aug 12, 2026
efd3799
Match the sibling guard when removing an empty block
ellatrix Aug 12, 2026
bef8476
Cover forward deleting an empty heading end to end
ellatrix Aug 12, 2026
1135e6c
Merge remote-tracking branch 'origin/trunk' into pr-78779
ellatrix Aug 12, 2026
bc3bf85
Fold the empty block into the unmodified default guard
ellatrix Aug 12, 2026
e06b84f
Only treat text blocks as removable when empty
ellatrix Aug 12, 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
11 changes: 10 additions & 1 deletion packages/block-editor/src/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,16 @@ export const mergeBlocks =
return;
}

if ( isUnmodifiedDefaultBlock( blockA ) ) {
// An unmodified default block adds nothing to the merge. Neither
// does an empty block of a different type, where merging would
// transform blockB into blockA's type instead (a paragraph deleted
// into an empty heading became a heading), so remove blockA in both
// cases.
if (
isUnmodifiedDefaultBlock( blockA ) ||
( blockA.name !== blockB.name &&
isUnmodifiedBlock( blockA, 'content' ) )
) {
const isASelected = select.isBlockSelected( clientIdA );

if ( isASelected ) {
Expand Down
51 changes: 51 additions & 0 deletions test/e2e/specs/editor/various/splitting-merging.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,57 @@ test.describe( 'splitting and merging blocks (@firefox, @webkit)', () => {
);
} );

test( 'should forward delete an empty heading without transforming the next block', async ( {
editor,
page,
} ) => {
await editor.insertBlock( { name: 'core/heading' } );
await page.keyboard.press( 'Enter' );
await page.keyboard.type( 'My paragraph' );
await page.keyboard.press( 'ArrowUp' );

await expect.poll( editor.getBlocks ).toMatchObject( [
{ name: 'core/heading', attributes: { content: '' } },
{
name: 'core/paragraph',
attributes: { content: 'My paragraph' },
},
] );

await page.keyboard.press( 'Delete' );
// The caret lands at the start of the surviving paragraph.
await page.keyboard.type( '‸' );

await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/paragraph',
attributes: { content: '‸My paragraph' },
},
] );
} );

test( 'should forward delete an empty heading before an empty paragraph', async ( {
editor,
page,
} ) => {
await editor.insertBlock( { name: 'core/heading' } );
await editor.insertBlock( { name: 'core/paragraph' } );
await editor.canvas
.getByRole( 'document', { name: 'Block: Heading' } )
.click();

await page.keyboard.press( 'Delete' );
// Typing proves the surviving block: the empty heading is removed
// and the caret sits in the empty default paragraph.
await page.keyboard.type( '2' );

await expect
.poll( editor.getBlocks )
.toMatchObject( [
{ name: 'core/paragraph', attributes: { content: '2' } },
] );
} );

test( 'should place the caret in the next block on forward delete from an empty paragraph', async ( {
editor,
page,
Expand Down
Loading