opentiny 6.9.17 → 6.9.19

package/tinymce.js

@@ -14117,8 +14117,9 @@
               const currentValue = dom.getAttrib(elm, attrName);
               if (currentValue) {
                 let valueOut = '';
+                const editableClass = ed.getParam('editable_class');
                 each$e(currentValue.split(/\s+/), cls => {
-                  if (/mce\-\w+/.test(cls)) {
+                  if (/mce-\w+/.test(cls) || editableClass && cls === editableClass) {
                     valueOut += (valueOut ? ' ' : '') + cls;
                   }
                 });
@@ -21423,12 +21424,39 @@
         editor.selection.setCursorLocation();
       });
     };
+    const getClosestEditableDiv = editor => {
+      const node = editor.selection.getNode();
+      return node.closest(`.${ editor.getParam('editable_class') }`);
+    };
+    const emptyEditableDiv = (editor, editableDiv) => {
+      return Optional.some(() => {
+        editableDiv.innerHTML = '<p><br data-mce-bogus="1"></p>';
+        editor.selection.setCursorLocation();
+      });
+    };
     const deleteRange$2 = editor => {
-      const rootNode = SugarElement.fromDom(editor.getBody());
+      let rootNode;
+      const editableDiv = getClosestEditableDiv(editor);
       const rng = editor.selection.getRng();
+      if (!editor.hasEditableRoot() && editableDiv) {
+        rootNode = SugarElement.fromDom(editableDiv);
+        return isEverythingSelected(rootNode, rng) ? emptyEditableDiv(editor, editableDiv) : deleteRangeMergeBlocks(rootNode, editor.selection, editor.schema);
+      }
+      rootNode = SugarElement.fromDom(editor.getBody());
       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 deleteSymbol = editor => {
+      var _a;
+      if (editor.hasEditableRoot()) {
+        return Optional.none();
+      }
+      const editableDiv = getClosestEditableDiv(editor);
+      if (((_a = editableDiv === null || editableDiv === void 0 ? void 0 : editableDiv.textContent) === null || _a === void 0 ? void 0 : _a.length) && editableDiv.textContent.length <= 1) {
+        return emptyEditableDiv(editor, editableDiv);
+      }
+      return Optional.none();
+    };
+    const backspaceDelete$8 = (editor, _forward) => editor.selection.isCollapsed() ? deleteSymbol(editor) : deleteRange$2(editor);
 
     const showCaret = (direction, editor, node, before, scrollIntoView) => Optional.from(editor._selectionOverrides.showCaret(direction, node, before, scrollIntoView));
     const getNodeRange = node => {