Block toolbar and context menu: hide pattern actions in Revisions UI (#76066)

Co-authored-by: ramonjd <[email protected]>
Co-authored-by: talldan <[email protected]>
Co-authored-by: ellatrix <[email protected]>
Co-authored-by: andrewserong <[email protected]>

Author: 4 people

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

@@ -78,7 +78,9 @@ export function PrivateBlockToolbar( {
 		showBlockVisibilityButton,
 		showSwitchSectionStyleButton,
 		areSelectedBlocksHiddenOnViewport,
+		canEdit,
 	} = useSelect( ( select ) => {
+		const { canEditBlock } = select( blockEditorStore );
 		const {
 			getBlockName,
 			getBlockMode,
@@ -122,7 +124,9 @@ export function PrivateBlockToolbar( {
 
 		const _isZoomOut = isZoomOut();
 		const _isSectionBlock = isSectionBlock( selectedBlockClientId );
-		const _showSwitchSectionStyleButton = _isZoomOut || _isSectionBlock;
+		const _canEditBlock = canEditBlock( selectedBlockClientId );
+		const _showSwitchSectionStyleButton =
+			_canEditBlock && ( _isZoomOut || _isSectionBlock );
 
 		const _currentDeviceType =
 			getSettings()?.[ deviceTypeKey ]?.toLowerCase() || 'desktop';
@@ -161,6 +165,7 @@ export function PrivateBlockToolbar( {
 			showSwitchSectionStyleButton: _showSwitchSectionStyleButton,
 			areSelectedBlocksHiddenOnViewport:
 				_areSelectedBlocksHiddenOnViewport,
+			canEdit: _canEditBlock,
 		};
 	}, [] );
 
@@ -245,7 +250,7 @@ export function PrivateBlockToolbar( {
 					shouldShowVisualToolbar &&
 					isMultiToolbar &&
 					showGroupButtons && <BlockGroupToolbar /> }
-				{ ! isMultiToolbar && (
+				{ ! isMultiToolbar && canEdit && (
 					<EditSectionButton clientId={ blockClientIds[ 0 ] } />
 				) }
 				{ ! areSelectedBlocksHiddenOnViewport && showShuffleButton && (

packages/patterns/src/components/patterns-manage-button.js

@@ -23,9 +23,11 @@ function PatternsManageButton( { clientId } ) {
 		managePatternsUrl,
 		isSyncedPattern,
 		isUnsyncedPattern,
+		canEdit,
 	} = useSelect(
 		( select ) => {
-			const { canRemoveBlock, getBlock } = select( blockEditorStore );
+			const { canRemoveBlock, getBlock, canEditBlock } =
+				select( blockEditorStore );
 			const { canUser } = select( coreStore );
 			const block = getBlock( clientId );
 
@@ -43,6 +45,7 @@ function PatternsManageButton( { clientId } ) {
 
 			return {
 				attributes: block.attributes,
+				canEdit: canEditBlock( clientId ),
 				// For unsynced patterns, detaching is simply removing the `patternName` attribute.
 				// For synced patterns, the `core:block` block is replaced with its inner blocks,
 				// so checking whether `canRemoveBlock` is possible is required.
@@ -78,7 +81,7 @@ function PatternsManageButton( { clientId } ) {
 		useDispatch( patternsStore )
 	);
 
-	if ( ! isVisible ) {
+	if ( ! isVisible || ! canEdit ) {
 		return null;
 	}