Skip to content

Image/Site Logo: hide crop toolbar when editMediaEntity is unavailable #76626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramonjd merged 2 commits into from
Mar 19, 2026
+42 −16
Merged

Image/Site Logo: hide crop toolbar when editMediaEntity is unavailable #76626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b8b48a
Image/Site Logo: hide crop toolbar when editMediaEntity is unavailable
ramonjd Mar 18, 2026
189d204
Image: Ensure editMediaEntity is checked before allowing image editin…
ramonjd Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions packages/block-library/src/image/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ import {
} from './constants';
import { evalAspectRatio, mediaPosition } from './utils';

const { DimensionsTool, ResolutionTool } = unlock( blockEditorPrivateApis );
const { DimensionsTool, ResolutionTool, mediaEditKey } = unlock(
blockEditorPrivateApis
);

const scaleOptions = [
{
Expand Down Expand Up @@ -342,7 +344,13 @@ export default function Image( {
[ id, isSingleSelected ]
);

const { canInsertCover, imageEditing, imageSizes, maxWidth } = useSelect(
const {
canInsertCover,
imageEditing,
imageSizes,
maxWidth,
editMediaEntity,
} = useSelect(
( select ) => {
const { getBlockRootClientId, canInsertBlockType, getSettings } =
select( blockEditorStore );
Expand All @@ -354,6 +362,7 @@ export default function Image( {
imageEditing: settings.imageEditing,
imageSizes: settings.imageSizes,
maxWidth: settings.maxWidth,
editMediaEntity: settings?.[ mediaEditKey ],
canInsertCover: canInsertBlockType(
'core/cover',
rootClientId
Expand Down Expand Up @@ -550,7 +559,12 @@ export default function Image( {
}
}, [ isSingleSelected ] );

const canEditImage = id && naturalWidth && naturalHeight && imageEditing;
const canEditImage =
id &&
naturalWidth &&
naturalHeight &&
imageEditing &&
!! editMediaEntity;
const allowCrop =
isSingleSelected &&
canEditImage &&
Expand Down Expand Up @@ -762,6 +776,7 @@ export default function Image( {
id &&
isSingleSelected &&
canUserEdit &&
!! editMediaEntity &&
! isExternalImage( id, url ) &&
! isEditingImage &&
onNavigateToEntityRecord && (
Expand Down
37 changes: 24 additions & 13 deletions packages/block-library/src/site-logo/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
store as blockEditorStore,
__experimentalImageEditor as ImageEditor,
useBlockEditingMode,
privateApis as blockEditorPrivateApis,
} from '@wordpress/block-editor';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
Expand All @@ -46,9 +47,11 @@ import { store as noticesStore } from '@wordpress/notices';
*/
import { MIN_SIZE } from '../image/constants';
import { MediaControl, MediaControlPreview } from '../utils/media-control';
import { unlock } from '../lock-unlock';
import { useToolsPanelDropdownMenuProps } from '../utils/hooks';

const ALLOWED_MEDIA_TYPES = [ 'image' ];
const { mediaEditKey } = unlock( blockEditorPrivateApis );

const SiteLogo = ( {
alt,
Expand All @@ -75,18 +78,22 @@ const SiteLogo = ( {
const blockEditingMode = useBlockEditingMode();
const isContentOnlyMode = blockEditingMode === 'contentOnly';

const { imageEditing, maxWidth, title } = useSelect( ( select ) => {
const settings = select( blockEditorStore ).getSettings();
const siteEntities = select( coreStore ).getEntityRecord(
'root',
'__unstableBase'
);
return {
title: siteEntities?.name,
imageEditing: settings.imageEditing,
maxWidth: settings.maxWidth,
};
}, [] );
const { imageEditing, maxWidth, title, editMediaEntity } = useSelect(
( select ) => {
const settings = select( blockEditorStore ).getSettings();
const siteEntities = select( coreStore ).getEntityRecord(
'root',
'__unstableBase'
);
return {
title: siteEntities?.name,
imageEditing: settings.imageEditing,
maxWidth: settings.maxWidth,
editMediaEntity: settings?.[ mediaEditKey ],
};
},
[]
);

useEffect( () => {
// Turn the `Use as site icon` toggle off if it is on but the logo and icon have
Expand Down Expand Up @@ -200,7 +207,11 @@ const SiteLogo = ( {
/* eslint-enable no-lonely-if */

const canEditImage =
logoId && naturalWidth && naturalHeight && imageEditing;
logoId &&
naturalWidth &&
naturalHeight &&
imageEditing &&
!! editMediaEntity;

// Hide crop and dimensions editing in write mode
const shouldShowCropAndDimensions = ! isContentOnlyMode;
Expand Down
Loading