Writing flow: preserve block when merging into empty paragraph (#55134)

WordPress · Oct 9, 2023 · eb77e48 · eb77e48 · github-actions · Oct 9, 2023
1 parent 4ce1636
commit eb77e48
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -494,6 +494,8 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 					}
 
 					moveFirstItemUp( rootClientId );
+				} else {
+					removeBlock( clientId );
 				}
 			}
 		},

diff --git a/packages/block-editor/src/components/rich-text/use-delete.js b/packages/block-editor/src/components/rich-text/use-delete.js
@@ -43,7 +43,7 @@ export function useDelete( props ) {
 				// an intentional user interaction distinguishing between Backspace and
 				// Delete to remove the empty field, but also to avoid merge & remove
 				// causing destruction of two fields (merge, then removed merged).
-				if ( onRemove && isEmpty( value ) && isReverse ) {
+				else if ( onRemove && isEmpty( value ) && isReverse ) {
 					onRemove( ! isReverse );
 				}
 

diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
@@ -13,6 +13,7 @@ import {
 	switchToBlockType,
 	synchronizeBlocksWithTemplate,
 	getBlockSupport,
+	isUnmodifiedDefaultBlock,
 } from '@wordpress/blocks';
 import { speak } from '@wordpress/a11y';
 import { __, _n, sprintf } from '@wordpress/i18n';
@@ -1013,17 +1014,12 @@ export const mergeBlocks =
 
 		if ( ! blockAType ) return;
 
+		const blockB = select.getBlock( clientIdB );
+
 		if (
 			! blockAType.merge &&
-			! getBlockSupport( blockA.name, '__experimentalOnMerge' )
+			getBlockSupport( blockA.name, '__experimentalOnMerge' )
 		) {
-			dispatch.selectBlock( blockA.clientId );
-			return;
-		}
-
-		const blockB = select.getBlock( clientIdB );
-
-		if ( ! blockAType.merge ) {
 			// If there's no merge function defined, attempt merging inner
 			// blocks.
 			const blocksWithTheSameType = switchToBlockType(
@@ -1090,6 +1086,27 @@ export const mergeBlocks =
 			return;
 		}
 
+		if ( isUnmodifiedDefaultBlock( blockA ) ) {
+			dispatch.removeBlock(
+				clientIdA,
+				select.isBlockSelected( clientIdA )
+			);
+			return;
+		}
+
+		if ( isUnmodifiedDefaultBlock( blockB ) ) {
+			dispatch.removeBlock(
+				clientIdB,
+				select.isBlockSelected( clientIdB )
+			);
+			return;
+		}
+
+		if ( ! blockAType.merge ) {
+			dispatch.selectBlock( blockA.clientId );
+			return;
+		}
+
 		const blockBType = getBlockType( blockB.name );
 		const { clientId, attributeKey, offset } = select.getSelectionStart();
 		const selectedBlockType =
-Original file line number
+Diff line change
@@ Expand Up @@
     					}
     					moveFirstItemUp( rootClientId );
+    				} else {
+    					removeBlock( clientId );
     				}
     			}
     		},
@@ Expand Down @@