jodit-pro 4.15.7 → 4.15.10

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.15.7
+ * Version: v4.15.10
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1771,7 +1771,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.7";
+ */ const APP_VERSION = "4.15.10";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -35195,7 +35195,8 @@ _core_ui_icon_js__WEBPACK_IMPORTED_MODULE_4__.Icon.set('class-span', _class_span
 
 /**
  * Clean HTML after removeFormat and insertHorizontalRule command
- */ class cleanHtml extends _core_plugin_plugin_js__WEBPACK_IMPORTED_MODULE_5__.Plugin {
+ */ const TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
+class cleanHtml extends _core_plugin_plugin_js__WEBPACK_IMPORTED_MODULE_5__.Plugin {
     /** @override */ afterInit(jodit) {}
     get isEditMode() {
         return !(this.j.isInDestruct || !this.j.isEditorMode() || this.j.getReadOnly());
@@ -35253,6 +35254,8 @@ _core_ui_icon_js__WEBPACK_IMPORTED_MODULE_4__.Icon.set('class-span', _class_span
      * `<p><br></p>` left after deleting all content) to an empty string —
      * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
      */ onAfterGetValueFromEditor(data) {
+        this.__singleQuotesInFontFamily(data);
+        this.__removeTrailingBr(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -35260,6 +35263,59 @@ _core_ui_icon_js__WEBPACK_IMPORTED_MODULE_4__.Icon.set('class-span', _class_span
             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 _a;
+            const last = block.lastChild;
+            if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(last, 'br')) {
+                return;
+            }
+            const prev = last.previousSibling;
+            if (!prev || _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(prev, 'br')) {
+                return;
+            }
+            if (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isText(prev) && !((_a = prev.nodeValue) === null || _a === void 0 ? void 0 : _a.trim()) && !prev.previousSibling) {
+                return;
+            }
+            _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.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, css)=>{
+            if (!css.includes('&quot;') || !/font-family/i.test(css)) {
+                return attribute;
+            }
+            const normalized = css.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(css, normalized);
+        });
+    }
     onSafeHTML(sandBox) {
         const sanitizer = this.j.o.cleanHTML.sanitizer;
         if (sanitizer) {
@@ -35331,6 +35387,8 @@ _config_js__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     removeEmptyElements: true,
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
+    singleQuotesInFontFamily: true,
+    removeTrailingBr: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -37419,6 +37477,11 @@ var DragState;
             this.state = DragState.DRAGGING;
         }
         this.j.e.fire('hidePopup hideResizer');
+        // The ghost lives in the top document (position: fixed), but the
+        // mousemove comes from the editor document. In iframe mode those are
+        // different viewports, so the iframe's own offset has to be added or
+        // the ghost trails the pointer by exactly that distance (#1455).
+        const offset = this.__ghostOffset();
         if (!this.draggable.parentNode) {
             const target = (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(this.draggable, 'target');
             (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.css)(this.draggable, {
@@ -37428,19 +37491,35 @@ var DragState;
                 position: 'fixed',
                 opacity: 0.7,
                 display: 'inline-block',
-                left: event.clientX,
-                top: event.clientY,
+                left: event.clientX + offset.left,
+                top: event.clientY + offset.top,
                 width: (_a = target === null || target === void 0 ? void 0 : target.offsetWidth) !== null && _a !== void 0 ? _a : 100,
                 height: (_b = target === null || target === void 0 ? void 0 : target.offsetHeight) !== null && _b !== void 0 ? _b : 100
             });
             _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.append((0,_core_global_js__WEBPACK_IMPORTED_MODULE_2__.getContainer)(this.j, dragAndDropElement), this.draggable);
         }
         ;(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.css)(this.draggable, {
-            left: event.clientX,
-            top: event.clientY
+            left: event.clientX + offset.left,
+            top: event.clientY + offset.top
         });
+        // The caret goes into the editor document, so it keeps the raw
+        // (iframe-relative) coordinates.
         this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
     }
+    __ghostOffset() {
+        const iframe = this.j.iframe;
+        if (!iframe) {
+            return {
+                left: 0,
+                top: 0
+            };
+        }
+        const rect = iframe.getBoundingClientRect();
+        return {
+            left: rect.left,
+            top: rect.top
+        };
+    }
     /**
      * Mouseup handler in any place
      */ onDragEnd() {
@@ -43753,6 +43832,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
             jodit.history.snapshot.restore(snapshot);
             const textWasChanged = getSelectionText() !== content_input.value.trim();
             const ci = jodit.createInside;
+            let caretAfter = null;
             if (!link || !_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     const node = jodit.s.current();
@@ -43769,6 +43849,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                     links = [
                         a
                     ];
+                    caretAfter = a;
                 }
                 links.forEach((link)=>jodit.s.select(link));
             } else {
@@ -43801,6 +43882,13 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                 }
                 jodit.e.fire('applyLink', jodit, a, form);
             });
+            // A brand-new link inserted at a collapsed caret used to stay
+            // *selected*. Safari does not paint that selection, so the next
+            // Enter silently replaced the link instead of starting a new line.
+            // Put the caret right after the link instead.
+            if (caretAfter) {
+                jodit.s.setCursorAfter(caretAfter);
+            }
             jodit.synchronizeValues();
             close();
             return false;