Only show block icon in toolbar for contentOnly blocks when block is …

…a synced block (#60647)



Co-authored-by: noisysocks <noisysocks@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: retrofox <retrofox@git.wordpress.org>

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

@@ -170,29 +170,33 @@ export function PrivateBlockToolbar( {
 				{ isUsingBindings && canBindBlock( blockName ) && (
 					<BlockBindingsIndicator />
 				) }
-				{ ( shouldShowVisualToolbar || isMultiToolbar ) && (
-					<div ref={ nodeRef } { ...showHoveredOrFocusedGestures }>
-						<ToolbarGroup className="block-editor-block-toolbar__block-controls">
-							<BlockSwitcher
-								clientIds={ blockClientIds }
-								disabled={ ! isDefaultEditingMode }
-							/>
-							{ isDefaultEditingMode && (
-								<>
-									{ ! isMultiToolbar && (
-										<BlockLockToolbar
-											clientId={ blockClientId }
+				{ ( shouldShowVisualToolbar || isMultiToolbar ) &&
+					( isDefaultEditingMode || isSynced ) && (
+						<div
+							ref={ nodeRef }
+							{ ...showHoveredOrFocusedGestures }
+						>
+							<ToolbarGroup className="block-editor-block-toolbar__block-controls">
+								<BlockSwitcher
+									clientIds={ blockClientIds }
+									disabled={ ! isDefaultEditingMode }
+								/>
+								{ isDefaultEditingMode && (
+									<>
+										{ ! isMultiToolbar && (
+											<BlockLockToolbar
+												clientId={ blockClientId }
+											/>
+										) }
+										<BlockMover
+											clientIds={ blockClientIds }
+											hideDragHandle={ hideDragHandle }
 										/>
-									) }
-									<BlockMover
-										clientIds={ blockClientIds }
-										hideDragHandle={ hideDragHandle }
-									/>
-								</>
-							) }
-						</ToolbarGroup>
-					</div>
-				) }
+									</>
+								) }
+							</ToolbarGroup>
+						</div>
+					) }
 				<Shuffle clientId={ blockClientId } />
 				{ shouldShowVisualToolbar && isMultiToolbar && (
 					<BlockGroupToolbar />