Fix deleting paragraph after block

WordPress · Oct 6, 2023 · d5b4224 · d5b4224
1 parent 9c93276
commit d5b4224
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
@@ -1012,7 +1012,20 @@ export const mergeBlocks =
 		const blockA = select.getBlock( clientIdA );
 
 		if ( isUnmodifiedDefaultBlock( blockA ) ) {
-			dispatch.removeBlock( clientIdA, false );
+			dispatch.removeBlock(
+				clientIdA,
+				select.isBlockSelected( clientIdA )
+			);
+			return;
+		}
+
+		const blockB = select.getBlock( clientIdB );
+
+		if ( isUnmodifiedDefaultBlock( blockB ) ) {
+			dispatch.removeBlock(
+				clientIdB,
+				select.isBlockSelected( clientIdB )
+			);
 			return;
 		}
 
@@ -1028,8 +1041,6 @@ export const mergeBlocks =
 			return;
 		}
 
-		const blockB = select.getBlock( clientIdB );
-
 		if ( ! blockAType.merge ) {
 			// If there's no merge function defined, attempt merging inner
 			// blocks.