Trigger typing mode when BACKSPACE is pressed

WordPress · Jan 15, 2018 · a6b45ad · a6b45ad
1 parent 394c89b
commit a6b45ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/blocks/editable/index.js b/blocks/editable/index.js
@@ -548,7 +548,6 @@ export default class Editable extends Component {
 			}
 
 			event.preventDefault();
-			event.stopImmediatePropagation();
 		}
 
 		// If we click shift+Enter on inline Editables, we avoid creating two contenteditables

diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
@@ -263,6 +263,10 @@ export class BlockListBlock extends Component {
 		} else {
 			onMerge( previousBlock, block );
 		}
+
+		// Manually trigger typing mode, since merging will remove this block and
+		// cause onKeyDown to not fire
+		this.maybeStartTyping();
 	}
 
 	insertBlocksAfter( blocks ) {
@@ -335,6 +339,9 @@ export class BlockListBlock extends Component {
 						}
 					}
 				}
+
+				// Pressing backspace should trigger typing mode
+				this.maybeStartTyping();
 				break;
 
 			case ESCAPE: