From 4d9eaef1f220dcf40798bbf9daef631bd1a9d27e Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 13 Apr 2017 10:33:35 +0100
Subject: [PATCH] Split text block on double enter

---
 blocks/components/editable/index.js | 48 ++++++++++++++++++-----------
 blocks/library/text/index.js        |  9 +++---
 post-content.js                     |  6 ++--
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/blocks/components/editable/index.js b/blocks/components/editable/index.js
index c84001ebc3c2b..c87310ab96502 100644
--- a/blocks/components/editable/index.js
+++ b/blocks/components/editable/index.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
+import { last } from 'lodash';
 
 /**
  * Internal dependencies
@@ -60,25 +61,36 @@ export default class Editable extends wp.element.Component {
 	}
 
 	onKeyDown( event ) {
-		if ( ! this.props.tagName && event.keyCode === 13 ) {
-			// Wait for the event to propagate
-			setTimeout( () => {
-				// Getting the content before and after the cursor
-				this.editor.selection.getStart();
-				const childNodes = Array.from( this.editor.getBody().childNodes );
-				const splitIndex = childNodes.indexOf( this.editor.selection.getStart() );
-				const getHtml = ( nodes ) => nodes.reduce( ( memo, node ) => memo + node.outerHTML, '' );
-				const beforeNodes = childNodes.slice( 0, splitIndex );
-				const before = getHtml( beforeNodes );
-				const after = getHtml( childNodes.slice( splitIndex ) );
-
-				// Splitting into two blocks
-				this.editor.setContent( this.props.value );
-				const hasAfter = !! childNodes.slice( splitIndex )
-					.reduce( ( memo, node ) => memo + node.textContent, '' );
-				this.props.onSplit( before, hasAfter ? after : '' );
-			} );
+		if ( this.props.tagName || event.keyCode !== 13 ) {
+			return;
 		}
+
+		// Wait for the event to propagate
+		setTimeout( () => {
+			// Getting the content before and after the cursor
+			this.editor.selection.getStart();
+			const childNodes = Array.from( this.editor.getBody().childNodes );
+			const splitIndex = childNodes.indexOf( this.editor.selection.getStart() );
+			const getHtml = ( nodes ) => nodes.reduce( ( memo, node ) => memo + node.outerHTML, '' );
+			const beforeNodes = childNodes.slice( 0, splitIndex );
+			const lastNodeBeforeCursor = last( beforeNodes );
+			// Avoid splitting on single enter
+			if (
+				! lastNodeBeforeCursor ||
+				lastNodeBeforeCursor.childNodes.length !== 1 ||
+				lastNodeBeforeCursor.firstChild.tagName !== 'BR'
+			) {
+				return;
+			}
+			const before = getHtml( beforeNodes.slice( 0, beforeNodes.length - 1 ) );
+			const after = getHtml( childNodes.slice( splitIndex ) );
+
+			// Splitting into two blocks
+			this.editor.setContent( this.props.value );
+			const hasAfter = !! childNodes.slice( splitIndex )
+				.reduce( ( memo, node ) => memo + node.textContent, '' );
+			this.props.onSplit( before, hasAfter ? after : '' );
+		} );
 	}
 
 	bindNode( ref ) {
diff --git a/blocks/library/text/index.js b/blocks/library/text/index.js
index b2c31e28af075..6e36541d186c7 100644
--- a/blocks/library/text/index.js
+++ b/blocks/library/text/index.js
@@ -19,8 +19,8 @@ registerBlock( 'core/text', {
 	category: 'common',
 
 	attributes: {
-		content: html( 'p' ),
-		align: prop( 'p', 'style.textAlign' )
+		content: html( 'div' ),
+		align: prop( 'div', 'style.textAlign' )
 	},
 
 	controls: [
@@ -76,9 +76,10 @@ registerBlock( 'core/text', {
 		const { align, content } = attributes;
 
 		return (
-			<p
+			<div
 				style={ align ? { textAlign: align } : null }
-				dangerouslySetInnerHTML={ { __html: content } } />
+				dangerouslySetInnerHTML={ { __html: content } }
+			/>
 		);
 	}
 } );
diff --git a/post-content.js b/post-content.js
index 844d28282abd2..152d43f9ec350 100644
--- a/post-content.js
+++ b/post-content.js
@@ -9,7 +9,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/heading -->',
 
 			'<!-- wp:core/text -->',
-			'<p>I imagine prior to the launch of the iPod, or the iPhone, there were teams saying the same thing: the copy + paste guys are <em>so close</em> to being ready and we know Walt Mossberg is going to ding us for this so let\'s just not ship to the manufacturers in China for just a few more weeks… The Apple teams were probably embarrassed. But <strong>if you\'re not embarrassed when you ship your first version you waited too long</strong>.</p>',
+			'<div><p>I imagine prior to the launch of the iPod, or the iPhone, there were teams saying the same thing: the copy + paste guys are <em>so close</em> to being ready and we know Walt Mossberg is going to ding us for this so let\'s just not ship to the manufacturers in China for just a few more weeks… The Apple teams were probably embarrassed. But <strong>if you\'re not embarrassed when you ship your first version you waited too long</strong>.</p></div>',
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/image -->',
@@ -17,7 +17,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/image -->',
 
 			'<!-- wp:core/text -->',
-			'<p>A beautiful thing about Apple is how quickly they obsolete their own products. I imagine this also makes the discipline of getting things out there easier. Like I mentioned before, the longer it’s been since the last release the more pressure there is, but if you know that if your bit of code doesn’t make this version but there’s the +0.1 coming out in 6 weeks, then it’s not that bad. It’s like flights from San Francisco to LA, if you miss one you know there’s another one an hour later so it’s not a big deal. Amazon has done a fantastic job of this with the Kindle as well, with a new model every year.</p>',
+			'<div><p>A beautiful thing about Apple is how quickly they obsolete their own products. I imagine this also makes the discipline of getting things out there easier. Like I mentioned before, the longer it’s been since the last release the more pressure there is, but if you know that if your bit of code doesn’t make this version but there’s the +0.1 coming out in 6 weeks, then it’s not that bad. It’s like flights from San Francisco to LA, if you miss one you know there’s another one an hour later so it’s not a big deal. Amazon has done a fantastic job of this with the Kindle as well, with a new model every year.</p></div>',
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/quote -->',
@@ -29,7 +29,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/image -->',
 
 			'<!-- wp:core/text -->',
-			'<p>By shipping early and often you have the unique competitive advantage of hearing from real people what they think of your work, which in best case helps you anticipate market direction, and in worst case gives you a few people rooting for you that you can email when your team pivots to a new idea. Nothing can recreate the crucible of real usage.</p>',
+			'<div><p>By shipping early and often you have the unique competitive advantage of hearing from real people what they think of your work, which in best case helps you anticipate market direction, and in worst case gives you a few people rooting for you that you can email when your team pivots to a new idea. Nothing can recreate the crucible of real usage.</p></div>',
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/list -->',