@wordpress/block-editor 15.13.2-next.v.202602271551.0 → 15.13.2

package/build-style/content-rtl.css

@@ -199,6 +199,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   outline-style: solid;
   outline-width: calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
   outline-offset: calc(1 * -1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
+  box-shadow: inset 0 0 0 calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1) + 0.5px) rgba(255, 255, 255, 0.7);
   z-index: 1;
 }
 .block-editor-block-list__layout .block-editor-block-list__block.is-block-hidden {
@@ -264,6 +265,18 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
 .block-editor-block-list__layout .block-editor-block-list__block.has-warning .block-editor-warning {
   pointer-events: all;
 }
+.block-editor-block-list__layout .block-editor-block-list__block.has-warning::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(255, 255, 255, 0.4);
+}
+.block-editor-block-list__layout .block-editor-block-list__block.has-warning.is-multi-selected::after {
+  background-color: transparent;
+}
 .block-editor-block-list__layout .block-editor-block-list__block[data-clear=true] {
   float: none;
 }
@@ -293,6 +306,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   outline-style: solid;
   outline-width: calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
   outline-offset: calc(1 * -1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
+  box-shadow: inset 0 0 0 calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1) + 0.5px) rgba(255, 255, 255, 0.7);
 }
 
 .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-hovered::after, .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-selected::after, .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-highlighted::after,
@@ -432,7 +446,6 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   font-family: Menlo, Consolas, monaco, monospace;
   font-size: 15px;
   line-height: 1.5;
-  direction: ltr;
 }
 @media not (prefers-reduced-motion) {
   .block-editor-block-list__block .block-editor-block-list__block-html-textarea {
@@ -443,6 +456,17 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 }
 
+/**
+ * Warnings.
+ */
+.block-editor-block-list__block .block-editor-warning {
+  z-index: 5;
+  position: relative;
+}
+.block-editor-block-list__block .block-editor-warning.block-editor-block-list__block-crash-warning {
+  margin-bottom: auto;
+}
+
 .block-editor-block-list__zoom-out-separator {
   /* same color as the iframe's background */
   background: #ddd;

package/build-style/content.css

@@ -199,6 +199,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   outline-style: solid;
   outline-width: calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
   outline-offset: calc(1 * -1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
+  box-shadow: inset 0 0 0 calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1) + 0.5px) rgba(255, 255, 255, 0.7);
   z-index: 1;
 }
 .block-editor-block-list__layout .block-editor-block-list__block.is-block-hidden {
@@ -264,6 +265,18 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
 .block-editor-block-list__layout .block-editor-block-list__block.has-warning .block-editor-warning {
   pointer-events: all;
 }
+.block-editor-block-list__layout .block-editor-block-list__block.has-warning::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background-color: rgba(255, 255, 255, 0.4);
+}
+.block-editor-block-list__layout .block-editor-block-list__block.has-warning.is-multi-selected::after {
+  background-color: transparent;
+}
 .block-editor-block-list__layout .block-editor-block-list__block[data-clear=true] {
   float: none;
 }
@@ -293,6 +306,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   outline-style: solid;
   outline-width: calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
   outline-offset: calc(1 * -1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1));
+  box-shadow: inset 0 0 0 calc(1 * var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1) + 0.5px) rgba(255, 255, 255, 0.7);
 }
 
 .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-hovered::after, .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-selected::after, .is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.is-highlighted::after,
@@ -432,8 +446,6 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   font-family: Menlo, Consolas, monaco, monospace;
   font-size: 15px;
   line-height: 1.5;
-  /*rtl:ignore*/
-  direction: ltr;
 }
 @media not (prefers-reduced-motion) {
   .block-editor-block-list__block .block-editor-block-list__block-html-textarea {
@@ -444,6 +456,17 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 }
 
+/**
+ * Warnings.
+ */
+.block-editor-block-list__block .block-editor-warning {
+  z-index: 5;
+  position: relative;
+}
+.block-editor-block-list__block .block-editor-warning.block-editor-block-list__block-crash-warning {
+  margin-bottom: auto;
+}
+
 .block-editor-block-list__zoom-out-separator {
   /* same color as the iframe's background */
   background: #ddd;

package/build-style/style-rtl.css

@@ -502,6 +502,9 @@ iframe[name=editor-canvas] {
   right: auto;
   margin-right: -1px;
 }
+.show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-parent-selector::after {
+  display: inline-flex;
+}
 .show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-mover__move-button-container,
 .show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-toolbar__block-controls .block-editor-block-mover {
   border-right: 1px solid #1e1e1e;

package/build-style/style.css

@@ -502,6 +502,9 @@ iframe[name=editor-canvas] {
   left: auto;
   margin-left: -1px;
 }
+.show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-parent-selector::after {
+  display: inline-flex;
+}
 .show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-mover__move-button-container,
 .show-icon-labels .components-popover.block-editor-block-list__block-popover .block-editor-block-toolbar__block-controls .block-editor-block-mover {
   border-left: 1px solid #1e1e1e;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "15.13.2-next.v.202602271551.0+464abe399",
+	"version": "15.13.2",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -61,43 +61,43 @@
 	],
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/api-fetch": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/base-styles": "^6.16.1-next.v.202602271551.0+464abe399",
-		"@wordpress/blob": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/block-serialization-default-parser": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/blocks": "^15.13.1-next.v.202602271551.0+464abe399",
-		"@wordpress/commands": "^1.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/components": "^32.3.1-next.v.202602271551.0+464abe399",
-		"@wordpress/compose": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/data": "^10.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/dataviews": "^12.1.1-next.v.202602271551.0+464abe399",
-		"@wordpress/date": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/deprecated": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/dom": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/element": "^6.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/escape-html": "^3.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/global-styles-engine": "^1.7.1-next.v.202602271551.0+464abe399",
-		"@wordpress/hooks": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/html-entities": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/i18n": "^6.13.1-next.v.202602271551.0+464abe399",
-		"@wordpress/icons": "^11.7.1-next.v.202602271551.0+464abe399",
-		"@wordpress/image-cropper": "^1.4.1-next.v.202602271551.0+464abe399",
-		"@wordpress/interactivity": "^6.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/is-shallow-equal": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/keyboard-shortcuts": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/keycodes": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/notices": "^5.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/preferences": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/priority-queue": "^3.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/private-apis": "^1.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/rich-text": "^7.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/style-engine": "^2.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/token-list": "^3.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/upload-media": "^0.25.2-next.v.202602271551.0+464abe399",
-		"@wordpress/url": "^4.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/warning": "^3.40.1-next.v.202602271551.0+464abe399",
-		"@wordpress/wordcount": "^4.40.1-next.v.202602271551.0+464abe399",
+		"@wordpress/a11y": "^4.40.1",
+		"@wordpress/api-fetch": "^7.40.1",
+		"@wordpress/base-styles": "^6.16.1",
+		"@wordpress/blob": "^4.40.1",
+		"@wordpress/block-serialization-default-parser": "^5.40.1",
+		"@wordpress/blocks": "^15.13.1",
+		"@wordpress/commands": "^1.40.1",
+		"@wordpress/components": "^32.2.1",
+		"@wordpress/compose": "^7.40.1",
+		"@wordpress/data": "^10.40.1",
+		"@wordpress/dataviews": "^12.0.1",
+		"@wordpress/date": "^5.40.1",
+		"@wordpress/deprecated": "^4.40.1",
+		"@wordpress/dom": "^4.40.1",
+		"@wordpress/element": "^6.40.1",
+		"@wordpress/escape-html": "^3.40.1",
+		"@wordpress/global-styles-engine": "^1.7.1",
+		"@wordpress/hooks": "^4.40.1",
+		"@wordpress/html-entities": "^4.40.1",
+		"@wordpress/i18n": "^6.13.1",
+		"@wordpress/icons": "^11.7.1",
+		"@wordpress/image-cropper": "^1.4.1",
+		"@wordpress/interactivity": "^6.40.1",
+		"@wordpress/is-shallow-equal": "^5.40.1",
+		"@wordpress/keyboard-shortcuts": "^5.40.1",
+		"@wordpress/keycodes": "^4.40.1",
+		"@wordpress/notices": "^5.40.1",
+		"@wordpress/preferences": "^4.40.1",
+		"@wordpress/priority-queue": "^3.40.1",
+		"@wordpress/private-apis": "^1.40.1",
+		"@wordpress/rich-text": "^7.40.1",
+		"@wordpress/style-engine": "^2.40.1",
+		"@wordpress/token-list": "^3.40.1",
+		"@wordpress/upload-media": "^0.25.2",
+		"@wordpress/url": "^4.40.1",
+		"@wordpress/warning": "^3.40.1",
+		"@wordpress/wordcount": "^4.40.1",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
@@ -124,5 +124,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "95aa7055a5757219e2d96a91efc69f7dd1b2d4c3"
+	"gitHead": "adb6623c9f32490cfc73c7ac7f122578c1f10c65"
 }

package/src/components/block-bindings/attribute-control.js

@@ -50,10 +50,15 @@ export default function BlockBindingsAttributeControl( {
 				getBlockType,
 			} = unlock( select( blocksStore ) );
 
-			const _attributeType =
-				getBlockType( blockName ).attributes?.[ attribute ]?.type;
+			const _attribute =
+				getBlockType( blockName ).attributes?.[ attribute ];
+
+			if ( _attribute?.enum ) {
+				return {};
+			}
+
 			const attributeType =
-				_attributeType === 'rich-text' ? 'string' : _attributeType;
+				_attribute?.type === 'rich-text' ? 'string' : _attribute?.type;
 
 			const sourceFields = {};
 			Object.entries( getAllBlockBindingsSources() ).forEach(

package/src/components/block-inspector/edit-contents.js

@@ -92,19 +92,21 @@ export default function EditContents( { clientId } ) {
 		stopEditingContentOnlySection,
 	} = useContentOnlySectionEdit( clientId );
 
-	const { block, onNavigateToEntityRecord } = useSelect(
+	const { block, onNavigateToEntityRecord, canEdit } = useSelect(
 		( select ) => {
-			const { getBlock, getSettings } = select( blockEditorStore );
+			const { getBlock, getSettings, canEditBlock } =
+				select( blockEditorStore );
 			return {
 				block: getBlock( clientId ),
 				onNavigateToEntityRecord:
 					getSettings().onNavigateToEntityRecord,
+				canEdit: canEditBlock( clientId ),
 			};
 		},
 		[ clientId ]
 	);
 
-	if ( ! isWithinSection && ! isWithinEditedSection ) {
+	if ( ! canEdit || ( ! isWithinSection && ! isWithinEditedSection ) ) {
 		return null;
 	}
 

package/src/components/block-list/block-html.js

@@ -6,7 +6,7 @@ import TextareaAutosize from 'react-autosize-textarea';
 /**
  * WordPress dependencies
  */
-import { useEffect, useState } from '@wordpress/element';
+import { useEffect, useMemo, useState } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	getBlockAttributes,
@@ -28,6 +28,16 @@ function BlockHTML( { clientId } ) {
 		[ clientId ]
 	);
 	const { updateBlock } = useDispatch( blockEditorStore );
+
+	// Derive block content as a primitive string so the effect only fires
+	// when the serialized content genuinely changes, not when the block
+	// object reference changes (which happens on every RESET_BLOCKS during
+	// RTC sync, even for unchanged blocks).
+	const blockContent = useMemo(
+		() => ( block ? getBlockContent( block ) : '' ),
+		[ block ]
+	);
+
 	const onChange = () => {
 		const blockType = getBlockType( block.name );
 
@@ -64,8 +74,8 @@ function BlockHTML( { clientId } ) {
 	};
 
 	useEffect( () => {
-		setHtml( getBlockContent( block ) );
-	}, [ block ] );
+		setHtml( blockContent );
+	}, [ blockContent ] );
 
 	return (
 		<TextareaAutosize

package/src/components/block-list/block.js

@@ -23,7 +23,7 @@ import {
 } from '@wordpress/blocks';
 import { withFilters } from '@wordpress/components';
 import { withDispatch, useSelect } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { compose, useRefEffect } from '@wordpress/compose';
 import { safeHTML } from '@wordpress/dom';
 
 /**
@@ -741,10 +741,19 @@ function BlockListBlockProvider( props ) {
 		[ clientId, rootClientId ]
 	);
 
+	const defaultViewRef = useRefEffect( ( element ) => {
+		if ( element ) {
+			const { ownerDocument } = element;
+			const { defaultView } = ownerDocument;
+			defaultViewRef.current = defaultView;
+		}
+	}, [] );
+
 	// Use block visibility hook with data from existing useSelect to avoid extra subscription
 	const { isBlockCurrentlyHidden } = useBlockVisibility( {
 		blockVisibility: selectedProps?.blockVisibility,
 		deviceType: selectedProps?.deviceType,
+		view: defaultViewRef.current,
 	} );
 
 	// Users of the editor.BlockListBlock filter used to be able to

package/src/components/block-list/content.scss

@@ -191,6 +191,22 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection="true"] .b
 		}
 	}
 
+	// Scrim overlay.
+	&.has-warning::after {
+		content: "";
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba($white, 0.4);
+	}
+
+	// Avoid conflict with the multi-selection highlight color.
+	&.has-warning.is-multi-selected::after {
+		background-color: transparent;
+	}
+
 	// Clear floats.
 	&[data-clear="true"] {
 		float: none;
@@ -390,10 +406,6 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection="true"] .b
 	font-family: $editor-html-font;
 	font-size: $text-editor-font-size;
 	line-height: 1.5;
-	// HTML input is always LTR regardless of language.
-	/*rtl:ignore*/
-	direction: ltr;
-
 	@media not ( prefers-reduced-motion ) {
 		transition: padding 0.2s linear;
 	}
@@ -403,6 +415,25 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection="true"] .b
 	}
 }
 
+
+/**
+ * Warnings.
+ */
+
+.block-editor-block-list__block .block-editor-warning {
+	z-index: z-index(".block-editor-warning");
+	position: relative;
+
+	&.block-editor-block-list__block-crash-warning {
+		// The block crash warning has no block preview underneath it.
+		// The lack of a preview combined with the negative margin that
+		// the warning normally has results in crashed blocks overlapping
+		// any blocks that come after them. Resetting the margin to `auto`
+		// solves this.
+		margin-bottom: auto;
+	}
+}
+
 .block-editor-block-list__zoom-out-separator {
 	/* same color as the iframe's background */
 	background: $gray-300;

package/src/components/block-list/use-block-props/index.js

@@ -9,7 +9,7 @@ import clsx from 'clsx';
 import { useContext } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { __unstableGetBlockProps as getBlockProps } from '@wordpress/blocks';
-import { useMergeRefs, useDisabled } from '@wordpress/compose';
+import { useMergeRefs, useDisabled, useRefEffect } from '@wordpress/compose';
 import warning from '@wordpress/warning';
 
 /**
@@ -107,6 +107,14 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 		deviceType,
 	} = useContext( PrivateBlockContext );
 
+	const defaultViewRef = useRefEffect( ( element ) => {
+		if ( element ) {
+			const { ownerDocument } = element;
+			const { defaultView } = ownerDocument;
+			defaultViewRef.current = defaultView;
+		}
+	}, [] );
+
 	// translators: %s: Type of block (i.e. Text, Image etc)
 	const blockLabel = sprintf( __( 'Block: %s' ), blockTitle );
 	const htmlSuffix = mode === 'html' && ! __unstableIsHtml ? '-visual' : '';
@@ -114,6 +122,7 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 	const isHoverEnabled = ! isWithinSectionBlock;
 	const mergedRefs = useMergeRefs( [
 		props.ref,
+		defaultViewRef,
 		useFocusFirstElement( { clientId, initialPosition } ),
 		useBlockRefProvider( clientId ),
 		useFocusHandler( clientId ),
@@ -144,6 +153,7 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 	const { isBlockCurrentlyHidden } = useBlockVisibility( {
 		blockVisibility,
 		deviceType,
+		view: defaultViewRef.current,
 	} );
 
 	// Ensures it warns only inside the `edit` implementation for the block.

package/src/components/block-quick-navigation/index.js

@@ -19,7 +19,6 @@ import { Icon, chevronRight } from '@wordpress/icons';
 import { store as blockEditorStore } from '../../store';
 import BlockIcon from '../block-icon';
 import useBlockDisplayInformation from '../use-block-display-information';
-import useBlockDisplayTitle from '../block-title/use-block-display-title';
 
 export default function BlockQuickNavigation( {
 	clientIds,
@@ -79,11 +78,7 @@ function BlockQuickNavigationItem( {
 		);
 
 	const blockType = getBlockType( blockName );
-	const displayTitle = useBlockDisplayTitle( {
-		clientId,
-		context: 'list-view',
-	} );
-	const blockTitle = displayTitle || blockType?.title || blockName;
+	const blockTitle = blockType?.title || blockName;
 	const { selectBlock } = useDispatch( blockEditorStore );
 
 	const hasChildren = childBlocks && childBlocks.length > 0;

package/src/components/block-settings-menu/block-settings-dropdown.js

@@ -8,7 +8,7 @@ import {
 } from '@wordpress/blocks';
 import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { chevronDown, chevronUp, moreVertical } from '@wordpress/icons';
+import { moreVertical } from '@wordpress/icons';
 import { Children, cloneElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
@@ -74,7 +74,6 @@ export function BlockSettingsDropdown( {
 	clientIds,
 	children,
 	__experimentalSelectBlock,
-	isContentOnlyListView,
 	...props
 } ) {
 	// Get the client id of the current block for this menu, if one is set.
@@ -89,9 +88,6 @@ export function BlockSettingsDropdown( {
 		isContentOnly,
 		isZoomOut,
 		canEdit,
-		canMove,
-		isFirst,
-		isLast,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -103,9 +99,6 @@ export function BlockSettingsDropdown( {
 				getBlockEditingMode,
 				isZoomOut: _isZoomOut,
 				canEditBlock,
-				canMoveBlocks,
-				getBlockIndex,
-				getBlockCount,
 			} = unlock( select( blockEditorStore ) );
 
 			const { getActiveBlockVariation } = select( blocksStore );
@@ -131,21 +124,14 @@ export function BlockSettingsDropdown( {
 					getBlockEditingMode( firstBlockClientId ) === 'contentOnly',
 				isZoomOut: _isZoomOut(),
 				canEdit: canEditBlock( firstBlockClientId ),
-				canMove: canMoveBlocks( clientIds ),
-				isFirst: getBlockIndex( firstBlockClientId ) === 0,
-				isLast:
-					getBlockIndex( firstBlockClientId ) ===
-					getBlockCount( _firstParentClientId ) - 1,
 			};
 		},
-		[ firstBlockClientId, clientIds ]
+		[ firstBlockClientId ]
 	);
 
 	const { getBlockOrder, getSelectedBlockClientIds } =
 		useSelect( blockEditorStore );
 
-	const { moveBlocksDown, moveBlocksUp } = useDispatch( blockEditorStore );
-
 	const shortcuts = useSelect( ( select ) => {
 		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
 		return {
@@ -257,36 +243,6 @@ export function BlockSettingsDropdown( {
 											parentBlockType={ parentBlockType }
 										/>
 									) }
-									{ canMove && isContentOnlyListView && (
-										<>
-											<MenuItem
-												icon={ chevronUp }
-												disabled={ isFirst }
-												accessibleWhenDisabled
-												onClick={ pipe( onClose, () => {
-													moveBlocksUp(
-														clientIds,
-														firstParentClientId
-													);
-												} ) }
-											>
-												{ __( 'Move up' ) }
-											</MenuItem>
-											<MenuItem
-												icon={ chevronDown }
-												disabled={ isLast }
-												accessibleWhenDisabled
-												onClick={ pipe( onClose, () => {
-													moveBlocksDown(
-														clientIds,
-														firstParentClientId
-													);
-												} ) }
-											>
-												{ __( 'Move down' ) }
-											</MenuItem>
-										</>
-									) }
 									{ canEdit && count === 1 && (
 										<BlockHTMLConvertButton
 											clientId={ firstBlockClientId }

package/src/components/block-settings-menu-controls/index.js

@@ -79,6 +79,7 @@ const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
 		<Slot
 			fillProps={ {
 				...fillProps,
+				canEdit,
 				selectedBlocks,
 				selectedClientIds,
 			} }

package/src/components/block-styles/index.js

@@ -7,6 +7,7 @@ import clsx from 'clsx';
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
 import { debounce, useViewportMatch } from '@wordpress/compose';
 import {
 	Button,
@@ -24,11 +25,16 @@ import BlockStylesPreviewPanel from './preview-panel';
 import useStylesForBlocks from './use-styles-for-block';
 import { useToolsPanelDropdownMenuProps } from '../global-styles/utils';
 import { getDefaultStyle } from './utils';
+import { store as blockEditorStore } from '../../store';
 
 const noop = () => {};
 
 // Block Styles component for the Settings Sidebar.
 function BlockStyles( { clientId, onSwitch = noop, onHoverClassName = noop } ) {
+	const canEdit = useSelect(
+		( select ) => select( blockEditorStore ).canEditBlock( clientId ),
+		[ clientId ]
+	);
 	const {
 		onSelect,
 		stylesToRender,
@@ -43,7 +49,7 @@ function BlockStyles( { clientId, onSwitch = noop, onHoverClassName = noop } ) {
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
-	if ( ! stylesToRender || stylesToRender.length === 0 ) {
+	if ( ! canEdit || ! stylesToRender || stylesToRender.length === 0 ) {
 		return null;
 	}
 

package/src/components/block-styles/menu-items.js

@@ -4,14 +4,19 @@
 import { MenuItem, __experimentalText as Text } from '@wordpress/components';
 import { check } from '@wordpress/icons';
 
+/**
+ * Internal dependencies
+ */
+import useStylesForBlocks from './use-styles-for-block';
+
 const noop = () => {};
 
-export default function BlockStylesMenuItems( {
-	stylesToRender,
-	activeStyle,
-	onSelect = noop,
-	onHoverStyle = noop,
-} ) {
+export default function BlockStylesMenuItems( { clientId, onSwitch = noop } ) {
+	const { onSelect, stylesToRender, activeStyle } = useStylesForBlocks( {
+		clientId,
+		onSwitch,
+	} );
+
 	if ( ! stylesToRender || stylesToRender.length === 0 ) {
 		return null;
 	}
@@ -24,10 +29,6 @@ export default function BlockStylesMenuItems( {
 						key={ style.name }
 						icon={ activeStyle.name === style.name ? check : null }
 						onClick={ () => onSelect( style ) }
-						onFocus={ () => onHoverStyle( style ) }
-						onBlur={ () => onHoverStyle( null ) }
-						onMouseEnter={ () => onHoverStyle( style ) }
-						onMouseLeave={ () => onHoverStyle( null ) }
 					>
 						<Text
 							as="span"