From 33a5c07be6f1318d1f086284868c2e840bed4926 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 9 Jul 2019 12:09:09 +0100 Subject: [PATCH 1/2] Hide the columns count control on empty columns block --- packages/block-library/src/columns/edit.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js index d573500cd551d..368c8fb019ec9 100644 --- a/packages/block-library/src/columns/edit.js +++ b/packages/block-library/src/columns/edit.js @@ -135,9 +135,11 @@ export function ColumnsEdit( { [ `are-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment, } ); + const showTemplateSelector = ( count === 0 && ! forceUseTemplate ) || ! template; + return ( <> - { template && ( + { ! showTemplateSelector && ( <> @@ -170,9 +172,7 @@ export function ColumnsEdit( { setForceUseTemplate( true ); } } __experimentalAllowTemplateOptionSkip - // setting the template to null when the inner blocks - // are empty allows to reset to the placeholder state. - template={ count === 0 && ! forceUseTemplate ? null : template } + template={ showTemplateSelector ? null : template } templateLock="all" allowedBlocks={ ALLOWED_BLOCKS } /> From ecb14851c94311336bc407d08ca02230bbe3ab6b Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Mon, 15 Jul 2019 10:09:31 +0100 Subject: [PATCH 2/2] Add comment --- packages/block-library/src/columns/edit.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js index 368c8fb019ec9..d798f9f2115cb 100644 --- a/packages/block-library/src/columns/edit.js +++ b/packages/block-library/src/columns/edit.js @@ -135,6 +135,9 @@ export function ColumnsEdit( { [ `are-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment, } ); + // The template selector is shown when we first insert the columns block (count === 0). + // or if there's no template available. + // The count === 0 trick is useful when you use undo/redo. const showTemplateSelector = ( count === 0 && ! forceUseTemplate ) || ! template; return (