@wordpress/block-editor 16.1.0 → 16.2.0

package/build/store/actions.cjs

@@ -107,6 +107,7 @@ var import_deprecated = __toESM(require("@wordpress/deprecated"));
 var import_preferences = require("@wordpress/preferences");
 var import_selection = require("../utils/selection.cjs");
 var import_private_actions = require("./private-actions.cjs");
+var import_sibling_block_attributes = require("../utils/sibling-block-attributes.cjs");
 var castArray = (maybeArray) => Array.isArray(maybeArray) ? maybeArray : [maybeArray];
 var resetBlocks = (blocks) => ({ dispatch }) => {
   dispatch({ type: "RESET_BLOCKS", blocks });
@@ -219,10 +220,26 @@ var multiSelect = (start, end, __experimentalInitialPosition = 0) => ({ select,
     initialPosition: __experimentalInitialPosition
   });
   const blockCount = select.getSelectedBlockCount();
+  const nestedBlockCount = select.getClientIdsOfDescendants(
+    select.getMultiSelectedBlockClientIds()
+  ).length;
   (0, import_a11y.speak)(
-    (0, import_i18n.sprintf)(
+    nestedBlockCount ? (0, import_i18n.sprintf)(
+      /* translators: 1: number of selected blocks. 2: number of blocks including nested blocks. */
+      (0, import_i18n._n)(
+        "%1$s block selected, %2$s including nested blocks.",
+        "%1$s blocks selected, %2$s including nested blocks.",
+        blockCount
+      ),
+      blockCount,
+      blockCount + nestedBlockCount
+    ) : (0, import_i18n.sprintf)(
       /* translators: %s: number of selected blocks */
-      (0, import_i18n._n)("%s block selected.", "%s blocks selected.", blockCount),
+      (0, import_i18n._n)(
+        "%s block selected.",
+        "%s blocks selected.",
+        blockCount
+      ),
       blockCount
     ),
     "assertive"
@@ -253,16 +270,24 @@ var replaceBlocks = (clientIds, blocks, indexToSelect, initialPosition = 0, meta
       return;
     }
   }
+  const blocksWithTemplates = applyBlockTypeTemplates(blocks);
   registry.batch(() => {
     dispatch({
       type: "REPLACE_BLOCKS",
       clientIds,
-      blocks,
+      blocks: blocksWithTemplates,
       time: Date.now(),
       indexToSelect,
       initialPosition,
       meta
     });
+    selectBlockTypeTemplate(
+      select,
+      dispatch,
+      blocks,
+      blocksWithTemplates,
+      initialPosition
+    );
     dispatch.ensureDefaultBlock();
   });
 };
@@ -322,7 +347,47 @@ function insertBlock(block, index, rootClientId, updateSelection, initialPositio
     meta
   );
 }
-var insertBlocks = (blocks, index, rootClientId, updateSelection = true, initialPosition = 0, meta) => ({ select, dispatch }) => {
+function applyBlockTypeTemplates(blocks, expandedTypes = /* @__PURE__ */ new Set()) {
+  let hasChanges = false;
+  const result = blocks.map((block) => {
+    let { innerBlocks } = block;
+    if (innerBlocks?.length) {
+      innerBlocks = applyBlockTypeTemplates(innerBlocks, expandedTypes);
+    } else if (!expandedTypes.has(block.name)) {
+      const { template } = (0, import_blocks.getBlockType)(block.name) ?? {};
+      if (template?.length) {
+        innerBlocks = applyBlockTypeTemplates(
+          (0, import_blocks.synchronizeBlocksWithTemplate)([], template),
+          new Set(expandedTypes).add(block.name)
+        );
+      }
+    }
+    if (innerBlocks === block.innerBlocks) {
+      return block;
+    }
+    hasChanges = true;
+    return { ...block, innerBlocks };
+  });
+  return hasChanges ? result : blocks;
+}
+function selectBlockTypeTemplate(select, dispatch, originalBlocks, blocksWithTemplates, initialPosition) {
+  const selectedClientId = select.getSelectedBlockClientId();
+  if (!selectedClientId) {
+    return;
+  }
+  const index = blocksWithTemplates.findIndex(
+    (block2) => block2.clientId === selectedClientId
+  );
+  if (index === -1 || blocksWithTemplates[index] === originalBlocks[index] || !blocksWithTemplates[index].innerBlocks.length || !(0, import_blocks.getBlockType)(blocksWithTemplates[index].name)?.templateInsertUpdatesSelection) {
+    return;
+  }
+  let block = blocksWithTemplates[index];
+  while (block.innerBlocks[0]) {
+    block = block.innerBlocks[0];
+  }
+  dispatch.selectBlock(block.clientId, initialPosition);
+}
+var insertBlocks = (blocks, index, rootClientId, updateSelection = true, initialPosition = 0, meta) => ({ select, dispatch, registry }) => {
   if (initialPosition !== null && typeof initialPosition === "object") {
     meta = initialPosition;
     initialPosition = 0;
@@ -346,15 +411,25 @@ var insertBlocks = (blocks, index, rootClientId, updateSelection = true, initial
     }
   }
   if (allowedBlocks.length) {
-    dispatch({
-      type: "INSERT_BLOCKS",
-      blocks: allowedBlocks,
-      index,
-      rootClientId,
-      time: Date.now(),
-      updateSelection,
-      initialPosition: updateSelection ? initialPosition : null,
-      meta
+    const blocksWithTemplates = applyBlockTypeTemplates(allowedBlocks);
+    registry.batch(() => {
+      dispatch({
+        type: "INSERT_BLOCKS",
+        blocks: blocksWithTemplates,
+        index,
+        rootClientId,
+        time: Date.now(),
+        updateSelection,
+        initialPosition: updateSelection ? initialPosition : null,
+        meta
+      });
+      selectBlockTypeTemplate(
+        select,
+        dispatch,
+        allowedBlocks,
+        blocksWithTemplates,
+        initialPosition
+      );
     });
   }
 };
@@ -569,11 +644,16 @@ var __unstableSplitSelection = (blocks = []) => ({ registry, select, dispatch })
     } else if (!select.getBlockOrder(selectionA.clientId).length) {
       let createEmpty2 = function() {
         const defaultBlockName2 = (0, import_blocks.getDefaultBlockName)();
-        return select.canInsertBlockType(
+        if (select.canInsertBlockType(
           defaultBlockName2,
           anchorRootClientId
-        ) ? (0, import_blocks.createBlock)(defaultBlockName2) : (0, import_blocks.createBlock)(
-          select.getBlockName(selectionA.clientId)
+        )) {
+          return (0, import_blocks.createBlock)(defaultBlockName2);
+        }
+        const name = select.getBlockName(selectionA.clientId);
+        return (0, import_blocks.createBlock)(
+          name,
+          (0, import_sibling_block_attributes.getSiblingBlockAttributes)(name, blockAttributes)
         );
       };
       var createEmpty = createEmpty2;
@@ -1067,18 +1147,12 @@ var insertBeforeBlock = (clientId) => ({ select, dispatch }) => {
   if (!directInsertBlock) {
     return dispatch.insertDefaultBlock({}, rootClientId, blockIndex);
   }
-  const copiedAttributes = {};
-  if (directInsertBlock.attributesToCopy) {
-    const attributes = select.getBlockAttributes(clientId);
-    directInsertBlock.attributesToCopy.forEach((key) => {
-      if (attributes[key]) {
-        copiedAttributes[key] = attributes[key];
-      }
-    });
-  }
   const block = (0, import_blocks.createBlock)(directInsertBlock.name, {
     ...directInsertBlock.attributes,
-    ...copiedAttributes
+    ...select.getBlockName(clientId) === directInsertBlock.name ? (0, import_sibling_block_attributes.getSiblingBlockAttributes)(
+      directInsertBlock.name,
+      select.getBlockAttributes(clientId)
+    ) : {}
   });
   return dispatch.insertBlock(block, blockIndex, rootClientId);
 };
@@ -1096,18 +1170,12 @@ var insertAfterBlock = (clientId) => ({ select, dispatch }) => {
       blockIndex + 1
     );
   }
-  const copiedAttributes = {};
-  if (directInsertBlock.attributesToCopy) {
-    const attributes = select.getBlockAttributes(clientId);
-    directInsertBlock.attributesToCopy.forEach((key) => {
-      if (attributes[key]) {
-        copiedAttributes[key] = attributes[key];
-      }
-    });
-  }
   const block = (0, import_blocks.createBlock)(directInsertBlock.name, {
     ...directInsertBlock.attributes,
-    ...copiedAttributes
+    ...select.getBlockName(clientId) === directInsertBlock.name ? (0, import_sibling_block_attributes.getSiblingBlockAttributes)(
+      directInsertBlock.name,
+      select.getBlockAttributes(clientId)
+    ) : {}
   });
   return dispatch.insertBlock(block, blockIndex + 1, rootClientId);
 };