Block Hooks: Display toggle for hooked blocks added via filter

packages/block-editor/src/hooks/block-hooks.js

@@ -19,18 +19,28 @@ import { store as blockEditorStore } from '../store';
 
 const EMPTY_OBJECT = {};
 
-function BlockHooksControlPure( { name, clientId } ) {
+function BlockHooksControlPure( {
+ name,
+ clientId,
+ metadata: { ignoredHookedBlocks = [] } = {},
+} ) {
  const blockTypes = useSelect(
  ( select ) => select( blocksStore ).getBlockTypes(),
  []
  );
 
+ // A hooked block added via a filter will not be exposed through a block
+ // type's `blockHooks` property; however, if the containing layout has been
+ // modified, it will be present in the anchor block's `ignoredHookedBlocks`
+ // metadata.
  const hookedBlocksForCurrentBlock = useMemo(
  () =>
  blockTypes?.filter(
- ( { blockHooks } ) => blockHooks && name in blockHooks
+ ( { name: blockName, blockHooks } ) =>
+ ( blockHooks && name in blockHooks ) ||
+ ignoredHookedBlocks.includes( blockName )
  ),
- [ blockTypes, name ]
+ [ blockTypes, name, ignoredHookedBlocks ]
  );
 
  const { blockIndex, rootClientId, innerBlocksLength } = useSelect(
@@ -79,6 +89,16 @@ function BlockHooksControlPure( { name, clientId } ) {
  // inserted and then moved around a bit by the user.
  candidates = getBlocks( clientId );
  break;
+
+ case undefined:
+ // If we haven't found a blockHooks field with a relative position for the hooked
+ // block, it means that it was added by a filter. In this case, we look for the block
+ // both among the current block's siblings and its children.
+ candidates = [
+ ...getBlocks( rootClientId ),
+ ...getBlocks( clientId ),
+ ];
+ break;
  }
 
  const hookedBlock = candidates?.find(
@@ -151,6 +171,18 @@ function BlockHooksControlPure( { name, clientId } ) {
  false
  );
  break;
+
+ case undefined:
+ // If we do not know the relative position, it is because the block was
+ // added via a filter. In this case, we default to inserting it after the
+ // current block.
+ insertBlock(
+ block,
+ blockIndex + 1,
+ rootClientId, // Insert as a child of the current block's parent
+ false
+ );
+ break;
  }
  };
 
@@ -219,6 +251,7 @@ function BlockHooksControlPure( { name, clientId } ) {
 
 export default {
  edit: BlockHooksControlPure,
+ attributeKeys: [ 'metadata' ],
  hasSupport() {
  return true;
  },