From 15af342534185544fc179d2194f519d179ee1fad Mon Sep 17 00:00:00 2001 From: jasmussen Date: Mon, 22 Nov 2021 10:34:11 +0100 Subject: [PATCH 1/3] Navigation: Add clearance for appender in submenus. --- packages/block-library/src/navigation/editor.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss index 0fbb03a5ed630..46114babbb01c 100644 --- a/packages/block-library/src/navigation/editor.scss +++ b/packages/block-library/src/navigation/editor.scss @@ -96,6 +96,19 @@ } } +// Show even when a child is selected. This is an edgecase just for navigation submenus. +.is-editing > .wp-block-navigation__submenu-container { + .block-list-appender { + position: static; + margin-left: auto; + + > .block-list-appender__toggle { + display: block; + } + } +} + + /** * Colors Selector component */ From 27ffc98a844811b4a3558a387b4cfb3af7b70534 Mon Sep 17 00:00:00 2001 From: George Hotelling Date: Thu, 2 Dec 2021 11:20:28 -0500 Subject: [PATCH 2/3] Trying ButtonBlockAppender instead of DefaultBlockAppender --- packages/block-library/src/navigation-submenu/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js index 02abd4a35dbca..f97137623ae65 100644 --- a/packages/block-library/src/navigation-submenu/edit.js +++ b/packages/block-library/src/navigation-submenu/edit.js @@ -520,7 +520,7 @@ export default function NavigationSubmenuEdit( { ! selectedBlockHasDescendants ) || // Show the appender while dragging to allow inserting element between item and the appender. hasDescendants - ? InnerBlocks.DefaultAppender + ? InnerBlocks.ButtonBlockAppender : false, } ); From 387e02eb20b9fbfb4735c332711ea134fb63b600 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Fri, 3 Dec 2021 10:33:15 +0100 Subject: [PATCH 3/3] Tweak the behavior. --- packages/block-library/src/navigation/editor.scss | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss index 46114babbb01c..5b3d7f4c8671c 100644 --- a/packages/block-library/src/navigation/editor.scss +++ b/packages/block-library/src/navigation/editor.scss @@ -97,15 +97,14 @@ } // Show even when a child is selected. This is an edgecase just for navigation submenus. -.is-editing > .wp-block-navigation__submenu-container { - .block-list-appender { - position: static; - margin-left: auto; +.is-editing > .wp-block-navigation__submenu-container > .block-list-appender { + display: block; + position: static; +} - > .block-list-appender__toggle { - display: block; - } - } +// Hide when hovering. +.wp-block-navigation__submenu-container .block-list-appender { + display: none; }