jodit 4.15.5 → 4.15.7

package/es2021/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.15.5
+ * Version: v4.15.7
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1779,7 +1779,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.5";
+ */ const APP_VERSION = "4.15.7";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -28329,7 +28329,8 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 
 /**
  * Clean HTML after removeFormat and insertHorizontalRule command
- */ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
+ */ const TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
+class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
     /** @override */ afterInit(jodit) {}
     get isEditMode() {
         return !(this.j.isInDestruct || !this.j.isEditorMode() || this.j.getReadOnly());
@@ -28388,6 +28389,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ onAfterGetValueFromEditor(data) {
         this.__singleQuotesInFontFamily(data);
+        this.__removeTrailingBr(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -28402,7 +28404,38 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * `style="font-family: "Open Sans", …"` — broken markup. Single quotes
 	 * survive that round trip. Names that already contain an apostrophe are
 	 * left alone.
-	 */ __singleQuotesInFontFamily(data) {
+	 */ /**
+	 * 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)=>{
+            const last = block.lastChild;
+            if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(last, 'br')) {
+                return;
+            }
+            const prev = last.previousSibling;
+            if (!prev || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(prev, 'br')) {
+                return;
+            }
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isText(prev) && !prev.nodeValue?.trim() && !prev.previousSibling) {
+                return;
+            }
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(last);
+        });
+        data.value = box.innerHTML;
+    }
+    __singleQuotesInFontFamily(data) {
         if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
             return;
         }
@@ -28489,6 +28522,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
     singleQuotesInFontFamily: true,
+    removeTrailingBr: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -30584,6 +30618,11 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
             this.state = 2;
         }
         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,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(this.draggable, 'target');
             (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.css)(this.draggable, {
@@ -30593,19 +30632,35 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
                 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: target?.offsetWidth ?? 100,
                 height: target?.offsetHeight ?? 100
             });
             jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.append((0,jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.getContainer)(this.j, dragAndDropElement), this.draggable);
         }
         ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.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() {
@@ -36750,6 +36805,7 @@ jodit_config__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 || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     const node = jodit.s.current();
@@ -36766,6 +36822,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                     links = [
                         a
                     ];
+                    caretAfter = a;
                 }
                 links.forEach((link)=>jodit.s.select(link));
             } else {
@@ -36798,6 +36855,13 @@ jodit_config__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;