Move bindings selector logic to toolbar

packages/block-editor/src/components/block-bindings-indicator/index.js

@@ -2,27 +2,11 @@
  * WordPress dependencies
  */
 import { ToolbarItem, ToolbarGroup, Icon } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
 import { connection } from '@wordpress/icons';
 import { _x } from '@wordpress/i18n';
 
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-
-export default function BlockBindingsIndicator( { clientId } ) {
-	const isConnected = useSelect(
-		( select ) => {
-			const attributes =
-				select( blockEditorStore ).getBlockAttributes( clientId );
-
-			return !! attributes?.metadata?.bindings;
-		},
-		[ clientId ]
-	);
-
-	return isConnected ? (
+export default function BlockBindingsIndicator() {
+	return (
 		<ToolbarGroup>
 			<ToolbarItem
 				as={ 'div' }
@@ -32,5 +16,5 @@ export default function BlockBindingsIndicator( { clientId } ) {
 				<Icon icon={ connection } size={ 24 } />
 			</ToolbarItem>
 		</ToolbarGroup>
-	) : null;
+	);
 }

packages/block-editor/src/components/block-toolbar/index.js

@@ -64,6 +64,7 @@ export function PrivateBlockToolbar( {
 		blockType,
 		shouldShowVisualToolbar,
 		showParentSelector,
+		isUsingBindings,
 	} = useSelect( ( select ) => {
 		const {
 			getBlockName,
@@ -73,6 +74,7 @@ export function PrivateBlockToolbar( {
 			isBlockValid,
 			getBlockRootClientId,
 			getBlockEditingMode,
+			getBlockAttributes,
 		} = select( blockEditorStore );
 		const selectedBlockClientIds = getSelectedBlockClientIds();
 		const selectedBlockClientId = selectedBlockClientIds[ 0 ];
@@ -89,6 +91,8 @@ export function PrivateBlockToolbar( {
 		const isVisual = selectedBlockClientIds.every(
 			( id ) => getBlockMode( id ) === 'visual'
 		);
+		const _isUsingBindings = !! getBlockAttributes( selectedBlockClientId )
+			?.metadata?.bindings;
 		return {
 			blockClientId: selectedBlockClientId,
 			blockClientIds: selectedBlockClientIds,
@@ -109,6 +113,7 @@ export function PrivateBlockToolbar( {
 				) &&
 				selectedBlockClientIds.length === 1 &&
 				_isDefaultEditingMode,
+			isUsingBindings: _isUsingBindings,
 		};
 	}, [] );
 
@@ -167,7 +172,7 @@ export function PrivateBlockToolbar( {
 				{ ! isMultiToolbar &&
 					isLargeViewport &&
 					isDefaultEditingMode && <BlockParentSelector /> }
-				<BlockBindingsIndicator clientId={ blockClientId } />
+				{ isUsingBindings && <BlockBindingsIndicator /> }
 				{ ( shouldShowVisualToolbar || isMultiToolbar ) &&
 					isDefaultEditingMode && (
 						<div