@wordpress/editor 14.46.0 → 14.47.0

package/src/components/post-last-revision/style.scss

@@ -32,6 +32,3 @@
 	}
 }
 
-.editor-private-post-last-revision__button {
-	display: inline-block;
-}

package/src/components/post-locked-modal/index.js

@@ -26,10 +26,13 @@ import { store as editorStore } from '../../store';
 function CollaborationContext() {
 	const { isCollaborationSupported, syncConnectionStatus } = useSelect(
 		( select ) => {
-			const selectors = unlock( select( coreStore ) );
+			const {
+				isCollaborationSupported: isSupported,
+				getSyncConnectionStatus,
+			} = unlock( select( coreStore ) );
 			return {
-				isCollaborationSupported: selectors.isCollaborationSupported(),
-				syncConnectionStatus: selectors.getSyncConnectionStatus(),
+				isCollaborationSupported: isSupported(),
+				syncConnectionStatus: getSyncConnectionStatus(),
 			};
 		},
 		[]
@@ -74,7 +77,6 @@ function PostLockedModal() {
 		previewLink,
 	} = useSelect( ( select ) => {
 		const {
-			isCollaborationEnabledForCurrentPost,
 			isPostLocked,
 			isPostLockTakeover,
 			getPostLockUser,
@@ -83,7 +85,8 @@ function PostLockedModal() {
 			getEditedPostAttribute,
 			getEditedPostPreviewLink,
 			getEditorSettings,
-		} = select( editorStore );
+			isCollaborationEnabledForCurrentPost,
+		} = unlock( select( editorStore ) );
 		const { getPostType } = select( coreStore );
 		return {
 			isCollaborationEnabled: isCollaborationEnabledForCurrentPost(),

package/src/components/post-panel-row/style.scss

@@ -16,6 +16,7 @@
 	padding: 6px 0; // Matches button to ensure alignment
 	line-height: $grid-unit-05 * 5;
 	hyphens: auto;
+	word-break: break-word;
 }
 
 .editor-post-panel__row-control {

package/src/components/post-publish-button/label.js

@@ -9,7 +9,6 @@ import { useViewportMatch } from '@wordpress/compose';
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
-import { ATTACHMENT_POST_TYPE } from '../../store/constants';
 
 /**
  * Renders the label for the publish button.
@@ -28,7 +27,6 @@ export default function PublishButtonLabel() {
 		hasNonPostEntityChanges,
 		postStatusHasChanged,
 		postStatus,
-		postType,
 		isPostSavingLocked,
 	} = useSelect( ( select ) => {
 		const {
@@ -37,7 +35,6 @@ export default function PublishButtonLabel() {
 			isSavingPost,
 			isPublishingPost,
 			getCurrentPost,
-			getCurrentPostType,
 			isAutosavingPost,
 			getPostEdits,
 			getEditedPostAttribute,
@@ -49,7 +46,6 @@ export default function PublishButtonLabel() {
 			isPublishing: isPublishingPost(),
 			hasPublishAction:
 				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
-			postType: getCurrentPostType(),
 			isAutosaving: isAutosavingPost(),
 			hasNonPostEntityChanges:
 				select( editorStore ).hasNonPostEntityChanges(),
@@ -70,13 +66,6 @@ export default function PublishButtonLabel() {
 		return __( 'Saving…' );
 	}
 	if ( ! hasPublishAction ) {
-		// For attachments, always show "Save" since they don't have a publish workflow
-		if (
-			postType === ATTACHMENT_POST_TYPE &&
-			window?.__experimentalMediaEditor
-		) {
-			return __( 'Save' );
-		}
 		// TODO: this is because "Submit for review" string is too long in some languages.
 		// @see https://github.com/WordPress/gutenberg/issues/10475
 		return isSmallerThanMediumViewport

package/src/components/post-publish-panel/prepublish.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Icon, PanelBody } from '@wordpress/components';
+import { Icon as WCIcon, PanelBody } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { wordpress } from '@wordpress/icons';
 import { filterURLForDisplay } from '@wordpress/url';
@@ -53,7 +53,11 @@ function PostPublishPanelPrepublish( { children } ) {
 	}, [] );
 
 	let siteIcon = (
-		<Icon className="components-site-icon" size="36px" icon={ wordpress } />
+		<WCIcon
+			className="components-site-icon"
+			size="36px"
+			icon={ wordpress }
+		/>
 	);
 
 	if ( siteIconUrl ) {

package/src/components/post-revisions-panel/index.js

@@ -145,6 +145,14 @@ function PostRevisionsPanelContent() {
 }
 
 export default function PostRevisionsPanel() {
+	const disableVisualRevisions = useSelect(
+		( select ) =>
+			!! select( editorStore ).getEditorSettings().disableVisualRevisions,
+		[]
+	);
+	if ( disableVisualRevisions ) {
+		return null;
+	}
 	return (
 		<PostLastRevisionCheck>
 			<PostRevisionsPanelContent />

package/src/components/post-revisions-preview/diff-markers.js

@@ -15,7 +15,8 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
-import { Tooltip } from '@wordpress/components';
+// eslint-disable-next-line @wordpress/use-recommended-components -- `Tooltip` is not yet on the recommended `@wordpress/ui` allow-list; landing as a migration step ahead of the wider rollout.
+import { Tooltip } from '@wordpress/ui';
 
 /**
  * Internal dependencies
@@ -98,17 +99,22 @@ function DiffMarkerButton( { clientId, status, subscribe } ) {
 	}
 
 	return (
-		<Tooltip text={ STATUS_LABELS[ status ] }>
-			<button
-				className={ `revision-diff-marker is-${ status }` }
-				style={ {
-					top: `${ position.top }%`,
-					height: `${ Math.max( position.height, 0.5 ) }%`,
-				} }
-				onClick={ () => blockRef.current?.focus() }
-				aria-label={ STATUS_LABELS[ status ] }
+		<Tooltip.Root>
+			<Tooltip.Trigger
+				render={
+					<button
+						className={ `revision-diff-marker is-${ status }` }
+						style={ {
+							top: `${ position.top }%`,
+							height: `${ Math.max( position.height, 0.5 ) }%`,
+						} }
+						onClick={ () => blockRef.current?.focus() }
+						aria-label={ STATUS_LABELS[ status ] }
+					/>
+				}
 			/>
-		</Tooltip>
+			<Tooltip.Popup>{ STATUS_LABELS[ status ] }</Tooltip.Popup>
+		</Tooltip.Root>
 	);
 }
 

package/src/components/post-revisions-preview/revisions-canvas.js

@@ -58,14 +58,20 @@ const REVISION_REMOVED_FILTER_SVG = `
 const REVISION_DIFF_STYLES = `
 	.is-revision-added {
 		box-shadow: inset 0 0 0 9999px color-mix(in srgb, currentColor 5%, #00a32a 15%), 0 0 0 4px color-mix(in srgb, currentColor 5%, #00a32a 15%);
+		outline: 3px solid #00a32a;
+		outline-offset: 2px;
 	}
 	.is-revision-removed,
 	.revision-diff-removed {
 		text-decoration: line-through;
 		filter: url(#revision-removed-filter);
 	}
+	.is-revision-removed {
+		outline: 3px dashed #d63638;
+		outline-offset: 2px;
+	}
 	.is-revision-modified {
-		outline: 2px solid color-mix(in srgb, currentColor 30%, #dba617 70%) !important;
+		outline: 3px dotted #9a7000 !important;
 		outline-offset: 2px;
 	}
 	.revision-diff-added {

package/src/components/post-revisions-preview/style.scss

@@ -35,7 +35,7 @@
 .revision-diff-markers {
 	position: relative;
 	flex-shrink: 0;
-	width: 24px;
+	width: max(16px, 1rem);
 	background: rgba(0, 0, 0, 0.05);
 
 	.revision-diff-marker {
@@ -48,15 +48,15 @@
 		transition: opacity 0.1s ease;
 
 		&.is-added {
-			background: #00a32a;
+			background: #008a20;
 		}
 
 		&.is-removed {
-			background: repeating-linear-gradient(45deg, #d63638, #d63638 3px, rgba(#d63638, 0.45) 3px, rgba(#d63638, 0.45) 6px);
+			background: repeating-linear-gradient(45deg, #d63638, #d63638 6px, rgba(#d63638, 0.45) 6px, rgba(#d63638, 0.45) 8px);
 		}
 
 		&.is-modified {
-			background: repeating-linear-gradient(-45deg, #dba617, #dba617 3px, rgba(#dba617, 0.45) 3px, rgba(#dba617, 0.45) 6px);
+			background: repeating-linear-gradient(-45deg, #9a7000, #9a7000 6px, rgba(#9a7000, 0.45) 6px, rgba(#9a7000, 0.45) 8px);
 		}
 
 		&:hover {

package/src/components/post-taxonomies/check.js

@@ -22,8 +22,7 @@ export default function PostTaxonomiesCheck( { children } ) {
 		const postType = select( editorStore ).getCurrentPostType();
 		const taxonomies = select( coreStore ).getEntityRecords(
 			'root',
-			'taxonomy',
-			{ per_page: -1 }
+			'taxonomy'
 		);
 		return taxonomies?.some( ( taxonomy ) =>
 			taxonomy.types.includes( postType )

package/src/components/post-taxonomies/index.js

@@ -20,8 +20,7 @@ export function PostTaxonomies( { taxonomyWrapper = identity } ) {
 			postType: select( editorStore ).getCurrentPostType(),
 			taxonomies: select( coreStore ).getEntityRecords(
 				'root',
-				'taxonomy',
-				{ per_page: -1 }
+				'taxonomy'
 			),
 		};
 	}, [] );

package/src/components/preferences-modal/index.js

@@ -58,7 +58,7 @@ function PreferencesModalContents( { extraSections = {} } ) {
 	const { showBlockBreadcrumbsOption, showCollaborationOptions } = useSelect(
 		( select ) => {
 			const { getEditorSettings, isCollaborationEnabledForCurrentPost } =
-				select( editorStore );
+				unlock( select( editorStore ) );
 			const { get } = select( preferencesStore );
 			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
 			const isDistractionFreeEnabled = get( 'core', 'distractionFree' );

package/src/components/preview-dropdown/index.js

@@ -12,7 +12,7 @@ import {
 	MenuGroup,
 	MenuItem,
 	MenuItemsChoice,
-	Icon,
+	Icon as WCIcon,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { desktop, mobile, tablet, external, check } from '@wordpress/icons';
@@ -189,7 +189,7 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 								textContent={
 									<>
 										{ __( 'Preview in new tab' ) }
-										<Icon icon={ external } />
+										<WCIcon icon={ external } />
 									</>
 								}
 								onPreview={ onClose }

package/src/components/provider/index.js

@@ -7,7 +7,7 @@ import {
 	useLayoutEffect,
 	useMemo,
 } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import {
 	EntityProvider,
@@ -28,7 +28,6 @@ import { createBlock } from '@wordpress/blocks';
  */
 import withRegistryProvider from './with-registry-provider';
 import { store as editorStore } from '../../store';
-import { ATTACHMENT_POST_TYPE } from '../../store/constants';
 import useBlockEditorSettings from './use-block-editor-settings';
 import { unlock } from '../../lock-unlock';
 import DisableNonPageContentBlocks from './disable-non-page-content-blocks';
@@ -311,6 +310,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			setRenderingMode,
 		} = unlock( useDispatch( editorStore ) );
 		const { editEntityRecord } = useDispatch( coreStore );
+		const registry = useRegistry();
 
 		const onChangeSelection = useCallback(
 			( newSelection ) => {
@@ -335,7 +335,13 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			}
 
 			updatePostLock( settings.postLock );
-			setupEditor( post, initialEdits, settings.template );
+			// `setupEditor` may already have been dispatched by the
+			// editor's pre-mount kickoff (see edit-post's
+			// `initializeEditor`). Skip the redundant dispatch — it
+			// would otherwise re-parse + reset blocks for new posts.
+			if ( ! registry.select( editorStore ).__unstableIsEditorReady() ) {
+				setupEditor( post, initialEdits, settings.template );
+			}
 			if ( settings.autosave ) {
 				createWarningNotice(
 					__(
@@ -401,31 +407,6 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			return null;
 		}
 
-		const isAttachment =
-			post.type === ATTACHMENT_POST_TYPE &&
-			window?.__experimentalMediaEditor;
-
-		// Early return for attachments - no block editor needed
-		if ( isAttachment ) {
-			return (
-				<EntityProvider kind="root" type="site">
-					<EntityProvider
-						kind="postType"
-						type={ post.type }
-						id={ post.id }
-					>
-						{ children }
-						{ ! settings.isPreviewMode && (
-							<>
-								<EditorKeyboardShortcuts />
-								<KeyboardShortcutHelpModal />
-							</>
-						) }
-					</EntityProvider>
-				</EntityProvider>
-			);
-		}
-
 		return (
 			<EntityProvider kind="root" type="site">
 				<EntityProvider
@@ -466,9 +447,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 									<StartTemplateOptions />
 									<PatternRenameModal />
 									<PatternDuplicateModal />
-									{ window?.__experimentalMediaEditorModal && (
-										<MediaEditorModalMount />
-									) }
+									<MediaEditorModalMount />
 								</>
 							) }
 						</BlockEditorProviderComponent>

package/src/components/provider/use-block-editor-settings.js

@@ -27,9 +27,10 @@ import { mediaUpload } from '../../utils';
 import mediaUploadOnSuccess from '../../utils/media-upload/on-success';
 import { default as mediaSideload } from '../../utils/media-sideload';
 import { default as mediaFinalize } from '../../utils/media-finalize';
+import { default as mediaDelete } from '../../utils/media-delete';
 import { store as editorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import { useGlobalStylesContext } from '../global-styles-provider';
+import { useGlobalStyles } from '../global-styles';
 
 const { store: mediaEditorStore } = unlock( mediaEditorPrivateApis );
 
@@ -44,6 +45,10 @@ function __experimentalReusableBlocksSelect( select ) {
 	} );
 }
 
+function __experimentalUserPatternCategoriesSelect( select ) {
+	return select( coreStore ).getUserPatternCategories();
+}
+
 const BLOCK_EDITOR_SETTINGS = [
 	'__experimentalBlockBindingsSupportedAttributes',
 	'__experimentalBlockDirectory',
@@ -102,11 +107,13 @@ const {
 	globalStylesLinksDataKey,
 	selectBlockPatternsKey,
 	reusableBlocksSelectKey,
+	userPatternCategoriesSelectKey,
 	sectionRootClientIdKey,
 	mediaEditKey,
 	getMediaSelectKey,
 	isIsolatedEditorKey,
 	deviceTypeKey,
+	onViewportStateChangeKey,
 	isNavigationOverlayContextKey,
 	isNavigationPostEditorKey,
 	mediaUploadOnSuccessKey,
@@ -140,7 +147,6 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		userCanCreatePages,
 		pageOnFront,
 		pageForPosts,
-		userPatternCategories,
 		restBlockPatternCategories,
 		sectionRootClientId,
 		deviceType,
@@ -152,7 +158,6 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				canUser,
 				getRawEntityRecord,
 				getEntityRecord,
-				getUserPatternCategories,
 				getBlockPatternCategories,
 			} = select( coreStore );
 			const { get } = select( preferencesStore );
@@ -215,7 +220,6 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				} ),
 				pageOnFront: siteSettings?.page_on_front,
 				pageForPosts: siteSettings?.page_for_posts,
-				userPatternCategories: getUserPatternCategories(),
 				restBlockPatternCategories: getBlockPatternCategories(),
 				sectionRootClientId: getSectionRootBlock(),
 				deviceType: getDeviceType(),
@@ -233,7 +237,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		[ postType, postId, isLargeViewport, renderingMode ]
 	);
 
-	const { merged: mergedGlobalStyles } = useGlobalStylesContext();
+	const { merged: mergedGlobalStyles } = useGlobalStyles();
 	const globalStylesData = mergedGlobalStyles.styles ?? EMPTY_OBJECT;
 	const globalStylesLinksData = mergedGlobalStyles._links ?? EMPTY_OBJECT;
 
@@ -271,6 +275,9 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 	);
 
 	const { undo, setIsInserterOpened } = useDispatch( editorStore );
+	const { updateDeviceTypeForViewportState } = unlock(
+		useDispatch( editorStore )
+	);
 	const { editMediaEntity } = unlock( useDispatch( coreStore ) );
 	const { saveEntityRecord } = useDispatch( coreStore );
 	const { openMediaEditorModal } = useDispatch( mediaEditorStore );
@@ -344,16 +351,15 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 			[ mediaEditKey ]: hasUploadPermissions
 				? editMediaEntity
 				: undefined,
-			[ openMediaEditorModalKey ]: window?.__experimentalMediaEditorModal
-				? ( { id, onUpdate } ) =>
-						openMediaEditorModal( { id, onUpdate } )
-				: undefined,
+			[ openMediaEditorModalKey ]: ( { id, onUpdate } ) =>
+				openMediaEditorModal( { id, onUpdate } ),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			[ mediaUploadOnSuccessKey ]: hasUploadPermissions
 				? mediaUploadOnSuccess
 				: undefined,
 			mediaSideload: hasUploadPermissions ? mediaSideload : undefined,
 			mediaFinalize: hasUploadPermissions ? mediaFinalize : undefined,
+			mediaDelete: hasUploadPermissions ? mediaDelete : undefined,
 			__experimentalBlockPatterns: blockPatterns,
 			[ selectBlockPatternsKey ]: ( select ) => {
 				const { hasFinishedResolution, getBlockPatternsForPostType } =
@@ -364,8 +370,9 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 					: undefined;
 			},
 			[ reusableBlocksSelectKey ]: __experimentalReusableBlocksSelect,
+			[ userPatternCategoriesSelectKey ]:
+				__experimentalUserPatternCategoriesSelect,
 			__experimentalBlockPatternCategories: blockPatternCategories,
-			__experimentalUserPatternCategories: userPatternCategories,
 			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>
 				fetchLinkSuggestions( search, searchOptions, settings ),
 			inserterMediaCategories,
@@ -409,6 +416,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 			disableContentOnlyForTemplateParts:
 				renderingMode === 'template-locked',
 			...( deviceType ? { [ deviceTypeKey ]: deviceType } : {} ),
+			[ onViewportStateChangeKey ]: updateDeviceTypeForViewportState,
 			[ isNavigationOverlayContextKey ]: isNavigationOverlayContext,
 		};
 
@@ -428,7 +436,6 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		keepCaretInsideBlock,
 		settings,
 		hasUploadPermissions,
-		userPatternCategories,
 		blockPatterns,
 		blockPatternCategories,
 		canUseUnfilteredHTML,
@@ -445,7 +452,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		renderingMode,
 		editMediaEntity,
 		openMediaEditorModal,
-		settings.onNavigateToEntityRecord,
+		updateDeviceTypeForViewportState,
 		deviceType,
 		allImageSizes,
 		bigImageSizeThreshold,

package/src/components/resizable-editor/resize-handle.js

@@ -3,8 +3,9 @@
  */
 import { __ } from '@wordpress/i18n';
 import { LEFT, RIGHT } from '@wordpress/keycodes';
-import { Tooltip, __unstableMotion as motion } from '@wordpress/components';
-import { VisuallyHidden } from '@wordpress/ui';
+import { __unstableMotion as motion } from '@wordpress/components';
+// eslint-disable-next-line @wordpress/use-recommended-components -- `Tooltip` is not yet on the recommended `@wordpress/ui` allow-list; landing as a migration step ahead of the wider rollout.
+import { Tooltip, VisuallyHidden } from '@wordpress/ui';
 
 const DELTA_DISTANCE = 20; // The distance to resize per keydown in pixels.
 
@@ -41,21 +42,26 @@ export default function ResizeHandle( { direction, resizeWidthBy } ) {
 
 	return (
 		<>
-			<Tooltip text={ __( 'Drag to resize' ) }>
-				<motion.button
-					className={ `editor-resizable-editor__resize-handle is-${ direction }` }
-					aria-label={ __( 'Drag to resize' ) }
-					aria-describedby={ resizableHandleHelpId }
-					onKeyDown={ handleKeyDown }
-					variants={ resizeHandleVariants }
-					whileFocus="active"
-					whileHover="active"
-					whileTap="active"
-					key="handle"
-					role="separator"
-					aria-orientation="vertical"
+			<Tooltip.Root>
+				<Tooltip.Trigger
+					render={
+						<motion.button
+							className={ `editor-resizable-editor__resize-handle is-${ direction }` }
+							aria-label={ __( 'Drag to resize' ) }
+							aria-describedby={ resizableHandleHelpId }
+							onKeyDown={ handleKeyDown }
+							variants={ resizeHandleVariants }
+							whileFocus="active"
+							whileHover="active"
+							whileTap="active"
+							key="handle"
+							role="separator"
+							aria-orientation="vertical"
+						/>
+					}
 				/>
-			</Tooltip>
+				<Tooltip.Popup>{ __( 'Drag to resize' ) }</Tooltip.Popup>
+			</Tooltip.Root>
 			<VisuallyHidden id={ resizableHandleHelpId }>
 				{ __( 'Use left and right arrow keys to resize the canvas.' ) }
 			</VisuallyHidden>

package/src/components/sidebar/header.js

@@ -11,30 +11,22 @@ import { decodeEntities } from '@wordpress/html-entities';
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
-import { ATTACHMENT_POST_TYPE } from '../../store/constants';
 import { unlock } from '../../lock-unlock';
 import { sidebars } from './constants';
 
 const { Tabs } = unlock( componentsPrivateApis );
 
 const SidebarHeader = ( _, ref ) => {
-	const { postTypeLabel, isAttachment, isRevisionsMode } = useSelect(
-		( select ) => {
-			const { getPostTypeLabel, getCurrentPostType } =
-				select( editorStore );
-			const { isRevisionsMode: _isRevisionsMode } = unlock(
-				select( editorStore )
-			);
-			return {
-				postTypeLabel: getPostTypeLabel(),
-				isAttachment:
-					getCurrentPostType() === ATTACHMENT_POST_TYPE &&
-					window?.__experimentalMediaEditor,
-				isRevisionsMode: _isRevisionsMode(),
-			};
-		},
-		[]
-	);
+	const { postTypeLabel, isRevisionsMode } = useSelect( ( select ) => {
+		const { getPostTypeLabel } = select( editorStore );
+		const { isRevisionsMode: _isRevisionsMode } = unlock(
+			select( editorStore )
+		);
+		return {
+			postTypeLabel: getPostTypeLabel(),
+			isRevisionsMode: _isRevisionsMode(),
+		};
+	}, [] );
 
 	let documentLabel;
 	if ( isRevisionsMode ) {
@@ -55,16 +47,14 @@ const SidebarHeader = ( _, ref ) => {
 			>
 				{ documentLabel }
 			</Tabs.Tab>
-			{ ! isAttachment && (
-				<Tabs.Tab
-					tabId={ sidebars.block }
-					// Used for focus management in the SettingsSidebar component.
-					data-tab-id={ sidebars.block }
-				>
-					{ /* translators: Text label for the Block Settings Sidebar tab. */ }
-					{ __( 'Block' ) }
-				</Tabs.Tab>
-			) }
+			<Tabs.Tab
+				tabId={ sidebars.block }
+				// Used for focus management in the SettingsSidebar component.
+				data-tab-id={ sidebars.block }
+			>
+				{ /* translators: Text label for the Block Settings Sidebar tab. */ }
+				{ __( 'Block' ) }
+			</Tabs.Tab>
 		</Tabs.TabList>
 	);
 };

package/src/components/sidebar/index.js

@@ -33,7 +33,6 @@ import SidebarHeader from './header';
 import TemplateActionsPanel from '../template-actions-panel';
 import TemplateContentPanel from '../template-content-panel';
 import TemplatePartContentPanel from '../template-part-content-panel';
-import { MediaMetadataPanel } from '../media';
 import PostRevisionsPanel from '../post-revisions-panel';
 import RevisionBlockDiffPanel from '../revision-block-diff';
 import useAutoSwitchEditorSidebars from '../provider/use-auto-switch-editor-sidebars';
@@ -41,7 +40,6 @@ import { sidebars } from './constants';
 import { unlock } from '../../lock-unlock';
 import { store as editorStore } from '../../store';
 import {
-	ATTACHMENT_POST_TYPE,
 	NAVIGATION_POST_TYPE,
 	TEMPLATE_PART_POST_TYPE,
 	TEMPLATE_POST_TYPE,
@@ -66,7 +64,6 @@ const SidebarContent = ( {
 	// need to forward the `Tabs` context so it can be passed through the
 	// underlying slot/fill.
 	const tabsContextValue = useContext( Tabs.Context );
-	const isAttachment = postType === ATTACHMENT_POST_TYPE;
 	const isRevisionsMode = useSelect( ( select ) => {
 		return unlock( select( editorStore ) ).isRevisionsMode();
 	} );
@@ -99,11 +96,7 @@ const SidebarContent = ( {
 	}, [ tabName ] );
 
 	let tabContent;
-	if ( isAttachment ) {
-		tabContent = (
-			<MediaMetadataPanel onActionPerformed={ onActionPerformed } />
-		);
-	} else if ( isRevisionsMode ) {
+	if ( isRevisionsMode ) {
 		tabContent = <PostRevisionSummary />;
 	} else {
 		tabContent = (
@@ -159,12 +152,10 @@ const SidebarContent = ( {
 				<Tabs.TabPanel tabId={ sidebars.document } focusable={ false }>
 					{ tabContent }
 				</Tabs.TabPanel>
-				{ ! isAttachment && (
-					<Tabs.TabPanel tabId={ sidebars.block } focusable={ false }>
-						<BlockInspector />
-						{ isRevisionsMode && <RevisionBlockDiffPanel /> }
-					</Tabs.TabPanel>
-				) }
+				<Tabs.TabPanel tabId={ sidebars.block } focusable={ false }>
+					<BlockInspector />
+					{ isRevisionsMode && <RevisionBlockDiffPanel /> }
+				</Tabs.TabPanel>
 			</Tabs.Context.Provider>
 		</PluginSidebar>
 	);