diff --git a/packages/block-editor/src/components/block-list-appender/content.scss b/packages/block-editor/src/components/block-list-appender/content.scss index c4a623103bc19..d39262b015364 100644 --- a/packages/block-editor/src/components/block-list-appender/content.scss +++ b/packages/block-editor/src/components/block-list-appender/content.scss @@ -9,12 +9,3 @@ .block-list-appender > .block-editor-inserter { display: block; } - -// Hide the nested appender unless parent or child is selected. -// This selector targets unselected blocks that have only a single nesting level. -.block-editor-block-list__block:not(.is-selected):not(.has-child-selected):not(.block-editor-block-list__layout) { - .block-editor-block-list__layout > .block-list-appender .block-list-appender__toggle { - opacity: 0; - transform: scale(0); - } -} diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss index 3971df611c277..96a71534bca52 100644 --- a/packages/block-editor/src/components/block-list/content.scss +++ b/packages/block-editor/src/components/block-list/content.scss @@ -259,11 +259,6 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b } } - // Reusable blocks parent border. - &.is-reusable.has-child-selected::after { - box-shadow: 0 0 0 1px var(--wp-admin-theme-color); - } - // Clear floats. &[data-clear="true"] { float: none; @@ -444,15 +439,6 @@ body.is-zoomed-out { @include reduce-motion("animation"); } -.block-editor-block-list__block:not(.is-selected):not(.has-child-selected) .block-editor-default-block-appender { - display: none; - - .block-editor-inserter__toggle { - opacity: 0; - transform: scale(0); - } -} - .block-editor-block-list__block .block-editor-block-list__block-html-textarea { display: block; margin: 0; diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js index 1faffef6ba394..7d239f73d0a86 100644 --- a/packages/block-editor/src/components/block-list/index.js +++ b/packages/block-editor/src/components/block-list/index.js @@ -198,20 +198,22 @@ function Items( { } const selectedBlockClientId = getSelectedBlockClientId(); + const isParentSelected = rootClientId === selectedBlockClientId; + const isEmpty = ! _order.length; + const shouldShowAppender = isParentSelected || isEmpty; + return { order: _order, selectedBlocks: getSelectedBlockClientIds(), visibleBlocks: __unstableGetVisibleBlocks(), shouldRenderAppender: hasAppender && + shouldShowAppender && __unstableGetEditorMode() !== 'zoom-out' && ( hasCustomAppender ? ! getTemplateLock( rootClientId ) && getBlockEditingMode( rootClientId ) !== 'disabled' - : rootClientId === selectedBlockClientId || - ( ! rootClientId && - ! selectedBlockClientId && - ! _order.length ) ), + : true ), }; }, [ rootClientId, hasAppender, hasCustomAppender ]