From 2bdd5f22ebc6afee8ffe7a80f647610b0cf61223 Mon Sep 17 00:00:00 2001 From: Kai Hao Date: Mon, 29 Apr 2024 15:37:19 +0800 Subject: [PATCH] Fix canMoveBlock with block editing mode --- packages/block-editor/src/store/selectors.js | 6 ++++-- .../block-settings-menu/content-only-settings-menu.js | 2 +- .../content-only-settings-menu.native.js | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js index 19c609e848732..4ccec66076c72 100644 --- 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 index 8500453942ff8..13b298d4026d8 100644 --- 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 ( { ( { 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 new file mode 100644 index 0000000000000..b10c08c3000b0 --- /dev/null +++ b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js @@ -0,0 +1,3 @@ +export default function ContentOnlySettingsMenu() { + return null; +}