From 3277a4073d74d9a6478834f3b0c2a6fa76aad229 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Tue, 30 Nov 2021 10:22:48 +0100 Subject: [PATCH 1/3] Navigation: Try removing absorb toolbar prop. --- packages/block-library/src/navigation/edit/inner-blocks.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/block-library/src/navigation/edit/inner-blocks.js b/packages/block-library/src/navigation/edit/inner-blocks.js index 7b8d8eb39da326..8a893c254f0999 100644 --- a/packages/block-library/src/navigation/edit/inner-blocks.js +++ b/packages/block-library/src/navigation/edit/inner-blocks.js @@ -110,11 +110,6 @@ export default function NavigationInnerBlocks( { __experimentalDirectInsert: shouldDirectInsert, orientation, renderAppender: CustomAppender || appender, - - // Ensure block toolbar is not too far removed from item - // being edited when in vertical mode. - // see: https://github.com/WordPress/gutenberg/pull/34615. - __experimentalCaptureToolbars: orientation !== 'vertical', // Template lock set to false here so that the Nav // Block on the experimental menus screen does not // inherit templateLock={ 'all' }. From dafd33a968fa560da8ba2419241e8a88f88363d9 Mon Sep 17 00:00:00 2001 From: jasmussen Date: Wed, 1 Dec 2021 08:40:52 +0100 Subject: [PATCH 2/3] Add capture toolbars to submenus. --- packages/block-library/src/navigation-submenu/edit.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js index 69fffeb6e996e9..e4b4ca17251281 100644 --- a/packages/block-library/src/navigation-submenu/edit.js +++ b/packages/block-library/src/navigation-submenu/edit.js @@ -508,6 +508,12 @@ export default function NavigationSubmenuEdit( { allowedBlocks: ALLOWED_BLOCKS, __experimentalDefaultBlock: DEFAULT_BLOCK, __experimentalDirectInsert: true, + + // Ensure block toolbar is not too far removed from item + // being edited when in vertical mode. + // see: https://github.com/WordPress/gutenberg/pull/34615. + __experimentalCaptureToolbars: true, + renderAppender: isSelected || ( isImmediateParentOfSelectedBlock && From 03a89b2f3cd83b863a6e44d4cacb336b0dc45d92 Mon Sep 17 00:00:00 2001 From: Joen A <1204802+jasmussen@users.noreply.github.com> Date: Wed, 1 Dec 2021 10:28:31 +0100 Subject: [PATCH 3/3] Update packages/block-library/src/navigation-submenu/edit.js Co-authored-by: Dave Smith --- 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 e4b4ca17251281..02abd4a35dbca6 100644 --- a/packages/block-library/src/navigation-submenu/edit.js +++ b/packages/block-library/src/navigation-submenu/edit.js @@ -510,7 +510,7 @@ export default function NavigationSubmenuEdit( { __experimentalDirectInsert: true, // Ensure block toolbar is not too far removed from item - // being edited when in vertical mode. + // being edited. // see: https://github.com/WordPress/gutenberg/pull/34615. __experimentalCaptureToolbars: true,