@wordpress/block-editor 12.25.0 → 12.26.0

package/build/store/actions.js

@@ -771,22 +771,16 @@ const __unstableDeleteSelection = isForward => ({
 
 /**
  * Split the current selection.
+ * @param {?Array} blocks
  */
 exports.__unstableDeleteSelection = __unstableDeleteSelection;
-const __unstableSplitSelection = () => ({
+const __unstableSplitSelection = (blocks = []) => ({
+  registry,
   select,
   dispatch
 }) => {
   const selectionAnchor = select.getSelectionStart();
   const selectionFocus = select.getSelectionEnd();
-  if (selectionAnchor.clientId === selectionFocus.clientId) {
-    return;
-  }
-
-  // Can't split if the selection is not set.
-  if (!selectionAnchor.attributeKey || !selectionFocus.attributeKey || typeof selectionAnchor.offset === 'undefined' || typeof selectionFocus.offset === 'undefined') {
-    return;
-  }
   const anchorRootClientId = select.getBlockRootClientId(selectionAnchor.clientId);
   const focusRootClientId = select.getBlockRootClientId(selectionFocus.clientId);
 
@@ -812,8 +806,47 @@ const __unstableSplitSelection = () => ({
   const selectionB = selectionEnd;
   const blockA = select.getBlock(selectionA.clientId);
   const blockB = select.getBlock(selectionB.clientId);
-  const htmlA = blockA.attributes[selectionA.attributeKey];
-  const htmlB = blockB.attributes[selectionB.attributeKey];
+  const blockAType = (0, _blocks.getBlockType)(blockA.name);
+  const blockBType = (0, _blocks.getBlockType)(blockB.name);
+  const attributeKeyA = typeof selectionA.attributeKey === 'string' ? selectionA.attributeKey : (0, _selection.findRichTextAttributeKey)(blockAType);
+  const attributeKeyB = typeof selectionB.attributeKey === 'string' ? selectionB.attributeKey : (0, _selection.findRichTextAttributeKey)(blockBType);
+
+  // Can't split if the selection is not set.
+  if (!attributeKeyA || !attributeKeyB || typeof selectionAnchor.offset === 'undefined' || typeof selectionFocus.offset === 'undefined') {
+    return;
+  }
+
+  // We can do some short-circuiting if the selection is collapsed.
+  if (selectionA.clientId === selectionB.clientId && attributeKeyA === attributeKeyB && selectionA.offset === selectionB.offset) {
+    // If an unmodified default block is selected, replace it. We don't
+    // want to be converting into a default block.
+    if (blocks.length) {
+      if ((0, _blocks.isUnmodifiedDefaultBlock)(blockA)) {
+        dispatch.replaceBlocks([selectionA.clientId], blocks, blocks.length - 1, -1);
+        return;
+      }
+    }
+
+    // If selection is at the start or end, we can simply insert an
+    // empty block, provided this block has no inner blocks.
+    else if (!select.getBlockOrder(selectionA.clientId).length) {
+      function createEmpty() {
+        const defaultBlockName = (0, _blocks.getDefaultBlockName)();
+        return select.canInsertBlockType(defaultBlockName, anchorRootClientId) ? (0, _blocks.createBlock)(defaultBlockName) : (0, _blocks.createBlock)(select.getBlockName(selectionA.clientId));
+      }
+      const length = select.getBlockAttributes(selectionA.clientId)[attributeKeyA].length;
+      if (selectionA.offset === 0 && length) {
+        dispatch.insertBlocks([createEmpty()], select.getBlockIndex(selectionA.clientId), anchorRootClientId, false);
+        return;
+      }
+      if (selectionA.offset === length) {
+        dispatch.insertBlocks([createEmpty()], select.getBlockIndex(selectionA.clientId) + 1, anchorRootClientId);
+        return;
+      }
+    }
+  }
+  const htmlA = blockA.attributes[attributeKeyA];
+  const htmlB = blockB.attributes[attributeKeyB];
   let valueA = (0, _richText.create)({
     html: htmlA
   });
@@ -822,25 +855,97 @@ const __unstableSplitSelection = () => ({
   });
   valueA = (0, _richText.remove)(valueA, selectionA.offset, valueA.text.length);
   valueB = (0, _richText.remove)(valueB, 0, selectionB.offset);
-  dispatch.replaceBlocks(select.getSelectedBlockClientIds(), [{
+  let head = {
     // Preserve the original client ID.
     ...blockA,
+    // If both start and end are the same, should only copy innerBlocks
+    // once.
+    innerBlocks: blockA.clientId === blockB.clientId ? [] : blockA.innerBlocks,
     attributes: {
       ...blockA.attributes,
-      [selectionA.attributeKey]: (0, _richText.toHTMLString)({
+      [attributeKeyA]: (0, _richText.toHTMLString)({
         value: valueA
       })
     }
-  }, {
-    // Preserve the original client ID.
+  };
+  const tail = {
     ...blockB,
+    // Only preserve the original client ID if the end is different.
+    clientId: blockA.clientId === blockB.clientId ? (0, _blocks.createBlock)(blockB.name).clientId : blockB.clientId,
     attributes: {
       ...blockB.attributes,
-      [selectionB.attributeKey]: (0, _richText.toHTMLString)({
+      [attributeKeyB]: (0, _richText.toHTMLString)({
         value: valueB
       })
     }
-  }]);
+  };
+  if (!blocks.length) {
+    dispatch.replaceBlocks(select.getSelectedBlockClientIds(), [head, tail]);
+    return;
+  }
+  let selection;
+  const output = [];
+  const clonedBlocks = [...blocks];
+  const firstBlock = clonedBlocks.shift();
+  const headType = (0, _blocks.getBlockType)(head.name);
+  const firstBlocks = headType.merge && firstBlock.name === headType.name ? [firstBlock] : (0, _blocks.switchToBlockType)(firstBlock, headType.name);
+  if (firstBlocks?.length) {
+    const first = firstBlocks.shift();
+    head = {
+      ...head,
+      attributes: headType.merge(head.attributes, first.attributes)
+    };
+    output.push(head);
+    selection = {
+      clientId: head.clientId,
+      attributeKey: attributeKeyA,
+      offset: (0, _richText.create)({
+        html: head.attributes[attributeKeyA]
+      }).text.length
+    };
+    clonedBlocks.unshift(...firstBlocks);
+  } else {
+    if (!(0, _blocks.isUnmodifiedBlock)(head)) {
+      output.push(head);
+    }
+    output.push(firstBlock);
+  }
+  const lastBlock = clonedBlocks.pop();
+  const tailType = (0, _blocks.getBlockType)(tail.name);
+  if (clonedBlocks.length) {
+    output.push(...clonedBlocks);
+  }
+  if (lastBlock) {
+    const lastBlocks = tailType.merge && tailType.name === lastBlock.name ? [lastBlock] : (0, _blocks.switchToBlockType)(lastBlock, tailType.name);
+    if (lastBlocks?.length) {
+      const last = lastBlocks.pop();
+      output.push({
+        ...tail,
+        attributes: tailType.merge(last.attributes, tail.attributes)
+      });
+      output.push(...lastBlocks);
+      selection = {
+        clientId: tail.clientId,
+        attributeKey: attributeKeyB,
+        offset: (0, _richText.create)({
+          html: last.attributes[attributeKeyB]
+        }).text.length
+      };
+    } else {
+      output.push(lastBlock);
+      if (!(0, _blocks.isUnmodifiedBlock)(tail)) {
+        output.push(tail);
+      }
+    }
+  } else if (!(0, _blocks.isUnmodifiedBlock)(tail)) {
+    output.push(tail);
+  }
+  registry.batch(() => {
+    dispatch.replaceBlocks(select.getSelectedBlockClientIds(), output, output.length - 1, 0);
+    if (selection) {
+      dispatch.selectionChange(selection.clientId, selection.attributeKey, selection.offset, selection.offset);
+    }
+  });
 };
 
 /**
@@ -1316,33 +1421,22 @@ const __unstableSetEditorMode = mode => ({
   // When switching to zoom-out mode, we need to select the parent section
   if (mode === 'zoom-out') {
     const firstSelectedClientId = select.getBlockSelectionStart();
-    const allBlocks = select.getBlocks();
     const {
       sectionRootClientId
     } = (0, _lockUnlock.unlock)(registry.select(_constants.STORE_NAME).getSettings());
-    if (sectionRootClientId) {
-      const sectionClientIds = select.getBlockOrder(sectionRootClientId);
-      const lastSectionClientId = sectionClientIds[sectionClientIds.length - 1];
-      if (sectionClientIds) {
-        if (firstSelectedClientId) {
-          const parents = select.getBlockParents(firstSelectedClientId);
-          const firstSectionClientId = parents.find(parent => sectionClientIds.includes(parent));
-          if (firstSectionClientId) {
-            dispatch.selectBlock(firstSectionClientId);
-          } else {
-            dispatch.selectBlock(lastSectionClientId);
-          }
-        } else {
-          dispatch.selectBlock(lastSectionClientId);
-        }
+    if (firstSelectedClientId) {
+      let sectionClientId;
+      if (sectionRootClientId) {
+        const sectionClientIds = select.getBlockOrder(sectionRootClientId);
+        sectionClientId = select.getBlockParents(firstSelectedClientId).find(parent => sectionClientIds.includes(parent));
+      } else {
+        sectionClientId = select.getBlockHierarchyRootClientId(firstSelectedClientId);
+      }
+      if (sectionClientId) {
+        dispatch.selectBlock(sectionClientId);
+      } else {
+        dispatch.clearSelectedBlock();
       }
-    } else if (firstSelectedClientId) {
-      const rootClientId = select.getBlockHierarchyRootClientId(firstSelectedClientId);
-      dispatch.selectBlock(rootClientId);
-    } else {
-      // If there's no block selected and no sectionRootClientId, select the last root block.
-      const lastRootBlock = allBlocks[allBlocks.length - 1];
-      dispatch.selectBlock(lastRootBlock?.clientId);
     }
   }
   dispatch({