jodit 4.15.5 → 4.15.7

package/es5/plugins/debug/debug.css

@@ -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
  */

package/es5/plugins/debug/debug.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
  */

package/es5/plugins/debug/debug.min.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
  */

package/es5/plugins/speech-recognize/speech-recognize.css

@@ -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
  */

package/es5/plugins/speech-recognize/speech-recognize.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
  */

package/es5/plugins/speech-recognize/speech-recognize.min.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
  */

package/es5/polyfills.fat.min.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
  */

package/es5/polyfills.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
  */

package/es5/polyfills.min.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
  */

package/esm/config.d.ts

@@ -1042,6 +1042,16 @@ interface Config {
          * names with single quotes: `font-family: 'Open Sans', sans-serif`.
          */
         singleQuotesInFontFamily: boolean;
+        /**
+         * Browsers keep a trailing `<br>` inside a block after you type into an
+         * empty one (`<p>test<br></p>`), and the same `<br>` ends up in the
+         * editor value. It renders nothing, but confuses consumers that compare
+         * or post-process the HTML. With this option the value getter drops a
+         * `<br>` that is the last node of a block (or of the whole value)
+         * and follows other content. `<p><br></p>` and `text<br><br>` — an empty
+         * line — are kept.
+         */
+        removeTrailingBr: boolean;
         /**
          * Replace old tags to new eg. <i> to <em>, <b> to <strong>
          */

package/esm/core/constants.js

@@ -3,7 +3,7 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
  */
-export const APP_VERSION = "4.15.5";
+export const APP_VERSION = "4.15.7";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;

package/esm/plugins/clean-html/clean-html.d.ts

@@ -11,9 +11,6 @@
 import type { IJodit } from "../../types/index";
 import { Plugin } from "../../core/plugin/plugin";
 import "./config";
-/**
- * Clean HTML after removeFormat and insertHorizontalRule command
- */
 export declare class cleanHtml extends Plugin {
     /** @override */
     buttons: Plugin['buttons'];
@@ -50,6 +47,13 @@ export declare class cleanHtml extends Plugin {
      * 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.
+     */
+    private __removeTrailingBr;
     private __singleQuotesInFontFamily;
     protected onSafeHTML(sandBox: HTMLElement): void;
     /** @override */

package/esm/plugins/clean-html/clean-html.js

@@ -24,6 +24,7 @@ import { getHash, removeFormatForCollapsedSelection, removeFormatForSelection, v
 /**
  * Clean HTML after removeFormat and insertHorizontalRule command
  */
+const TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
 export class cleanHtml extends Plugin {
     constructor() {
         super(...arguments);
@@ -107,6 +108,7 @@ export class cleanHtml extends Plugin {
      */
     onAfterGetValueFromEditor(data) {
         this.__singleQuotesInFontFamily(data);
+        this.__removeTrailingBr(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -122,6 +124,41 @@ export class cleanHtml extends Plugin {
      * 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 (!Dom.isTag(last, 'br')) {
+                return;
+            }
+            const prev = last.previousSibling;
+            if (!prev || Dom.isTag(prev, 'br')) {
+                return;
+            }
+            if (Dom.isText(prev) &&
+                !((_a = prev.nodeValue) === null || _a === void 0 ? void 0 : _a.trim()) &&
+                !prev.previousSibling) {
+                return;
+            }
+            Dom.safeRemove(last);
+        });
+        data.value = box.innerHTML;
+    }
     __singleQuotesInFontFamily(data) {
         if (!this.j.o.cleanHTML.singleQuotesInFontFamily ||
             !data.value.includes('&quot;')) {

package/esm/plugins/clean-html/config.d.ts

@@ -41,6 +41,16 @@ declare module 'jodit/config' {
              * names with single quotes: `font-family: 'Open Sans', sans-serif`.
              */
             singleQuotesInFontFamily: boolean;
+            /**
+             * Browsers keep a trailing `<br>` inside a block after you type into an
+             * empty one (`<p>test<br></p>`), and the same `<br>` ends up in the
+             * editor value. It renders nothing, but confuses consumers that compare
+             * or post-process the HTML. With this option the value getter drops a
+             * `<br>` that is the last node of a block (or of the whole value)
+             * and follows other content. `<p><br></p>` and `text<br><br>` — an empty
+             * line — are kept.
+             */
+            removeTrailingBr: boolean;
             /**
              * Replace old tags to new eg. <i> to <em>, <b> to <strong>
              */

package/esm/plugins/clean-html/config.js

@@ -12,6 +12,7 @@ Config.prototype.cleanHTML = {
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
     singleQuotesInFontFamily: true,
+    removeTrailingBr: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',

package/esm/plugins/drag-and-drop-element/drag-and-drop-element.d.ts

@@ -50,6 +50,7 @@ export declare class dragAndDropElement extends Plugin {
      * Mouse move handler handler
      */
     private onDrag;
+    private __ghostOffset;
     /**
      * Mouseup handler in any place
      */

package/esm/plugins/drag-and-drop-element/drag-and-drop-element.js

@@ -136,6 +136,11 @@ export class dragAndDropElement extends Plugin {
             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 = dataBind(this.draggable, 'target');
             css(this.draggable, {
@@ -145,19 +150,29 @@ export class dragAndDropElement extends Plugin {
                 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
             });
             Dom.append(getContainer(this.j, dragAndDropElement), this.draggable);
         }
         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
      */

package/esm/plugins/link/link.js

@@ -204,6 +204,7 @@ export class link extends Plugin {
             jodit.history.snapshot.restore(snapshot);
             const textWasChanged = getSelectionText() !== content_input.value.trim();
             const ci = jodit.createInside;
+            let caretAfter = null;
             if (!link || !Dom.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     const node = jodit.s.current();
@@ -218,6 +219,7 @@ export class link extends Plugin {
                     const a = ci.element('a');
                     jodit.s.insertNode(a, false, false);
                     links = [a];
+                    caretAfter = a;
                 }
                 links.forEach(link => jodit.s.select(link));
             }
@@ -252,6 +254,13 @@ export class link extends Plugin {
                 }
                 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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.15.5",
+	"version": "4.15.7",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/config.d.ts

@@ -1042,6 +1042,16 @@ interface Config {
          * names with single quotes: `font-family: 'Open Sans', sans-serif`.
          */
         singleQuotesInFontFamily: boolean;
+        /**
+         * Browsers keep a trailing `<br>` inside a block after you type into an
+         * empty one (`<p>test<br></p>`), and the same `<br>` ends up in the
+         * editor value. It renders nothing, but confuses consumers that compare
+         * or post-process the HTML. With this option the value getter drops a
+         * `<br>` that is the last node of a block (or of the whole value)
+         * and follows other content. `<p><br></p>` and `text<br><br>` — an empty
+         * line — are kept.
+         */
+        removeTrailingBr: boolean;
         /**
          * Replace old tags to new eg. <i> to <em>, <b> to <strong>
          */

package/types/plugins/clean-html/clean-html.d.ts

@@ -11,9 +11,6 @@
 import type { IJodit } from "../../types/index";
 import { Plugin } from "../../core/plugin/plugin";
 import "./config";
-/**
- * Clean HTML after removeFormat and insertHorizontalRule command
- */
 export declare class cleanHtml extends Plugin {
     /** @override */
     buttons: Plugin['buttons'];
@@ -50,6 +47,13 @@ export declare class cleanHtml extends Plugin {
      * 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.
+     */
+    private __removeTrailingBr;
     private __singleQuotesInFontFamily;
     protected onSafeHTML(sandBox: HTMLElement): void;
     /** @override */

package/types/plugins/clean-html/config.d.ts

@@ -41,6 +41,16 @@ declare module 'jodit/config' {
              * names with single quotes: `font-family: 'Open Sans', sans-serif`.
              */
             singleQuotesInFontFamily: boolean;
+            /**
+             * Browsers keep a trailing `<br>` inside a block after you type into an
+             * empty one (`<p>test<br></p>`), and the same `<br>` ends up in the
+             * editor value. It renders nothing, but confuses consumers that compare
+             * or post-process the HTML. With this option the value getter drops a
+             * `<br>` that is the last node of a block (or of the whole value)
+             * and follows other content. `<p><br></p>` and `text<br><br>` — an empty
+             * line — are kept.
+             */
+            removeTrailingBr: boolean;
             /**
              * Replace old tags to new eg. <i> to <em>, <b> to <strong>
              */

package/types/plugins/drag-and-drop-element/drag-and-drop-element.d.ts

@@ -50,6 +50,7 @@ export declare class dragAndDropElement extends Plugin {
      * Mouse move handler handler
      */
     private onDrag;
+    private __ghostOffset;
     /**
      * Mouseup handler in any place
      */