Support for arbitrary clientIds in BlockSettingsMenuControlsSlot

WordPress · May 20, 2020 · d761f4c · d761f4c
1 parent 530410b
commit d761f4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-settings-menu-controls/index.js b/packages/block-editor/src/components/block-settings-menu-controls/index.js
@@ -13,14 +13,16 @@ const { Fill: BlockSettingsMenuControls, Slot } = createSlotFill(
 	'BlockSettingsMenuControls'
 );
 
-const BlockSettingsMenuControlsSlot = ( { fillProps } ) => {
+const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
 	const { selectedBlocks } = useSelect( ( select ) => {
 		const { getBlocksByClientId, getSelectedBlockClientIds } = select(
 			'core/block-editor'
 		);
+		const ids =
+			clientIds !== null ? clientIds : getSelectedBlockClientIds();
 		return {
 			selectedBlocks: map(
-				getBlocksByClientId( getSelectedBlockClientIds() ),
+				getBlocksByClientId( ids ),
 				( block ) => block.name
 			),
 		};

diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -147,6 +147,7 @@ export function BlockSettingsDropdown( { clientIds, ...props } ) {
 							</MenuGroup>
 							<BlockSettingsMenuControls.Slot
 								fillProps={ { onClose } }
+								clientIds={ clientIds }
 							/>
 							<MenuGroup>
 								{ ! isLocked && (