From a8063ed4d9b60d1999c7d543cd7609ce15ca8352 Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Mon, 17 Jul 2023 16:45:49 +1200 Subject: [PATCH 1/3] Pass the root client id into the reusable blocks menu --- .../src/components/reusable-blocks-menu-items/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js index 3635c0d1c3e81..59f831e8c37a9 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js @@ -25,8 +25,11 @@ function ReusableBlocksMenuItems( { clientIds, rootClientId } ) { } export default withSelect( ( select ) => { - const { getSelectedBlockClientIds } = select( blockEditorStore ); + const { getSelectedBlockClientIds, getBlockRootClientId } = + select( blockEditorStore ); + const clientIds = getSelectedBlockClientIds(); return { - clientIds: getSelectedBlockClientIds(), + clientIds, + rootClientId: getBlockRootClientId( clientIds[ 0 ] ), }; } )( ReusableBlocksMenuItems ); From d0e631e71724a34584a816cb86538b489baec9f6 Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Mon, 17 Jul 2023 16:56:59 +1200 Subject: [PATCH 2/3] Check that clientIds array is defined --- .../src/components/reusable-blocks-menu-items/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js index 59f831e8c37a9..fe1369dda1f40 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js @@ -30,6 +30,8 @@ export default withSelect( ( select ) => { const clientIds = getSelectedBlockClientIds(); return { clientIds, - rootClientId: getBlockRootClientId( clientIds[ 0 ] ), + rootClientId: clientIds?.length + ? getBlockRootClientId( clientIds[ 0 ] ) + : undefined, }; } )( ReusableBlocksMenuItems ); From 8c39d17c35481e8837d32e7b6ff8f85076048a0f Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Tue, 18 Jul 2023 09:36:14 +1200 Subject: [PATCH 3/3] Make check for array item more specific --- .../src/components/reusable-blocks-menu-items/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js index fe1369dda1f40..d7823483f5e09 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/index.js @@ -30,8 +30,9 @@ export default withSelect( ( select ) => { const clientIds = getSelectedBlockClientIds(); return { clientIds, - rootClientId: clientIds?.length - ? getBlockRootClientId( clientIds[ 0 ] ) - : undefined, + rootClientId: + clientIds?.length > 0 + ? getBlockRootClientId( clientIds[ 0 ] ) + : undefined, }; } )( ReusableBlocksMenuItems );