Show inserter at block mover slot for empty text block

blocks/library/text/index.js

@@ -1,11 +1,19 @@
+/**
+ * External dependencies
+ */
+import { Fill } from 'react-slot-fill';
+
 /**
  * Internal dependencies
  */
 import { registerBlock, query } from 'api';
 import Editable from 'components/editable';
+import Inserter from '../../../editor/components/inserter';
 
 const { children } = query;
 
+const DEFAULT_CONTENT = <p />;
+
 registerBlock( 'core/text', {
 	title: wp.i18n.__( 'Text' ),
 
@@ -18,7 +26,7 @@ registerBlock( 'core/text', {
 	},
 
 	defaultAttributes: {
-		content: <p />
+		content: DEFAULT_CONTENT
 	},
 
 	controls: [
@@ -56,9 +64,11 @@ registerBlock( 'core/text', {
 
 	edit( { attributes, setAttributes, insertBlockAfter, focus, setFocus, mergeWithPrevious } ) {
 		const { content, align } = attributes;
+		const isEmpty = ( ! content || content === DEFAULT_CONTENT );
 
-		return (
+		const editable = (
 			<Editable
+				key="editable"
 				value={ content }
 				onChange={ ( nextContent ) => {
 					setAttributes( {
@@ -70,13 +80,31 @@ registerBlock( 'core/text', {
 				style={ align ? { textAlign: align } : null }
 				onSplit={ ( before, after ) => {
 					setAttributes( { content: before } );
-					insertBlockAfter( wp.blocks.createBlock( 'core/text', {
-						content: after
-					} ) );
+
+					let afterBlockAttributes;
+					if ( after ) {
+						afterBlockAttributes = { content: after };
+					}
+
+					insertBlockAfter( wp.blocks.createBlock(
+						'core/text',
+						afterBlockAttributes
+					) );
 				} }
 				onMerge={ mergeWithPrevious }
 			/>
 		);
+
+		if ( focus && isEmpty ) {
+			return [
+				<Fill key="inserter" name="Mover">
+					<Inserter />
+				</Fill>,
+				editable
+			];
+		}
+
+		return editable;
 	},
 
 	save( { attributes } ) {

editor/components/block-mover/index.js

@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { Slot } from 'react-slot-fill';
 import { connect } from 'react-redux';
 import classnames from 'classnames';
 import { first, last } from 'lodash';
@@ -14,6 +15,7 @@ import IconButton from 'components/icon-button';
 function BlockMover( { onMoveUp, onMoveDown, isFirst, isLast } ) {
 	return (
 		<div className="editor-block-mover">
+			<Slot name="Mover" />
 			<IconButton
 				className={ classnames( 'editor-block-mover__control', { 'is-disabled': isFirst } ) }
 				onClick={ onMoveUp }

languages/gutenberg.pot

@@ -42,19 +42,19 @@ msgstr ""
 
 #: blocks/library/image/index.js:41
 #: blocks/library/list/index.js:25
-#: blocks/library/text/index.js:27
+#: blocks/library/text/index.js:35
 msgid "Align left"
 msgstr ""
 
 #: blocks/library/image/index.js:47
 #: blocks/library/list/index.js:33
-#: blocks/library/text/index.js:35
+#: blocks/library/text/index.js:43
 msgid "Align center"
 msgstr ""
 
 #: blocks/library/image/index.js:53
 #: blocks/library/list/index.js:41
-#: blocks/library/text/index.js:43
+#: blocks/library/text/index.js:51
 msgid "Align right"
 msgstr ""
 
@@ -78,7 +78,7 @@ msgstr ""
 msgid "Quote style %d"
 msgstr ""
 
-#: blocks/library/text/index.js:10
+#: blocks/library/text/index.js:18
 msgid "Text"
 msgstr ""