Fix canMoveBlock with block editing mode

WordPress · Apr 30, 2024 · 2bdd5f2 · 2bdd5f2
1 parent f824d5a
commit 2bdd5f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -1752,14 +1752,16 @@ export function canMoveBlock( state, clientId, rootClientId = null ) {
 	if ( attributes === null ) {
 		return true;
 	}
+	if ( getBlockEditingMode( state, rootClientId ) !== 'default' ) {
+		return false;
+	}
 	if ( attributes.lock?.move !== undefined ) {
 		return ! attributes.lock.move;
 	}
 	if ( getTemplateLock( state, rootClientId ) === 'all' ) {
 		return false;
 	}
-
-	return getBlockEditingMode( state, rootClientId ) !== 'disabled';
+	return true;
 }
 
 /**

diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
@@ -103,7 +103,7 @@ function ContentOnlySettingsMenuItems( { clientId } ) {
 	);
 }
 
-export default function TemplateContentOnlySettingsMenu() {
+export default function ContentOnlySettingsMenu() {
 	return (
 		<BlockSettingsMenuControls>
 			{ ( { selectedClientIds } ) =>

diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js
@@ -0,0 +1,3 @@
+export default function ContentOnlySettingsMenu() {
+	return null;
+}