From 0d56c2259d32f3ad91bc0c8243b772a7a82146fc Mon Sep 17 00:00:00 2001 From: Utsav Patel Date: Fri, 8 Nov 2024 10:57:00 +0530 Subject: [PATCH 1/3] feature: based on editor mode render block toolbar controls for cover block --- .../src/cover/edit/block-controls.js | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/packages/block-library/src/cover/edit/block-controls.js b/packages/block-library/src/cover/edit/block-controls.js index 041566c0a5197..c6f9b3fd3c511 100644 --- a/packages/block-library/src/cover/edit/block-controls.js +++ b/packages/block-library/src/cover/edit/block-controls.js @@ -9,8 +9,10 @@ import { __experimentalBlockAlignmentMatrixControl as BlockAlignmentMatrixControl, __experimentalBlockFullHeightAligmentControl as FullHeightAlignmentControl, privateApis as blockEditorPrivateApis, + store as blockEditorStore, } from '@wordpress/block-editor'; import { __ } from '@wordpress/i18n'; +import { useSelect } from '@wordpress/data'; /** * Internal dependencies @@ -73,25 +75,34 @@ export default function CoverBlockControls( { } ); }; + const mode = useSelect( + ( select ) => select( blockEditorStore ).__unstableGetEditorMode(), + [] + ); + return ( <> - - - setAttributes( { - contentPosition: nextPosition, - } ) - } - isDisabled={ ! hasInnerBlocks } - /> - - + { 'navigation' !== mode && ( + + <> + + setAttributes( { + contentPosition: nextPosition, + } ) + } + isDisabled={ ! hasInnerBlocks } + /> + + + + ) } Date: Fri, 8 Nov 2024 22:44:17 +0530 Subject: [PATCH 2/3] update: way of getting block editor context --- .../block-library/src/cover/edit/block-controls.js | 10 +++------- packages/block-library/src/cover/edit/index.js | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/block-library/src/cover/edit/block-controls.js b/packages/block-library/src/cover/edit/block-controls.js index c6f9b3fd3c511..218886360197a 100644 --- a/packages/block-library/src/cover/edit/block-controls.js +++ b/packages/block-library/src/cover/edit/block-controls.js @@ -9,10 +9,8 @@ import { __experimentalBlockAlignmentMatrixControl as BlockAlignmentMatrixControl, __experimentalBlockFullHeightAligmentControl as FullHeightAlignmentControl, privateApis as blockEditorPrivateApis, - store as blockEditorStore, } from '@wordpress/block-editor'; import { __ } from '@wordpress/i18n'; -import { useSelect } from '@wordpress/data'; /** * Internal dependencies @@ -29,6 +27,7 @@ export default function CoverBlockControls( { currentSettings, toggleUseFeaturedImage, onClearMedia, + blockEditingMode, } ) { const { contentPosition, id, useFeaturedImage, minHeight, minHeightUnit } = attributes; @@ -75,14 +74,11 @@ export default function CoverBlockControls( { } ); }; - const mode = useSelect( - ( select ) => select( blockEditorStore ).__unstableGetEditorMode(), - [] - ); + const isContentOnlyMode = blockEditingMode === 'contentOnly'; return ( <> - { 'navigation' !== mode && ( + { ! isContentOnlyMode && ( <> ); From 4a7eabcc274833a1e418af7eecb2aa72cdf88b68 Mon Sep 17 00:00:00 2001 From: Utsav Patel Date: Sun, 10 Nov 2024 21:40:01 +0530 Subject: [PATCH 3/3] update: added no content controls check --- packages/block-library/src/cover/edit/block-controls.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/cover/edit/block-controls.js b/packages/block-library/src/cover/edit/block-controls.js index 218886360197a..c171b474b63ab 100644 --- a/packages/block-library/src/cover/edit/block-controls.js +++ b/packages/block-library/src/cover/edit/block-controls.js @@ -74,11 +74,12 @@ export default function CoverBlockControls( { } ); }; + const hasNonContentControls = blockEditingMode === 'default'; const isContentOnlyMode = blockEditingMode === 'contentOnly'; return ( <> - { ! isContentOnlyMode && ( + { ! isContentOnlyMode && hasNonContentControls && ( <>