jodit-pro-react 5.6.14 → 5.6.16

package/build/esm/JoditEditor.mjs

@@ -1,6 +1,6 @@
 import {
   JoditEditor_default
-} from "./chunk-VDRUEIP3.mjs";
+} from "./chunk-X776F2QN.mjs";
 export {
   JoditEditor_default as default
 };

package/build/esm/{chunk-VDRUEIP3.mjs → chunk-X776F2QN.mjs}

@@ -193,7 +193,7 @@ var APP_VERSION, ES, IS_ES_MODERN, IS_ES_NEXT, IS_PROD, IS_TEST, FAT_MODE, HOMEP
 var init_constants = __esm({
   "node_modules/jodit/esm/core/constants.js"() {
     "use strict";
-    APP_VERSION = "4.15.4";
+    APP_VERSION = "4.15.7";
     ES = "es2020";
     IS_ES_MODERN = true;
     IS_ES_NEXT = true;
@@ -21813,6 +21813,8 @@ Config.prototype.cleanHTML = {
   removeEmptyElements: true,
   fillEmptyParagraph: true,
   collapseEmptyValueToEmptyString: false,
+  singleQuotesInFontFamily: true,
+  removeTrailingBr: false,
   replaceNBSP: true,
   replaceOldTags: {
     i: "em",
@@ -22302,6 +22304,7 @@ var __decorate39 = function(decorators, target, key3, desc) {
         r71 = (c69 < 3 ? d55(r71) : c69 > 3 ? d55(target, key3, r71) : d55(target, key3)) || r71;
   return c69 > 3 && r71 && Object.defineProperty(target, key3, r71), r71;
 };
+var TRAILING_BR_BLOCKS = "p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote";
 var cleanHtml = class extends Plugin {
   constructor() {
     super(...arguments);
@@ -22375,6 +22378,8 @@ var cleanHtml = class extends Plugin {
    * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
    */
   onAfterGetValueFromEditor(data) {
+    this.__singleQuotesInFontFamily(data);
+    this.__removeTrailingBr(data);
     if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
       return;
     }
@@ -22382,6 +22387,64 @@ var cleanHtml = class extends Plugin {
       data.value = "";
     }
   }
+  /**
+   * Rewrite double-quoted font names inside `style` attributes with single
+   * quotes. The DOM always serialises them as `&quot;…&quot;`, and back ends
+   * that HTML-decode the value before storing it then produce
+   * `style="font-family: "Open Sans", …"` — broken markup. Single quotes
+   * survive that round trip. Names that already contain an apostrophe are
+   * left alone.
+   */
+  /**
+   * Drop a `<br>` that is the last node of a block (or of the value) and
+   * follows other content — the caret placeholder browsers leave behind
+   * after typing into an empty block. An empty block (`<p><br></p>`) and a
+   * deliberate empty line (`text<br><br>`) are kept.
+   */
+  __removeTrailingBr(data) {
+    if (!this.j.o.cleanHTML.removeTrailingBr || !/<br/i.test(data.value)) {
+      return;
+    }
+    const box = this.j.c.div();
+    box.innerHTML = data.value;
+    const blocks = [
+      box,
+      ...box.querySelectorAll(TRAILING_BR_BLOCKS)
+    ];
+    blocks.forEach((block) => {
+      var _a2;
+      const last = block.lastChild;
+      if (!Dom.isTag(last, "br")) {
+        return;
+      }
+      const prev = last.previousSibling;
+      if (!prev || Dom.isTag(prev, "br")) {
+        return;
+      }
+      if (Dom.isText(prev) && !((_a2 = prev.nodeValue) === null || _a2 === void 0 ? void 0 : _a2.trim()) && !prev.previousSibling) {
+        return;
+      }
+      Dom.safeRemove(last);
+    });
+    data.value = box.innerHTML;
+  }
+  __singleQuotesInFontFamily(data) {
+    if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes("&quot;")) {
+      return;
+    }
+    data.value = data.value.replace(/\sstyle="([^"]*)"/gi, (attribute, css2) => {
+      if (!css2.includes("&quot;") || !/font-family/i.test(css2)) {
+        return attribute;
+      }
+      const normalized = css2.replace(
+        // `&quot;` itself ends with `;`, so the entity has to be
+        // consumed as a unit or the declaration stops inside it.
+        /font-family\s*:(?:&quot;|[^;])*/gi,
+        (declaration) => declaration.includes("'") ? declaration : declaration.replace(/&quot;/g, "'")
+      );
+      return attribute.replace(css2, normalized);
+    });
+  }
   onSafeHTML(sandBox) {
     const sanitizer = this.j.o.cleanHTML.sanitizer;
     if (sanitizer) {
@@ -23414,6 +23477,7 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
       this.state = DragState.DRAGGING;
     }
     this.j.e.fire("hidePopup hideResizer");
+    const offset2 = this.__ghostOffset();
     if (!this.draggable.parentNode) {
       const target = dataBind(this.draggable, "target");
       css(this.draggable, {
@@ -23423,19 +23487,27 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
         position: "fixed",
         opacity: 0.7,
         display: "inline-block",
-        left: event.clientX,
-        top: event.clientY,
+        left: event.clientX + offset2.left,
+        top: event.clientY + offset2.top,
         width: (_a2 = target === null || target === void 0 ? void 0 : target.offsetWidth) !== null && _a2 !== void 0 ? _a2 : 100,
         height: (_b = target === null || target === void 0 ? void 0 : target.offsetHeight) !== null && _b !== void 0 ? _b : 100
       });
       Dom.append(getContainer(this.j, _dragAndDropElement), this.draggable);
     }
     css(this.draggable, {
-      left: event.clientX,
-      top: event.clientY
+      left: event.clientX + offset2.left,
+      top: event.clientY + offset2.top
     });
     this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
   }
+  __ghostOffset() {
+    const iframe2 = this.j.iframe;
+    if (!iframe2) {
+      return { left: 0, top: 0 };
+    }
+    const rect = iframe2.getBoundingClientRect();
+    return { left: rect.left, top: rect.top };
+  }
   /**
    * Mouseup handler in any place
    */
@@ -27268,6 +27340,7 @@ var link = class extends Plugin {
       jodit.history.snapshot.restore(snapshot);
       const textWasChanged = getSelectionText() !== content_input.value.trim();
       const ci = jodit.createInside;
+      let caretAfter = null;
       if (!link2 || !Dom.isOrContains(jodit.editor, link2)) {
         if (!jodit.s.isCollapsed()) {
           const node = jodit.s.current();
@@ -27280,6 +27353,7 @@ var link = class extends Plugin {
           const a76 = ci.element("a");
           jodit.s.insertNode(a76, false, false);
           links = [a76];
+          caretAfter = a76;
         }
         links.forEach((link3) => jodit.s.select(link3));
       } else {
@@ -27310,6 +27384,9 @@ var link = class extends Plugin {
         }
         jodit.e.fire("applyLink", jodit, a76, form2);
       });
+      if (caretAfter) {
+        jodit.s.setCursorAfter(caretAfter);
+      }
       jodit.synchronizeValues();
       close();
       return false;

package/build/esm/index.mjs

@@ -2,7 +2,7 @@ import {
   Config,
   JoditEditor_default,
   n
-} from "./chunk-VDRUEIP3.mjs";
+} from "./chunk-X776F2QN.mjs";
 
 // src/index.ts
 var index_default = JoditEditor_default;