@wordpress/block-editor 12.18.2 → 12.19.0

package/build-module/store/selectors.js

@@ -6,7 +6,7 @@ import createSelector from 'rememo';
 /**
  * WordPress dependencies
  */
-import { getBlockType, getBlockTypes, getBlockVariations, hasBlockSupport, getPossibleBlockTransformations, parse, switchToBlockType, store as blocksStore } from '@wordpress/blocks';
+import { getBlockType, getBlockTypes, getBlockVariations, getHookedBlocks, hasBlockSupport, getPossibleBlockTransformations, parse, switchToBlockType, store as blocksStore } from '@wordpress/blocks';
 import { Platform } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 import { symbol } from '@wordpress/icons';
@@ -140,11 +140,12 @@ export function getBlock(state, clientId) {
   return state.blocks.tree.get(clientId);
 }
 export const __unstableGetBlockWithoutInnerBlocks = createSelector((state, clientId) => {
-  if (!state.blocks.byClientId.has(clientId)) {
+  const block = state.blocks.byClientId.get(clientId);
+  if (!block) {
     return null;
   }
   return {
-    ...state.blocks.byClientId.get(clientId),
+    ...block,
     attributes: getBlockAttributes(state, clientId)
   };
 }, (state, clientId) => [state.blocks.byClientId.get(clientId), state.blocks.attributes.get(clientId)]);
@@ -211,20 +212,34 @@ export const __unstableGetClientIdsTree = createSelector((state, rootClientId =
  * given. Returned ids are ordered first by the order of the ids given, then
  * by the order that they appear in the editor.
  *
- * @param {Object}          state     Global application state.
- * @param {string|string[]} clientIds Client ID(s) for which descendant blocks are to be returned.
+ * @param {Object}          state   Global application state.
+ * @param {string|string[]} rootIds Client ID(s) for which descendant blocks are to be returned.
  *
  * @return {Array} Client IDs of descendants.
  */
-export const getClientIdsOfDescendants = createSelector((state, clientIds) => {
-  const givenIds = Array.isArray(clientIds) ? clientIds : [clientIds];
-  const collectedIds = [];
-  for (const givenId of givenIds) {
-    for (const descendantId of getBlockOrder(state, givenId)) {
-      collectedIds.push(descendantId, ...getClientIdsOfDescendants(state, descendantId));
+export const getClientIdsOfDescendants = createSelector((state, rootIds) => {
+  rootIds = Array.isArray(rootIds) ? [...rootIds] : [rootIds];
+  const ids = [];
+
+  // Add the descendants of the root blocks first.
+  for (const rootId of rootIds) {
+    const order = state.blocks.order.get(rootId);
+    if (order) {
+      ids.push(...order);
     }
   }
-  return collectedIds;
+  let index = 0;
+
+  // Add the descendants of the descendants, recursively.
+  while (index < ids.length) {
+    const id = ids[index];
+    const order = state.blocks.order.get(id);
+    if (order) {
+      ids.splice(index + 1, 0, ...order);
+    }
+    index++;
+  }
+  return ids;
 }, state => [state.blocks.order]);
 
 /**
@@ -236,13 +251,7 @@ export const getClientIdsOfDescendants = createSelector((state, clientIds) => {
  *
  * @return {Array} ids of top-level and descendant blocks.
  */
-export const getClientIdsWithDescendants = createSelector(state => {
-  const collectedIds = [];
-  for (const topLevelId of getBlockOrder(state)) {
-    collectedIds.push(topLevelId, ...getClientIdsOfDescendants(state, topLevelId));
-  }
-  return collectedIds;
-}, state => [state.blocks.order]);
+export const getClientIdsWithDescendants = state => getClientIdsOfDescendants(state, '');
 
 /**
  * Returns the total number of blocks, or the total number of blocks with a specific name in a post.
@@ -258,10 +267,14 @@ export const getGlobalBlockCount = createSelector((state, blockName) => {
   if (!blockName) {
     return clientIds.length;
   }
-  return clientIds.reduce((accumulator, clientId) => {
+  let count = 0;
+  for (const clientId of clientIds) {
     const block = state.blocks.byClientId.get(clientId);
-    return block.name === blockName ? accumulator + 1 : accumulator;
-  }, 0);
+    if (block.name === blockName) {
+      count++;
+    }
+  }
+  return count;
 }, state => [state.blocks.order, state.blocks.byClientId]);
 
 /**
@@ -462,7 +475,8 @@ export function getSelectedBlock(state) {
  * @return {?string} Root client ID, if exists
  */
 export function getBlockRootClientId(state, clientId) {
-  return state.blocks.parents.has(clientId) ? state.blocks.parents.get(clientId) : null;
+  var _state$blocks$parents;
+  return (_state$blocks$parents = state.blocks.parents.get(clientId)) !== null && _state$blocks$parents !== void 0 ? _state$blocks$parents : null;
 }
 
 /**
@@ -477,8 +491,7 @@ export function getBlockRootClientId(state, clientId) {
 export const getBlockParents = createSelector((state, clientId, ascending = false) => {
   const parents = [];
   let current = clientId;
-  while (!!state.blocks.parents.get(current)) {
-    current = state.blocks.parents.get(current);
+  while (current = state.blocks.parents.get(current)) {
     parents.push(current);
   }
   if (!parents.length) {
@@ -1355,10 +1368,23 @@ const canInsertBlockTypeUnmemoized = (state, blockName, rootClientId = null) =>
   if (rootClientId && parentBlockListSettings === undefined) {
     return false;
   }
-  const parentAllowedBlocks = parentBlockListSettings?.allowedBlocks;
-  const hasParentAllowedBlock = checkAllowList(parentAllowedBlocks, blockName);
-  const blockAllowedParentBlocks = blockType.parent;
   const parentName = getBlockName(state, rootClientId);
+  const parentBlockType = getBlockType(parentName);
+
+  // Look at the `blockType.allowedBlocks` field to determine whether this is an allowed child block.
+  const parentAllowedChildBlocks = parentBlockType?.allowedBlocks;
+  let hasParentAllowedBlock = checkAllowList(parentAllowedChildBlocks, blockName);
+
+  // The `allowedBlocks` block list setting can further limit which blocks are allowed children.
+  if (hasParentAllowedBlock !== false) {
+    const parentAllowedBlocks = parentBlockListSettings?.allowedBlocks;
+    const hasParentListAllowedBlock = checkAllowList(parentAllowedBlocks, blockName);
+    // Never downgrade the result from `true` to `null`
+    if (hasParentListAllowedBlock !== null) {
+      hasParentAllowedBlock = hasParentListAllowedBlock;
+    }
+  }
+  const blockAllowedParentBlocks = blockType.parent;
   const hasBlockAllowedParent = checkAllowList(blockAllowedParentBlocks, parentName);
   let hasBlockAllowedAncestor = true;
   const blockAllowedAncestorBlocks = blockType.ancestor;
@@ -1654,9 +1680,14 @@ const buildBlockTypeItem = (state, {
   };
   if (buildScope === 'transform') return blockItemBase;
   const inserterVariations = getBlockVariations(blockType.name, 'inserter');
+  const ignoredHookedBlocks = [...new Set(Object.values(getHookedBlocks(id)).flat())];
   return {
     ...blockItemBase,
-    initialAttributes: {},
+    initialAttributes: ignoredHookedBlocks.length ? {
+      metadata: {
+        ignoredHookedBlocks
+      }
+    } : {},
     description: blockType.description,
     category: blockType.category,
     keywords: blockType.keywords,
@@ -2291,9 +2322,8 @@ export const __unstableGetVisibleBlocks = createSelector(state => {
 export const __unstableGetContentLockingParent = createSelector((state, clientId) => {
   let current = clientId;
   let result;
-  while (state.blocks.parents.has(current)) {
-    current = state.blocks.parents.get(current);
-    if (current && getBlockName(state, current) === 'core/block' || current && getTemplateLock(state, current) === 'contentOnly') {
+  while (current = state.blocks.parents.get(current)) {
+    if (getBlockName(state, current) === 'core/block' || getTemplateLock(state, current) === 'contentOnly') {
       result = current;
     }
   }
@@ -2394,8 +2424,9 @@ export function __unstableIsWithinBlockOverlay(state, clientId) {
  *                            `'contentOnly'`, or `'default'`.
  */
 export const getBlockEditingMode = createRegistrySelector(select => (state, clientId = '') => {
-  if (state.blockEditingModes.has(clientId)) {
-    return state.blockEditingModes.get(clientId);
+  const blockEditingMode = state.blockEditingModes.get(clientId);
+  if (blockEditingMode) {
+    return blockEditingMode;
   }
   if (!clientId) {
     return 'default';