Try: hide rich text toolbar if no selection

Limit the content only toolbar for headings and paragraphs to only show if there is a text selection

packages/block-editor/src/components/block-tools/block-toolbar-popover.js

@@ -22,8 +22,13 @@ export default function BlockToolbarPopover( {
 	isTyping,
 	__unstableContentRef,
 } ) {
-	const { capturingClientId, isInsertionPointVisible, lastClientId } =
-		useSelectedBlockToolProps( clientId );
+	const {
+		capturingClientId,
+		isInsertionPointVisible,
+		lastClientId,
+		isContentOnlyRichTextBlock,
+		hasTextSelection,
+	} = useSelectedBlockToolProps( clientId );
 
 	// Stores the active toolbar item index so the block toolbar can return focus
 	// to it when re-mounting.
@@ -56,8 +61,12 @@ export default function BlockToolbarPopover( {
 		clientId: clientIdToPositionOver,
 	} );
 
+	const showBlockToolbar =
+		( ! isTyping && ! isContentOnlyRichTextBlock ) ||
+		( isContentOnlyRichTextBlock && hasTextSelection );
+
 	return (
-		! isTyping && (
+		showBlockToolbar && (
 			<BlockPopover
 				clientId={ clientIdToPositionOver }
 				bottomClientId={ lastClientId }

packages/block-editor/src/components/block-tools/use-selected-block-tool-props.js

@@ -8,6 +8,8 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as blockEditorStore } from '../../store';
 
+const CONTENT_ONLY_RICH_TEXT_BLOCKS = [ 'core/paragraph', 'core/heading' ];
+
 /**
  * Returns props for the selected block tools and empty block inserter.
  *
@@ -24,7 +26,11 @@ export default function useSelectedBlockToolProps( clientId ) {
 				getBlockInsertionPoint,
 				getBlockOrder,
 				hasMultiSelection,
+				getSelectionStart,
+				getSelectionEnd,
 				getLastMultiSelectedBlockClientId,
+				getBlockEditingMode,
+				getBlockName,
 			} = select( blockEditorStore );
 
 			const blockParentsClientIds = getBlockParents( clientId );
@@ -50,13 +56,24 @@ export default function useSelectedBlockToolProps( clientId ) {
 					order[ insertionPoint.index ] === clientId;
 			}
 
+			const _hasMultiSelection = hasMultiSelection();
+
 			return {
 				capturingClientId,
 				isInsertionPointVisible,
-				lastClientId: hasMultiSelection()
+				lastClientId: _hasMultiSelection
 					? getLastMultiSelectedBlockClientId()
 					: null,
 				rootClientId: getBlockRootClientId( clientId ),
+				isContentOnlyRichTextBlock:
+					getBlockEditingMode( clientId ) === 'contentOnly' &&
+					CONTENT_ONLY_RICH_TEXT_BLOCKS.includes(
+						getBlockName( clientId )
+					),
+				// Maybe rely on documentHasTextSelection instead?
+				hasTextSelection:
+					! _hasMultiSelection &&
+					getSelectionStart().offset !== getSelectionEnd().offset,
 			};
 		},
 		[ clientId ]