Remove sibling inserter

edit-post/assets/stylesheets/_z-index.scss

@@ -9,7 +9,6 @@ $z-layers: (
 	'.editor-block-list__block {core/image aligned left or right}': 20,
 	'.freeform-toolbar': 10,
 	'.editor-warning': 1,
-	'.editor-block-list__sibling-inserter': 1,
 	'.components-form-toggle__input': 1,
 	'.editor-format-list__menu': 1,
 	'.editor-inserter__tabs': 1,

editor/components/block-list/block.js

@@ -34,7 +34,7 @@ import BlockHtml from './block-html';
 import BlockContextualToolbar from './block-contextual-toolbar';
 import BlockMultiControls from './multi-controls';
 import BlockMobileToolbar from './block-mobile-toolbar';
-import BlockListSiblingInserter from './sibling-inserter';
+import BlockInsertionPoint from './insertion-point';
 import {
 	clearSelectedBlock,
 	editPost,
@@ -481,7 +481,7 @@ export class BlockListBlock extends Component {
 					{ showUI && <BlockMobileToolbar uid={ block.uid } renderBlockMenu={ renderBlockMenu } /> }
 				</div>
 				{ !! error && <BlockCrashWarning /> }
-				<BlockListSiblingInserter uid={ block.uid } />
+				<BlockInsertionPoint uid={ block.uid } />
 			</div>
 		);
 		/* eslint-enable jsx-a11y/no-static-element-interactions, jsx-a11y/onclick-has-role, jsx-a11y/click-events-have-key-events */

editor/components/block-list/index.js

@@ -25,7 +25,7 @@ import { serialize } from '@wordpress/blocks';
  */
 import './style.scss';
 import BlockListBlock from './block';
-import BlockListSiblingInserter from './sibling-inserter';
+import BlockInsertionPoint from './insertion-point';
 import BlockSelectionClearer from '../block-selection-clearer';
 import {
 	getBlockUids,
@@ -250,7 +250,7 @@ class BlockList extends Component {
 
 		return (
 			<BlockSelectionClearer>
-				{ !! blocks.length && <BlockListSiblingInserter /> }
+				{ !! blocks.length && <BlockInsertionPoint /> }
 				{ map( blocks, ( uid ) => (
 					<BlockListBlock
 						key={ 'block-' + uid }

editor/components/block-list/insertion-point.js

@@ -11,20 +11,13 @@ import {
 	getBlockInsertionPoint,
 	isBlockInsertionPointVisible,
 } from '../../store/selectors';
-import {
-	clearSelectedBlock,
-} from '../../store/actions';
 
-/**
- * Component showing the block's insertion point.
- *
- * @param   {Object}       props  React props passed to the component.
- * @returns {Object|false}        Rendered insertion point.
- */
-function BlockListInsertionPoint( { showInsertionPoint } ) {
-	return showInsertionPoint && (
-		<div className="editor-block-list__insertion-point" />
-	);
+function BlockInsertionPoint( { showInsertionPoint } ) {
+	if ( ! showInsertionPoint ) {
+		return null;
+	}
+
+	return <div className="editor-block-list__insertion-point" />;
 }
 
 export default connect(
@@ -39,7 +32,4 @@ export default connect(
 			),
 		};
 	},
-	{
-		clearSelectedBlock,
-	}
-)( BlockListInsertionPoint );
+)( BlockInsertionPoint );

editor/components/block-list/style.scss

@@ -416,6 +416,19 @@
 	}
 }
 
+.editor-block-list__block > .editor-block-list__insertion-point {
+	position: absolute;
+	bottom: -10px;
+	top: auto;
+	left: 0;
+	right: 0;
+
+	@include break-small {
+		left: $block-mover-padding-visible;
+		right: $block-mover-padding-visible;
+	}
+}
+
 .editor-block-list__block .editor-block-list__block-html-textarea {
 	display: block;
 	margin: 0;
@@ -435,83 +448,6 @@
 	}
 }
 
-.editor-block-list__sibling-inserter {
-	z-index: z-index( '.editor-block-list__sibling-inserter' );
-	position: relative;
-
-	&[data-insert-index="0"] {
-		max-width: $visual-editor-max-width + ( 2 * $block-mover-padding-visible ) - ( 2 * $block-padding );
-		margin: 0 auto;
-		@include break-small {
-			max-width: $visual-editor-max-width - ( 2 * $block-padding );
-		}
-	}
-
-	&:before {
-		content: '';
-		position: absolute;
-		left: 0;
-		width: 100%;
-		height: 28px;
-		transition: 0.1s height;
-		transform: translateY( -50% );
-	}
-
-	&:hover:before {
-		height: 44px;
-	}
-
-	.editor-inserter {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate( -50%, -50% );
-		margin: 0;
-	}
-
-	.editor-inserter__toggle {
-		opacity: 0;
-		transition: opacity 0.25s ease-in-out;
-
-		&:not( :focus ) {
-			transition-delay: 0.3s;
-		}
-	}
-
-	&.is-forced-visible .editor-inserter__toggle,
-	&:hover .editor-inserter__toggle,
-	.editor-inserter__toggle:focus {
-		opacity: 1;
-	}
-
-	.editor-inserter__toggle.components-button {
-		margin: 0;
-		padding: 4px;
-		background: $white;
-
-		&:focus {
-			background: $light-gray-300;
-		}
-
-		.dashicon {
-			vertical-align: bottom;
-		}
-	}
-}
-
-.editor-block-list__block > .editor-block-list__sibling-inserter {
-	position: absolute;
-	bottom: 0;
-	top: auto;
-	left: 0;
-	right: 0;
-
-	@include break-small {
-		left: $block-mover-padding-visible;
-		right: $block-mover-padding-visible;
-	}
-}
-
 $sticky-bottom-offset: 20px;
 
 .editor-block-contextual-toolbar {

editor/components/inserter/menu.js

@@ -250,9 +250,7 @@ export class InserterMenu extends Component {
 			return 1; // Move focus forward
 		}
 
-		// Prevent cases of focus being unexpectedly stolen up in the tree,
-		// notably when using VisualEditorSiblingInserter, where focus is
-		// moved to sibling blocks.
+		// Prevent cases of focus being unexpectedly stolen up in the tree.
 		if ( includes( ARROWS, event.keyCode ) ) {
 			return 0; // Don't move focus, but prevent event propagation
 		}