tinymce-rails 7.1.2.1 → 7.2.1

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

@@ -1,5 +1,5 @@
 /**
- * TinyMCE version 7.1.2 (TBD)
+ * TinyMCE version 7.2.1 (2024-07-03)
  */
 
 (function () {
@@ -1392,7 +1392,6 @@
     const firstChild = element => child$1(element, 0);
     const lastChild = element => child$1(element, element.dom.childNodes.length - 1);
     const childNodesCount = element => element.dom.childNodes.length;
-    const hasChildNodes = element => element.dom.hasChildNodes();
 
     const getHead = doc => {
       const b = doc.dom.head;
@@ -3016,7 +3015,7 @@
         addAttrs('a', 'download');
         addAttrs('link script img', 'crossorigin');
         addAttrs('img', 'loading');
-        addAttrs('iframe', 'sandbox seamless allow allowfullscreen loading');
+        addAttrs('iframe', 'sandbox seamless allow allowfullscreen loading referrerpolicy');
       }
       if (type !== 'html4') {
         each$e([
@@ -6530,7 +6529,7 @@
         forward
       };
     };
-    const getBookmark$2 = (selection, type, normalized = false) => {
+    const getBookmark$3 = (selection, type, normalized = false) => {
       if (type === 2) {
         return getOffsetBookmark(trim$2, normalized, selection);
       } else if (type === 3) {
@@ -8608,8 +8607,8 @@
       return Optional.none();
     };
 
-    const getBookmark$1 = (selection, type, normalized) => {
-      return getBookmark$2(selection, type, normalized);
+    const getBookmark$2 = (selection, type, normalized) => {
+      return getBookmark$3(selection, type, normalized);
     };
     const moveToBookmark = (selection, bookmark) => {
       resolve(selection, bookmark).each(({range, forward}) => {
@@ -9445,7 +9444,7 @@
 
     const BookmarkManager = selection => {
       return {
-        getBookmark: curry(getBookmark$1, selection),
+        getBookmark: curry(getBookmark$2, selection),
         moveToBookmark: curry(moveToBookmark, selection)
       };
     };
@@ -10723,7 +10722,7 @@
       const rng = !selection || selection.rangeCount === 0 ? Optional.none() : Optional.from(selection.getRangeAt(0));
       return rng.map(nativeRangeToSelectionRange);
     };
-    const getBookmark = root => {
+    const getBookmark$1 = root => {
       const win = defaultView(root);
       return readRange(win.dom).filter(isRngInRoot(root));
     };
@@ -10739,7 +10738,7 @@
       }
     };
     const store = editor => {
-      const newBookmark = shouldStore(editor) ? getBookmark(SugarElement.fromDom(editor.getBody())) : Optional.none();
+      const newBookmark = shouldStore(editor) ? getBookmark$1(SugarElement.fromDom(editor.getBody())) : Optional.none();
       editor.bookmark = newBookmark.isSome() ? newBookmark : editor.bookmark;
     };
     const getRng = editor => {
@@ -10970,15 +10969,21 @@
       const body = editor.getBody();
       let rng = selection.getRng();
       editor.quirks.refreshContentEditable();
-      if (isNonNullable(editor.bookmark) && !hasFocus(editor)) {
+      const restoreBookmark = editor => {
         getRng(editor).each(bookmarkRng => {
           editor.selection.setRng(bookmarkRng);
           rng = bookmarkRng;
         });
+      };
+      if (!hasFocus(editor) && editor.hasEditableRoot()) {
+        restoreBookmark(editor);
       }
       const contentEditableHost = getContentEditableHost(editor, selection.getNode());
       if (contentEditableHost && editor.dom.isChildOf(contentEditableHost, body)) {
         focusBody(contentEditableHost);
+        if (!editor.hasEditableRoot()) {
+          restoreBookmark(editor);
+        }
         normalizeSelection(editor, rng);
         activateEditor(editor);
         return;
@@ -11738,7 +11743,6 @@
         'background',
         'background-attachment',
         'background-clip',
-        'background-color',
         'background-image',
         'background-origin',
         'background-position',
@@ -11774,14 +11778,24 @@
         nonInheritableStyles.add(style);
       });
     })();
+    const conditionalNonInheritableStyles = new Set();
+    (() => {
+      const conditionalNonInheritableStylesArr = ['background-color'];
+      each$e(conditionalNonInheritableStylesArr, style => {
+        conditionalNonInheritableStyles.add(style);
+      });
+    })();
     const shorthandStyleProps = [
       'font',
       'text-decoration',
       'text-emphasis'
     ];
-    const getStyleProps = (dom, node) => keys(dom.parseStyle(dom.getAttrib(node, 'style')));
+    const getStyles$1 = (dom, node) => dom.parseStyle(dom.getAttrib(node, 'style'));
+    const getStyleProps = (dom, node) => keys(getStyles$1(dom, node));
     const isNonInheritableStyle = style => nonInheritableStyles.has(style);
-    const hasInheritableStyles = (dom, node) => forall(getStyleProps(dom, node), style => !isNonInheritableStyle(style));
+    const isConditionalNonInheritableStyle = style => conditionalNonInheritableStyles.has(style);
+    const hasNonInheritableStyles = (dom, node) => exists(getStyleProps(dom, node), style => isNonInheritableStyle(style));
+    const hasConditionalNonInheritableStyles = (dom, node) => hasNonInheritableStyles(dom, node) && exists(getStyleProps(dom, node), style => isConditionalNonInheritableStyle(style));
     const getLonghandStyleProps = styles => filter$5(styles, style => exists(shorthandStyleProps, prop => startsWith(style, prop)));
     const hasStyleConflict = (dom, node, parentNode) => {
       const nodeStyleProps = getStyleProps(dom, node);
@@ -12508,7 +12522,7 @@
       const rootElm = SugarElement.fromDom(editor.getBody());
       return getParentCaption(rootElm, startElm).fold(() => deleteCaretCells(editor, forward, rootElm, startElm).orThunk(() => someIf(isBeforeOrAfterTable(editor, forward), noop)), fromCaption => deleteCaretCaption(editor, forward, rootElm, fromCaption));
     };
-    const backspaceDelete$a = (editor, forward) => {
+    const backspaceDelete$b = (editor, forward) => {
       const startElm = SugarElement.fromDom(editor.selection.getStart(true));
       const cells = getCellsFromEditor(editor);
       return editor.selection.isCollapsed() && cells.length === 0 ? deleteCaret$3(editor, forward, startElm) : deleteRange$3(editor, startElm, cells);
@@ -13062,18 +13076,20 @@
       if (merge) {
         const root = editor.getBody();
         const elementUtils = ElementUtils(editor);
-        Tools.each(dom.select('*[data-mce-fragment]'), node => {
-          const isInline = isNonNullable(textInlineElements[node.nodeName.toLowerCase()]);
-          if (isInline && hasInheritableStyles(dom, node)) {
-            for (let parentNode = node.parentElement; isNonNullable(parentNode) && parentNode !== root; parentNode = parentNode.parentElement) {
-              const styleConflict = hasStyleConflict(dom, node, parentNode);
-              if (styleConflict) {
-                break;
-              }
-              if (elementUtils.compare(parentNode, node)) {
-                dom.remove(node, true);
-                break;
-              }
+        const fragmentSelector = '*[data-mce-fragment]';
+        const fragments = dom.select(fragmentSelector);
+        Tools.each(fragments, node => {
+          const isInline = currentNode => isNonNullable(textInlineElements[currentNode.nodeName.toLowerCase()]);
+          const hasOneChild = currentNode => currentNode.childNodes.length === 1;
+          const hasNoNonInheritableStyles = currentNode => !(hasNonInheritableStyles(dom, currentNode) || hasConditionalNonInheritableStyles(dom, currentNode));
+          if (hasNoNonInheritableStyles(node) && isInline(node) && hasOneChild(node)) {
+            const styles = getStyleProps(dom, node);
+            const isOverridden = (oldStyles, newStyles) => forall(oldStyles, style => contains$2(newStyles, style));
+            const overriddenByAllChildren = childNode => hasOneChild(node) && dom.is(childNode, fragmentSelector) && isInline(childNode) && (childNode.nodeName === node.nodeName && isOverridden(styles, getStyleProps(dom, childNode)) || overriddenByAllChildren(childNode.children[0]));
+            const identicalToParent = parentNode => isNonNullable(parentNode) && parentNode !== root && (elementUtils.compare(node, parentNode) || identicalToParent(parentNode.parentElement));
+            const conflictWithInsertedParent = parentNode => isNonNullable(parentNode) && parentNode !== root && dom.is(parentNode, fragmentSelector) && (hasStyleConflict(dom, node, parentNode) || conflictWithInsertedParent(parentNode.parentElement));
+            if (overriddenByAllChildren(node.children[0]) || identicalToParent(node.parentElement) && !conflictWithInsertedParent(node.parentElement)) {
+              dom.remove(node, true);
             }
           }
         });
@@ -17252,7 +17268,7 @@
     const makeMap = Tools.makeMap, extend$1 = Tools.extend;
     const transferChildren = (parent, nativeParent, specialElements, nsSanitizer) => {
       const parentName = parent.name;
-      const isSpecial = parentName in specialElements && parentName !== 'title' && parentName !== 'textarea';
+      const isSpecial = parentName in specialElements && parentName !== 'title' && parentName !== 'textarea' && parentName !== 'noscript';
       const childNodes = nativeParent.childNodes;
       for (let ni = 0, nl = childNodes.length; ni < nl; ni++) {
         const nativeChild = childNodes[ni];
@@ -19007,16 +19023,6 @@
           }
         }
       });
-      htmlParser.addNodeFilter('noscript', nodes => {
-        var _a;
-        let i = nodes.length;
-        while (i--) {
-          const node = nodes[i].firstChild;
-          if (node) {
-            node.value = Entities.decode((_a = node.value) !== null && _a !== void 0 ? _a : '');
-          }
-        }
-      });
       htmlParser.addNodeFilter('script,style', (nodes, name) => {
         var _a;
         const trim = value => {
@@ -21298,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 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 = (block, schema) => {
-      const children = getChildrenUntilBlockBoundary(block, schema);
+    const extractChildren = (toBlock, fromBlock, schema, forwardDelete, extractsiblingsIfNested) => {
+      const children = getChildrenUntilBlockBoundary(toBlock, fromBlock, schema, forwardDelete, extractsiblingsIfNested);
       each$e(children, remove$4);
       return children;
     };
@@ -21312,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);
@@ -21321,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 => {
@@ -21346,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;
@@ -21360,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$9 = (editor, forward) => {
+    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());
         });
       });
@@ -21414,7 +21447,7 @@
       const rng = editor.selection.getRng();
       return isEverythingSelected(rootNode, rng) ? emptyEditor(editor) : deleteRangeMergeBlocks(rootNode, editor.selection, editor.schema);
     };
-    const backspaceDelete$8 = (editor, _forward) => editor.selection.isCollapsed() ? Optional.none() : deleteRange$2(editor);
+    const backspaceDelete$9 = (editor, _forward) => editor.selection.isCollapsed() ? Optional.none() : deleteRange$2(editor);
 
     const showCaret = (direction, editor, node, before, scrollIntoView) => Optional.from(editor._selectionOverrides.showCaret(direction, node, before, scrollIntoView));
     const getNodeRange = node => {
@@ -21497,7 +21530,7 @@
       }
       return Optional.none();
     };
-    const backspaceDelete$7 = (editor, forward) => deleteBoundaryText(editor, forward);
+    const backspaceDelete$8 = (editor, forward) => deleteBoundaryText(editor, forward);
 
     const getEdgeCefPosition = (editor, atStart) => {
       const root = editor.getBody();
@@ -21636,7 +21669,7 @@
       }
       return true;
     };
-    const backspaceDelete$6 = (editor, forward) => {
+    const backspaceDelete$7 = (editor, forward) => {
       if (editor.selection.isCollapsed()) {
         return backspaceDeleteCaret(editor, forward);
       } else {
@@ -21644,6 +21677,98 @@
       }
     };
 
+    const isTextEndpoint = endpoint => endpoint.hasOwnProperty('text');
+    const isElementEndpoint = endpoint => endpoint.hasOwnProperty('marker');
+    const getBookmark = (range, createMarker) => {
+      const getEndpoint = (container, offset) => {
+        if (isText$b(container)) {
+          return {
+            text: container,
+            offset
+          };
+        } else {
+          const marker = createMarker();
+          const children = container.childNodes;
+          if (offset < children.length) {
+            container.insertBefore(marker, children[offset]);
+            return {
+              marker,
+              before: true
+            };
+          } else {
+            container.appendChild(marker);
+            return {
+              marker,
+              before: false
+            };
+          }
+        }
+      };
+      const end = getEndpoint(range.endContainer, range.endOffset);
+      const start = getEndpoint(range.startContainer, range.startOffset);
+      return {
+        start,
+        end
+      };
+    };
+    const resolveBookmark = bm => {
+      var _a, _b;
+      const {start, end} = bm;
+      const rng = new window.Range();
+      if (isTextEndpoint(start)) {
+        rng.setStart(start.text, start.offset);
+      } else {
+        if (isElementEndpoint(start)) {
+          if (start.before) {
+            rng.setStartBefore(start.marker);
+          } else {
+            rng.setStartAfter(start.marker);
+          }
+          (_a = start.marker.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(start.marker);
+        }
+      }
+      if (isTextEndpoint(end)) {
+        rng.setEnd(end.text, end.offset);
+      } else {
+        if (isElementEndpoint(end)) {
+          if (end.before) {
+            rng.setEndBefore(end.marker);
+          } else {
+            rng.setEndAfter(end.marker);
+          }
+          (_b = end.marker.parentNode) === null || _b === void 0 ? void 0 : _b.removeChild(end.marker);
+        }
+      }
+      return rng;
+    };
+
+    const backspaceDelete$6 = (editor, forward) => {
+      var _a;
+      const dom = editor.dom;
+      const startBlock = dom.getParent(editor.selection.getStart(), dom.isBlock);
+      const endBlock = dom.getParent(editor.selection.getEnd(), dom.isBlock);
+      const body = editor.getBody();
+      const startBlockName = (_a = startBlock === null || startBlock === void 0 ? void 0 : startBlock.nodeName) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+      if (startBlockName === 'div' && startBlock && endBlock && startBlock === body.firstChild && endBlock === body.lastChild && !dom.isEmpty(body)) {
+        const wrapper = startBlock.cloneNode(false);
+        const deleteAction = () => {
+          if (forward) {
+            execNativeForwardDeleteCommand(editor);
+          } else {
+            execNativeDeleteCommand(editor);
+          }
+          if (body.firstChild !== startBlock) {
+            const bookmark = getBookmark(editor.selection.getRng(), () => document.createElement('span'));
+            Array.from(body.childNodes).forEach(node => wrapper.appendChild(node));
+            body.appendChild(wrapper);
+            editor.selection.setRng(resolveBookmark(bookmark));
+          }
+        };
+        return Optional.some(deleteAction);
+      }
+      return Optional.none();
+    };
+
     const deleteCaret$2 = (editor, forward) => {
       const fromPos = CaretPosition.fromRangeStart(editor.selection.getRng());
       return fromPosition(forward, editor.getBody(), fromPos).filter(pos => forward ? isBeforeImageBlock(pos) : isAfterImageBlock(pos)).bind(pos => getChildNodeAtRelativeOffset(forward ? 0 : -1, pos)).map(elm => () => editor.selection.select(elm));
@@ -22544,15 +22669,16 @@
 
     const findAction = (editor, caret, forward) => findMap([
       backspaceDelete$1,
-      backspaceDelete$6,
       backspaceDelete$7,
+      backspaceDelete$8,
       (editor, forward) => backspaceDelete$4(editor, caret, forward),
-      backspaceDelete$9,
       backspaceDelete$a,
+      backspaceDelete$b,
       backspaceDelete$5,
       backspaceDelete$2,
-      backspaceDelete$8,
-      backspaceDelete$3
+      backspaceDelete$9,
+      backspaceDelete$3,
+      backspaceDelete$6
     ], item => item(editor, forward)).filter(_ => editor.selection.isEditable());
     const deleteCommand = (editor, caret) => {
       const result = findAction(editor, caret, false);
@@ -22680,7 +22806,7 @@
       const rootNode = editor.getBody();
       let rootBlockNode;
       let tempNode;
-      let wrapped = false;
+      let bm = null;
       const forcedRootBlock = getForcedRootBlock(editor);
       if (!startNode || !isElement$6(startNode)) {
         return;
@@ -22689,9 +22815,14 @@
       if (!schema.isValidChild(rootNodeName, forcedRootBlock.toLowerCase()) || hasBlockParent(blockElements, rootNode, startNode)) {
         return;
       }
-      const rng = selection.getRng();
-      const {startContainer, startOffset, endContainer, endOffset} = rng;
-      const restoreSelection = hasFocus(editor);
+      if (rootNode.firstChild === rootNode.lastChild && isBr$6(rootNode.firstChild)) {
+        rootBlockNode = createRootBlock(editor);
+        rootBlockNode.appendChild(createPaddingBr().dom);
+        rootNode.replaceChild(rootBlockNode, rootNode.firstChild);
+        editor.selection.setCursorLocation(rootBlockNode, 0);
+        editor.nodeChanged();
+        return;
+      }
       let node = rootNode.firstChild;
       while (node) {
         if (isElement$6(node)) {
@@ -22705,9 +22836,15 @@
             continue;
           }
           if (!rootBlockNode) {
+            if (!bm && editor.hasFocus()) {
+              bm = getBookmark(editor.selection.getRng(), () => document.createElement('span'));
+            }
+            if (!node.parentNode) {
+              node = null;
+              break;
+            }
             rootBlockNode = createRootBlock(editor);
             rootNode.insertBefore(rootBlockNode, node);
-            wrapped = true;
           }
           tempNode = node;
           node = node.nextSibling;
@@ -22717,10 +22854,8 @@
           node = node.nextSibling;
         }
       }
-      if (wrapped && restoreSelection) {
-        rng.setStart(startContainer, startOffset);
-        rng.setEnd(endContainer, endOffset);
-        selection.setRng(rng);
+      if (bm) {
+        editor.selection.setRng(resolveBookmark(bm));
         editor.nodeChanged();
       }
     };
@@ -22735,7 +22870,7 @@
       return rng;
     };
     const setup$o = editor => {
-      editor.on('NodeChange', curry(addRootBlocks, editor));
+      editor.on('NodeChange', () => addRootBlocks(editor));
     };
 
     const hasClass = checkClassName => node => (' ' + node.attr('class') + ' ').indexOf(checkClassName) !== -1;
@@ -22768,6 +22903,12 @@
       }
       e.content = content;
     };
+    const isValidContent = (nonEditableRegExps, content) => {
+      return forall(nonEditableRegExps, re => {
+        const matches = content.match(re);
+        return matches !== null && matches[0].length === content.length;
+      });
+    };
     const setup$n = editor => {
       const contentEditableAttrName = 'contenteditable';
       const editClass = ' ' + Tools.trim(getEditableClass(editor)) + ' ';
@@ -22798,11 +22939,16 @@
           if (!hasEditClass(node) && !hasNonEditClass(node)) {
             continue;
           }
-          if (nonEditableRegExps.length > 0 && node.attr('data-mce-content')) {
-            node.name = '#text';
-            node.type = 3;
-            node.raw = true;
-            node.value = node.attr('data-mce-content');
+          const content = node.attr('data-mce-content');
+          if (nonEditableRegExps.length > 0 && content) {
+            if (isValidContent(nonEditableRegExps, content)) {
+              node.name = '#text';
+              node.type = 3;
+              node.raw = true;
+              node.value = content;
+            } else {
+              node.remove();
+            }
           } else {
             node.attr(contentEditableAttrName, null);
           }
@@ -24303,19 +24449,19 @@
         },
         {
           keyCode: VK.BACKSPACE,
-          action: action(backspaceDelete$6, editor, false)
+          action: action(backspaceDelete$7, editor, false)
         },
         {
           keyCode: VK.DELETE,
-          action: action(backspaceDelete$6, editor, true)
+          action: action(backspaceDelete$7, editor, true)
         },
         {
           keyCode: VK.BACKSPACE,
-          action: action(backspaceDelete$7, editor, false)
+          action: action(backspaceDelete$8, editor, false)
         },
         {
           keyCode: VK.DELETE,
-          action: action(backspaceDelete$7, editor, true)
+          action: action(backspaceDelete$8, editor, true)
         },
         {
           keyCode: VK.BACKSPACE,
@@ -24327,11 +24473,11 @@
         },
         {
           keyCode: VK.BACKSPACE,
-          action: action(backspaceDelete$a, editor, false)
+          action: action(backspaceDelete$b, editor, false)
         },
         {
           keyCode: VK.DELETE,
-          action: action(backspaceDelete$a, editor, true)
+          action: action(backspaceDelete$b, editor, true)
         },
         {
           keyCode: VK.BACKSPACE,
@@ -24387,19 +24533,19 @@
         },
         {
           keyCode: VK.BACKSPACE,
-          action: action(backspaceDelete$8, editor, false)
+          action: action(backspaceDelete$9, editor, false)
         },
         {
           keyCode: VK.DELETE,
-          action: action(backspaceDelete$8, editor, true)
+          action: action(backspaceDelete$9, editor, true)
         },
         {
           keyCode: VK.BACKSPACE,
-          action: action(backspaceDelete$9, editor, false)
+          action: action(backspaceDelete$a, editor, false)
         },
         {
           keyCode: VK.DELETE,
-          action: action(backspaceDelete$9, editor, true)
+          action: action(backspaceDelete$a, editor, true)
         },
         {
           keyCode: VK.BACKSPACE,
@@ -24408,6 +24554,14 @@
         {
           keyCode: VK.DELETE,
           action: action(backspaceDelete$3, editor, true)
+        },
+        {
+          keyCode: VK.BACKSPACE,
+          action: action(backspaceDelete$6, editor, false)
+        },
+        {
+          keyCode: VK.DELETE,
+          action: action(backspaceDelete$6, editor, true)
         }
       ], evt).filter(_ => editor.selection.isEditable()).each(applyAction => {
         evt.preventDefault();
@@ -25026,9 +25180,14 @@
       } else if (isCaretAtStartOrEndOfBlock(false)) {
         newBlock = insertNewBlockAfter();
       } else if (isCaretAtStartOrEndOfBlock(true) && parentBlockParent) {
+        const caretPos = CaretPosition.fromRangeStart(rng);
+        const afterTable = isAfterTable(caretPos);
+        const parentBlockSugar = SugarElement.fromDom(parentBlock);
+        const afterBr = isAfterBr(parentBlockSugar, caretPos, editor.schema);
+        const prevBrOpt = afterBr ? findPreviousBr(parentBlockSugar, caretPos, editor.schema).bind(pos => Optional.from(pos.getNode())) : Optional.none();
         newBlock = parentBlockParent.insertBefore(createNewBlock$1(), parentBlock);
-        const isNearChildren = hasChildNodes(SugarElement.fromDom(rng.startContainer)) && rng.collapsed;
-        moveToCaretPosition(editor, containerAndSiblingName(parentBlock, 'HR') || isNearChildren ? newBlock : parentBlock);
+        const root = containerAndSiblingName(parentBlock, 'HR') || afterTable ? newBlock : prevBrOpt.getOr(parentBlock);
+        moveToCaretPosition(editor, root);
       } else {
         const tmpRng = includeZwspInRange(rng).cloneRange();
         tmpRng.setEndAfter(parentBlock);
@@ -26671,6 +26830,7 @@
       setup$8(editor);
       register$1(editor, pasteFormat);
       setup$9(editor);
+      editor.addQueryStateHandler('mceTogglePlainTextPaste', () => pasteFormat.get() === 'text');
       editor.on('PreInit', () => {
         register(editor);
         setup$a(editor, draggingInternallyState);
@@ -29464,7 +29624,10 @@
       const extendedOptions = Tools.extend(defaultOptions, defaultOverrideOptions, sectionResult.options(), isOnMobile(isMobileDevice, sectionResult) ? getSection(sectionResult, 'mobile') : {}, { external_plugins: getExternalPlugins(defaultOverrideOptions, sectionResult.options()) });
       return processPlugins(isMobileDevice, sectionResult, defaultOverrideOptions, extendedOptions);
     };
-    const normalizeOptions = (defaultOverrideOptions, options) => combineOptions(isPhone || isTablet, isPhone, options, defaultOverrideOptions, options);
+    const normalizeOptions = (defaultOverrideOptions, options) => {
+      const copiedOptions = merge(options);
+      return combineOptions(isPhone || isTablet, isPhone, copiedOptions, defaultOverrideOptions, copiedOptions);
+    };
 
     const addVisual = (editor, elm) => addVisual$1(editor, elm);
 
@@ -30551,7 +30714,7 @@
       }
       return undefined;
     };
-    const create$5 = (editor, initialOptions) => {
+    const create$5 = (editor, initialOptions, rawInitialOptions = initialOptions) => {
       const registry = {};
       const values = {};
       const setValue = (name, value, processor) => {
@@ -30599,13 +30762,26 @@
         return registered;
       };
       const isSet = name => has$2(values, name);
+      const debug = () => {
+        try {
+          console.log(JSON.parse(JSON.stringify(rawInitialOptions, (_key, value) => {
+            if (isBoolean(value) || isNumber(value) || isString(value) || isNull(value) || isArray$1(value) || isPlainObject(value)) {
+              return value;
+            }
+            return Object.prototype.toString.call(value);
+          })));
+        } catch (error) {
+          console.error(error);
+        }
+      };
       return {
         register,
         isRegistered,
         get,
         set,
         unset,
-        isSet
+        isSet,
+        debug
       };
     };
 
@@ -30937,7 +31113,7 @@
         this.id = id;
         this.hidden = false;
         const normalizedOptions = normalizeOptions(editorManager.defaultOptions, options);
-        this.options = create$5(self, normalizedOptions);
+        this.options = create$5(self, normalizedOptions, options);
         register$7(self);
         const getOption = this.options.get;
         if (getOption('deprecation_warnings')) {
@@ -31342,8 +31518,8 @@
       documentBaseURL: null,
       suffix: null,
       majorVersion: '7',
-      minorVersion: '1.2',
-      releaseDate: 'TBD',
+      minorVersion: '2.1',
+      releaseDate: '2024-07-03',
       i18n: I18n,
       activeEditor: null,
       focusedEditor: null,