From a437dbdf238c362cdcadf72cf59e53cb3af85e0e Mon Sep 17 00:00:00 2001
From: jbinda <jakub.binda@gmail.com>
Date: Wed, 4 Mar 2020 12:53:45 +0100
Subject: [PATCH] Revert "enable FloatingToolbar for all blocks" (#20527)

This reverts commit bc89a8109d7ac94e0d9f5c18dc5303e3c2d32f3a.
---
 .../src/components/block-list/block.native.js            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index 835cab6b9ba107..d72d494b641cce 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -189,6 +189,7 @@ class BlockListBlock extends Component {
 			title,
 			parentId,
 			isTouchable,
+			showFloatingToolbar,
 		} = this.props;
 
 		const accessibilityLabel = getAccessibleBlockLabel(
@@ -204,7 +205,7 @@ class BlockListBlock extends Component {
 				accessibilityRole={ 'button' }
 			>
 				<View accessibilityLabel={ accessibilityLabel }>
-					{ isSelected && (
+					{ showFloatingToolbar && (
 						<FloatingToolbar>
 							<Toolbar passedStyle={ styles.toolbar }>
 								<ToolbarButton
@@ -252,6 +253,7 @@ export default compose( [
 			__unstableGetBlockWithoutInnerBlocks,
 			getBlockHierarchyRootClientId,
 			getSelectedBlockClientId,
+			getBlock,
 			getBlockRootClientId,
 			getLowestCommonAncestorWithSelectedBlock,
 			getBlockParents,
@@ -273,6 +275,10 @@ export default compose( [
 		const parentId = parents[ 0 ] || '';
 
 		const rootBlockId = getBlockHierarchyRootClientId( clientId );
+		const rootBlock = getBlock( rootBlockId );
+		const hasRootInnerBlocks = rootBlock.innerBlocks.length !== 0;
+
+		const showFloatingToolbar = isSelected && hasRootInnerBlocks;
 
 		const selectedBlockClientId = getSelectedBlockClientId();
 
@@ -333,6 +339,7 @@ export default compose( [
 			isTouchable,
 			isDimmed,
 			isUnregisteredBlock,
+			showFloatingToolbar,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, { select } ) => {