From 450f03b831ac1542a32d78e282c7edc512c45b5a Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 26 Feb 2021 08:39:44 +0100
Subject: [PATCH] normalize the slot names

---
 packages/block-editor/src/components/block-controls/index.js | 4 ++--
 packages/block-editor/src/components/block-toolbar/index.js  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/block-controls/index.js b/packages/block-editor/src/components/block-controls/index.js
index d2f31c78e5759..c3648b06b2eef 100644
--- a/packages/block-editor/src/components/block-controls/index.js
+++ b/packages/block-editor/src/components/block-controls/index.js
@@ -20,7 +20,7 @@ import {
 import useDisplayBlockControls from '../use-display-block-controls';
 
 const BlockControlsDefault = createSlotFill( 'BlockControls' );
-const BlockControlsBlock = createSlotFill( 'BlockFormatControlsBlock' );
+const BlockControlsBlock = createSlotFill( 'BlockControlsBlock' );
 const BlockControlsInline = createSlotFill( 'BlockFormatControls' );
 const BlockControlsOther = createSlotFill( 'BlockControlsOther' );
 
@@ -33,7 +33,7 @@ const segments = {
 
 const slotNames = {
 	default: 'BlockControls',
-	block: 'BlockFormatControlsBlock',
+	block: 'BlockControlsBlock',
 	inline: 'BlockFormatControls',
 	other: 'BlockControlsOther',
 };
diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index 4a8db954ded68..9bf99e4f74bc8 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -123,7 +123,6 @@ export default function BlockToolbar( { hideDragHandle } ) {
 			</div>
 			{ shouldShowVisualToolbar && (
 				<>
-					{ ' ' }
 					<BlockControls.Slot
 						segment="block"
 						className="block-editor-block-toolbar__slot"