tinymce-rails 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d8e59d489555f3c9025c77f367daedc97aaa51c790a343ddbb43a6ea74fde3
-  data.tar.gz: a2965c692e2763103b0896b82496f66e35151c7139e876e0ea440014bfa76aa6
+  metadata.gz: 7ee5e9b71449a34d4aedddecdde6b1277984b25c1ee488a2329c7bf9ac17e8c6
+  data.tar.gz: f7b1045d910db2562ed15b7a2e303a76399e98a0fcc3db4d4f8b648c0fecf360
 SHA512:
-  metadata.gz: 2ee08355adcec31ef59e297505ff58a23c759e6dba194fd6385babb1b77e55ee68604654ff32f0f10204c547e4513f714fe1356f9628ac19f3e6c3220df539c5
-  data.tar.gz: 1444057af973cd6781f81554a358507a6d062507fcfa399e59a5bb2be8a3d3dcfbf70ea81eceb704218115b70c60ad06651e5cdc21f14c9971a3053bb13ba743
+  metadata.gz: d09a0ebc460617da1fecea63297f6c3839ca6e703a149cd06e0e6cbd85c1898b2dbd6d3a66444c9854c7be8ce85bc664fcc6f0c946b0248b3977518b52ef1af7
+  data.tar.gz: 33ead508c3782bc530b51bb1b1fb812f229026338930c57eaccc50c20fc1ae5e440715e730e1444f8495971710e586ae8b9fadecd1a17085e927d6d012969d71

data/app/assets/source/tinymce/tinymce.js

@@ -1,5 +1,5 @@
 /**
- * TinyMCE version 7.2.0 (2024-06-19)
+ * TinyMCE version 7.2.1 (2024-07-03)
  */
 
 (function () {
@@ -21304,12 +21304,26 @@
     };
     const read$1 = (schema, rootNode, forward, rng) => rng.collapsed ? readFromRange(schema, rootNode, forward, rng) : Optional.none();
 
-    const getChildrenUntilBlockBoundary = (block, schema) => {
-      const children = children$1(block);
-      return findIndex$2(children, el => schema.isBlock(name(el))).fold(constant(children), index => children.slice(0, index));
+    const getChildrenFromNestedUntilBlockBoundary = (block, schema, forwardDelete) => {
+      const allSiblingsInDirection = forwardDelete ? prevSiblings(block).reverse() : nextSiblings(block);
+      const siblingsToMergeIn = findIndex$2(allSiblingsInDirection, element => schema.isBlock(name(element))).fold(constant(allSiblingsInDirection), index => allSiblingsInDirection.slice(0, index));
+      if (forwardDelete) {
+        return siblingsToMergeIn.reverse();
+      }
+      return siblingsToMergeIn;
     };
-    const extractChildren = (block, schema) => {
-      const children = getChildrenUntilBlockBoundary(block, schema);
+    const getChildrenUntilBlockBoundary = (toBlock, fromBlock, schema, forwardDelete, extractsiblingsIfNested) => {
+      if (extractsiblingsIfNested && contains(toBlock, fromBlock)) {
+        return getChildrenFromNestedUntilBlockBoundary(fromBlock, schema, forwardDelete);
+      } else if (extractsiblingsIfNested && contains(fromBlock, toBlock)) {
+        return getChildrenFromNestedUntilBlockBoundary(toBlock, schema, forwardDelete);
+      } else {
+        const children = children$1(fromBlock);
+        return findIndex$2(children, el => schema.isBlock(name(el))).fold(constant(children), index => children.slice(0, index));
+      }
+    };
+    const extractChildren = (toBlock, fromBlock, schema, forwardDelete, extractsiblingsIfNested) => {
+      const children = getChildrenUntilBlockBoundary(toBlock, fromBlock, schema, forwardDelete, extractsiblingsIfNested);
       each$e(children, remove$4);
       return children;
     };
@@ -21318,7 +21332,7 @@
       return find$2(parents.reverse(), element => isEmpty$2(schema, element)).each(remove$4);
     };
     const isEmptyBefore = (schema, el) => filter$5(prevSiblings(el), el => !isEmpty$2(schema, el)).length === 0;
-    const nestedBlockMerge = (rootNode, fromBlock, toBlock, schema, insertionPoint) => {
+    const nestedBlockMerge = (rootNode, fromBlock, toBlock, schema, forward, insertionPoint) => {
       if (isEmpty$2(schema, toBlock)) {
         fillWithPaddingBr(toBlock);
         return firstPositionIn(toBlock.dom);
@@ -21327,14 +21341,14 @@
         before$3(insertionPoint, SugarElement.fromTag('br'));
       }
       const position = prevPosition(toBlock.dom, CaretPosition.before(insertionPoint.dom));
-      each$e(extractChildren(fromBlock, schema), child => {
+      each$e(extractChildren(toBlock, fromBlock, schema, forward, false), child => {
         before$3(insertionPoint, child);
       });
       removeEmptyRoot(schema, rootNode, fromBlock);
       return position;
     };
     const isInline = (schema, node) => schema.isInline(name(node));
-    const sidelongBlockMerge = (rootNode, fromBlock, toBlock, schema) => {
+    const sidelongBlockMerge = (rootNode, fromBlock, toBlock, schema, forwardDelete) => {
       if (isEmpty$2(schema, toBlock)) {
         if (isEmpty$2(schema, fromBlock)) {
           const getInlineToBlockDescendants = el => {
@@ -21352,8 +21366,12 @@
         return firstPositionIn(fromBlock.dom);
       }
       const position = lastPositionIn(toBlock.dom);
-      each$e(extractChildren(fromBlock, schema), child => {
-        append$1(toBlock, child);
+      each$e(extractChildren(toBlock, fromBlock, schema, forwardDelete, true), child => {
+        if (forwardDelete && contains(fromBlock, toBlock)) {
+          prepend(toBlock, child);
+        } else {
+          append$1(toBlock, child);
+        }
       });
       removeEmptyRoot(schema, rootNode, fromBlock);
       return position;
@@ -21366,17 +21384,26 @@
     const trimBr = (first, block) => {
       positionIn(first, block.dom).bind(position => Optional.from(position.getNode())).map(SugarElement.fromDom).filter(isBr$5).each(remove$4);
     };
-    const mergeBlockInto = (rootNode, fromBlock, toBlock, schema) => {
+    const mergeBlockInto = (rootNode, fromBlock, toBlock, schema, forward) => {
       trimBr(true, fromBlock);
       trimBr(false, toBlock);
-      return getInsertionPoint(fromBlock, toBlock).fold(curry(sidelongBlockMerge, rootNode, fromBlock, toBlock, schema), curry(nestedBlockMerge, rootNode, fromBlock, toBlock, schema));
+      return getInsertionPoint(fromBlock, toBlock).fold(curry(sidelongBlockMerge, rootNode, fromBlock, toBlock, schema, forward), curry(nestedBlockMerge, rootNode, fromBlock, toBlock, schema, forward));
+    };
+    const mergeBlocks = (rootNode, forward, block1, block2, schema, mergeNotDelete = false) => {
+      if (mergeNotDelete) {
+        if (contains(block2, block1)) {
+          return mergeBlockInto(rootNode, block2, block1, schema, !forward);
+        } else if (contains(block1, block2)) {
+          return mergeBlockInto(rootNode, block1, block2, schema, forward);
+        }
+      }
+      return forward ? mergeBlockInto(rootNode, block2, block1, schema, forward) : mergeBlockInto(rootNode, block1, block2, schema, !forward);
     };
-    const mergeBlocks = (rootNode, forward, block1, block2, schema) => forward ? mergeBlockInto(rootNode, block2, block1, schema) : mergeBlockInto(rootNode, block1, block2, schema);
 
     const backspaceDelete$a = (editor, forward) => {
       const rootNode = SugarElement.fromDom(editor.getBody());
       const position = read$1(editor.schema, rootNode.dom, forward, editor.selection.getRng()).map(blockBoundary => () => {
-        mergeBlocks(rootNode, forward, blockBoundary.from.block, blockBoundary.to.block, editor.schema).each(pos => {
+        mergeBlocks(rootNode, forward, blockBoundary.from.block, blockBoundary.to.block, editor.schema, true).each(pos => {
           editor.selection.setRng(pos.toRange());
         });
       });
@@ -31491,8 +31518,8 @@
       documentBaseURL: null,
       suffix: null,
       majorVersion: '7',
-      minorVersion: '2.0',
-      releaseDate: '2024-06-19',
+      minorVersion: '2.1',
+      releaseDate: '2024-07-03',
       i18n: I18n,
       activeEditor: null,
       focusedEditor: null,

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "7.2.0"
-    TINYMCE_VERSION = "7.2.0"
+    VERSION = "7.2.1"
+    TINYMCE_VERSION = "7.2.1"
   end
 end