jodit 4.12.21 → 4.12.23

package/esm/plugins/inline-popup/inline-popup.js

@@ -29,6 +29,12 @@ export class inlinePopup extends Plugin {
     constructor() {
         super(...arguments);
         this.type = null;
+        /**
+         * The user pressed a button inside the selection toolbar — after the
+         * command fires `closeAllPopups`, the toolbar should be shown again
+         * while the selection is still there. See #1238
+         */
+        this.__reopenSelectionPopup = false;
         this.snapRange = null;
         this.elmsList = keys(this.j.o.popup, false).filter(s => !this.isExcludedTarget(s));
     }
@@ -144,9 +150,52 @@ export class inlinePopup extends Plugin {
                 this.previousTarget = undefined;
             }
         })
-            .on([this.j.ew, this.j.ow], 'mouseup keyup', this.onSelectionEnd);
+            .on([this.j.ew, this.j.ow], 'mouseup keyup', this.onSelectionEnd)
+            .on([this.j.ew, this.j.ow], 'mousedown touchstart', this.__onDocumentMouseDown)
+            .on('closeAllPopups', this.__onCloseAllPopups);
         this.addListenersForElements();
     }
+    __onDocumentMouseDown(e) {
+        if (this.popup.isOpened &&
+            this.type === 'selection' &&
+            e.target &&
+            UIElement.closestElement(e.target, Popup)) {
+            this.__reopenSelectionPopup = true;
+        }
+    }
+    __onCloseAllPopups() {
+        if (!this.__reopenSelectionPopup) {
+            return;
+        }
+        this.__reopenSelectionPopup = false;
+        if (!this.j.o.toolbarInlineForSelection) {
+            return;
+        }
+        // a zero timeout would run synchronously — before the popup's own
+        // `closeAllPopups` handler closes it; defer to the next macrotask
+        this.j.async.setTimeout(() => {
+            const sel = this.j.s.sel;
+            if (sel && !sel.isCollapsed) {
+                this.showPopup(() => this.__selectionBound(), 'selection');
+            }
+        }, 1);
+    }
+    /**
+     * The selection rect comes from the editor document — in iframe mode its
+     * coordinates are iframe-local, while the popup lives in the host
+     * document, so the iframe offset must be added. See
+     * https://github.com/xdan/jodit/issues/1058
+     */
+    __selectionBound() {
+        const rect = this.j.s.range.getBoundingClientRect();
+        let { left, top } = rect;
+        if (this.j.iframe) {
+            const offset = position(this.j.iframe, this.j, true);
+            left += offset.left;
+            top += offset.top;
+        }
+        return { left, top, width: rect.width, height: rect.height };
+    }
     onSelectionStart() {
         this.snapRange = this.j.s.range.cloneRange();
     }
@@ -186,7 +235,7 @@ export class inlinePopup extends Plugin {
         if (!node) {
             return;
         }
-        this.showPopup(() => range.getBoundingClientRect(), type);
+        this.showPopup(() => this.__selectionBound(), type);
     }
     /**
      * In not collapsed selection - only one image
@@ -208,7 +257,9 @@ export class inlinePopup extends Plugin {
     beforeDestruct(jodit) {
         jodit.e
             .off('showPopup')
-            .off([this.j.ew, this.j.ow], 'mouseup keyup', this.onSelectionEnd);
+            .off([this.j.ew, this.j.ow], 'mouseup keyup', this.onSelectionEnd)
+            .off([this.j.ew, this.j.ow], 'mousedown touchstart', this.__onDocumentMouseDown)
+            .off('closeAllPopups', this.__onCloseAllPopups);
         this.removeListenersForElements();
     }
     _eventsList() {
@@ -257,6 +308,12 @@ __decorate([
 __decorate([
     watch(':outsideClick')
 ], inlinePopup.prototype, "onOutsideClick", null);
+__decorate([
+    autobind
+], inlinePopup.prototype, "__onDocumentMouseDown", null);
+__decorate([
+    autobind
+], inlinePopup.prototype, "__onCloseAllPopups", null);
 __decorate([
     autobind
 ], inlinePopup.prototype, "onSelectionStart", null);

package/esm/plugins/limit/limit.js

@@ -62,7 +62,13 @@ export class limit extends Plugin {
             jodit.e.fire('denyWords.limit limit.limit');
             return true;
         }
-        const should = Boolean(limitChars && isGt(words.join('').length, limitChars, strict));
+        // with `countTextSpaces` enabled the limiter counts characters the
+        // same way as the `stat` plugin's counter — including spaces. See #1144
+        const charsCount = jodit.o.countTextSpaces
+            ? text.replace(INVISIBLE_SPACE_REG_EXP(), '').replace(/[\r\n]/g, '')
+                .length
+            : words.join('').length;
+        const should = Boolean(limitChars && isGt(charsCount, limitChars, strict));
         if (should) {
             jodit.e.fire('denyChars.limit limit.limit');
         }

package/esm/plugins/paste/config.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
  */
-import { CLIPBOARD_ID, INSERT_AS_HTML, INSERT_AS_TEXT, INSERT_ONLY_TEXT, IS_PROD, TEXT_PLAIN } from "../../core/constants.js";
+import { CLIPBOARD_ID, INSERT_AS_HTML, INSERT_AS_TEXT, INSERT_ONLY_TEXT, IS_PROD, TEXT_HTML, TEXT_PLAIN } from "../../core/constants.js";
 import { Config } from "../../config.js";
 import { pasteInsertHtml } from "./helpers.js";
 Config.prototype.askBeforePasteHTML = true;
@@ -21,6 +21,7 @@ const psKey = 'pasteStorage';
 Config.prototype.controls.paste = {
     tooltip: 'Paste from clipboard',
     async exec(editor, _, { control }) {
+        var _a;
         if (control.name === psKey) {
             editor.execCommand('showPasteStorage');
             return;
@@ -31,7 +32,15 @@ Config.prototype.controls.paste = {
             try {
                 const items = await navigator.clipboard.read();
                 if (items && items.length) {
-                    const textBlob = await items[0].getType(TEXT_PLAIN);
+                    const item = items[0];
+                    // Prefer the HTML flavor so the button behaves like the
+                    // Ctrl+V shortcut (which receives text/html from the
+                    // native paste event). See
+                    // https://github.com/xdan/jodit/issues/1061
+                    const type = ((_a = item.types) === null || _a === void 0 ? void 0 : _a.includes(TEXT_HTML))
+                        ? TEXT_HTML
+                        : TEXT_PLAIN;
+                    const textBlob = await item.getType(type);
                     text = await new Response(textBlob).text();
                 }
                 error = false;

package/esm/plugins/paste/paste.d.ts

@@ -45,7 +45,7 @@ export declare class paste extends Plugin {
      */
     private __insertByType;
     /**
-     * Replace all \\n chars in plain text to br
+     * Escape plain text and replace all \\n chars with br
      */
     private onProcessPasteReplaceNl2Br;
 }

package/esm/plugins/paste/paste.js

@@ -38,9 +38,7 @@ export class paste extends Plugin {
         jodit.e
             .on('paste.paste', this.onPaste)
             .on('pasteStack.paste', (item) => this.pasteStack.push(item));
-        if (jodit.o.nl2brInPlainText) {
-            this.j.e.on('processPaste.paste', this.onProcessPasteReplaceNl2Br);
-        }
+        this.j.e.on('processPaste.paste', this.onProcessPasteReplaceNl2Br);
     }
     /** @override **/
     beforeDestruct(jodit) {
@@ -169,11 +167,15 @@ export class paste extends Plugin {
         pasteInsertHtml(e, this.j, html);
     }
     /**
-     * Replace all \\n chars in plain text to br
+     * Escape plain text and replace all \\n chars with br
      */
     onProcessPasteReplaceNl2Br(ignore, text, type) {
         if (type === TEXT_PLAIN + ';' && !isHTML(text)) {
-            return nl2br(text);
+            // the clipboard contains only plain text — escape special chars
+            // so a stray `<` is not parsed as an unclosed tag and does not
+            // swallow the rest of the string. See #1227
+            const escaped = htmlspecialchars(text);
+            return this.j.o.nl2brInPlainText ? nl2br(escaped) : escaped;
         }
     }
 }

package/esm/plugins/resize-handler/resize-handler.js

@@ -16,6 +16,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { autobind } from "../../core/decorators/index.js";
 import { Dom } from "../../core/dom/index.js";
 import { pluginSystem } from "../../core/global.js";
+import { offset } from "../../core/helpers/index.js";
 import { Plugin } from "../../core/plugin/index.js";
 import { Icon } from "../../core/ui/index.js";
 import "./config.js";
@@ -82,11 +83,21 @@ export class resizeHandler extends Plugin {
         if (!this.isResized) {
             return;
         }
+        let { clientX, clientY } = e;
+        if (e.view === this.j.ew && this.j.ew !== this.j.ow) {
+            // the event was proxied from the editor's iframe — its client
+            // coordinates are relative to the iframe viewport, while the
+            // start point was captured on the host-document handle;
+            // shift them into the host coordinate space
+            const workplacePosition = offset(this.j.workplace, this.j, this.j.od, true);
+            clientX += workplacePosition.left;
+            clientY += workplacePosition.top;
+        }
         if (this.j.o.allowResizeY) {
-            this.j.e.fire('setHeight', this.start.h + e.clientY - this.start.y);
+            this.j.e.fire('setHeight', this.start.h + clientY - this.start.y);
         }
         if (this.j.o.allowResizeX) {
-            this.j.e.fire('setWidth', this.start.w + e.clientX - this.start.x);
+            this.j.e.fire('setWidth', this.start.w + clientX - this.start.x);
         }
         this.j.e.fire('resize');
     }

package/esm/plugins/resizer/resizer.js

@@ -202,7 +202,11 @@ export class resizer extends Plugin {
             this.pointerX = e.clientX;
             this.pointerY = e.clientY;
             let diff_x, diff_y;
-            if (this.j.options.iframe) {
+            if (this.j.options.iframe && e.view === this.j.ew) {
+                // the event was proxied from the editor's iframe — its client
+                // coordinates are relative to the iframe viewport, while
+                // `startX/startY` were captured on a host-document handle;
+                // shift them into the host coordinate space
                 const workplacePosition = this.getWorkplacePosition();
                 diff_x = e.clientX + workplacePosition.left - this.startX;
                 diff_y = e.clientY + workplacePosition.top - this.startY;

package/esm/plugins/search/ui/search.js

@@ -101,20 +101,30 @@ let UISearch = class UISearch extends UIElement {
             .on(this.queryInput, 'input', () => {
             this.setMod('empty-query', !trim(this.queryInput.value).length);
         })
-            .on(this.queryInput, 'keydown', this.j.async.debounce(async (e) => {
-            switch (e.key) {
-                case consts.KEY_ENTER:
+            .on(this.queryInput, 'keydown', (() => {
+            const debounced = this.j.async.debounce(async (e) => {
+                switch (e.key) {
+                    case consts.KEY_ENTER:
+                        if (await jodit.e.fire('searchNext')) {
+                            this.close();
+                        }
+                        break;
+                    default:
+                        jodit.e.fire(this, 'needUpdateCounters');
+                        break;
+                }
+            }, this.j.defaultTimeout);
+            return (e) => {
+                // Must be canceled synchronously — inside the debounced
+                // handler the browser has already submitted the parent
+                // form. See https://github.com/xdan/jodit/issues/918
+                if (e.key === consts.KEY_ENTER) {
                     e.preventDefault();
                     e.stopImmediatePropagation();
-                    if (await jodit.e.fire('searchNext')) {
-                        this.close();
-                    }
-                    break;
-                default:
-                    jodit.e.fire(this, 'needUpdateCounters');
-                    break;
-            }
-        }, this.j.defaultTimeout));
+                }
+                debounced(e);
+            };
+        })());
     }
     onEditorKeyDown(e) {
         if (!this.isOpened) {

package/esm/plugins/select-cells/select-cells.js

@@ -120,14 +120,16 @@ export class selectCells extends Plugin {
      * Mouse move inside the table
      */
     __onMove(table, e) {
-        var _a;
+        var _a, _b;
         if (this.j.o.readonly && !this.j.isLocked) {
             return;
         }
         if (this.j.isLockedNotBy(key)) {
             return;
         }
-        const node = this.j.ed.elementFromPoint(e.clientX, e.clientY);
+        // Inside Shadow DOM `document.elementFromPoint` returns the shadow
+        // host, so the lookup must start from the shadow root
+        const node = ((_a = this.j.o.shadowRoot) !== null && _a !== void 0 ? _a : this.j.ed).elementFromPoint(e.clientX, e.clientY);
         if (!node) {
             return;
         }
@@ -150,7 +152,7 @@ export class selectCells extends Plugin {
         }
         const cellsCount = this.__tableModule.getAllSelectedCells().length;
         if (cellsCount > 1) {
-            (_a = this.j.s.sel) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
+            (_b = this.j.s.sel) === null || _b === void 0 ? void 0 : _b.removeAllRanges();
         }
         this.j.e.fire('hidePopup');
         e.stopPropagation();
@@ -184,13 +186,15 @@ export class selectCells extends Plugin {
      * Stop a selection process
      */
     __onStopSelection(table, e) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.__selectedCell) {
             return;
         }
         this.__isSelectionMode = false;
         this.j.unlock();
-        const node = this.j.ed.elementFromPoint(e.clientX, e.clientY);
+        // Inside Shadow DOM `document.elementFromPoint` returns the shadow
+        // host, so the lookup must start from the shadow root
+        const node = ((_a = this.j.o.shadowRoot) !== null && _a !== void 0 ? _a : this.j.ed).elementFromPoint(e.clientX, e.clientY);
         if (!node) {
             return;
         }
@@ -206,7 +210,7 @@ export class selectCells extends Plugin {
             cell,
             this.__selectedCell
         ]), box = this.__tableModule.formalMatrix(table);
-        const max = (_a = box[bound[1][0]]) === null || _a === void 0 ? void 0 : _a[bound[1][1]], min = (_b = box[bound[0][0]]) === null || _b === void 0 ? void 0 : _b[bound[0][1]];
+        const max = (_b = box[bound[1][0]]) === null || _b === void 0 ? void 0 : _b[bound[1][1]], min = (_c = box[bound[0][0]]) === null || _c === void 0 ? void 0 : _c[bound[0][1]];
         // `getSelectedBound` keeps its `Infinity` sentinel when none of the
         // selected cells belong to this table's matrix — e.g. after a
         // drag-and-drop that moved/removed the cells, leaving a stale anchor and

package/esm/plugins/source/source.js

@@ -134,6 +134,15 @@ export class source extends Plugin {
     }
     setFocusToMirror() {
         var _a;
+        const active = this.j.od.activeElement;
+        // do not steal focus from another editor or control — e.g. when the
+        // mode is switched programmatically (a Vue/React wrapper re-render)
+        // while the user is already typing elsewhere. See #1356
+        if (active &&
+            active !== this.j.od.body &&
+            !this.j.container.contains(active)) {
+            return;
+        }
         (_a = this.sourceEditor) === null || _a === void 0 ? void 0 : _a.focus();
     }
     saveSelection() {

package/package.json

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

package/types/core/helpers/checker/is-html-from-word.d.ts

@@ -7,6 +7,6 @@
  * @module helpers/checker
  */
 /**
- * Detect if string is HTML from MS Word or Excel
+ * Detect if string is HTML from MS Word, Excel or LibreOffice/OpenOffice
  */
 export declare function isHtmlFromWord(data: string): boolean;

package/types/modules/dialog/dialog.d.ts

@@ -42,6 +42,11 @@ export declare class Dialog extends ViewWithToolbar implements IDialog {
     private __onMouseMove;
     private __onEsc;
     private __onResize;
+    /**
+     * Minimal size the dialog can be resized to — the header and the footer
+     * (with its buttons) must always stay inside the panel
+     */
+    private minSize;
     private __onResizerMouseDown;
     private __addGlobalResizeListeners;
     private __removeGlobalResizeListeners;

package/types/modules/toolbar/button/content.d.ts

@@ -15,6 +15,12 @@ export declare class ToolbarContent<T extends IViewBased = IViewBased> extends U
     className(): string;
     /** @override */
     update(): void;
+    /**
+     * The content is arbitrary HTML — propagate the disabled state to the
+     * nested form controls (e.g. the file input of the Upload button),
+     * otherwise they stay interactive.
+     */
+    protected onChangeDisabled(): void;
     /** @override */
     protected createContainer(): HTMLElement;
     constructor(jodit: T, control: IControlTypeContent, target?: Nullable<HTMLElement>);

package/types/plugins/inline-popup/inline-popup.d.ts

@@ -42,6 +42,21 @@ export declare class inlinePopup extends Plugin {
     private isExcludedTarget;
     /** @override **/
     protected afterInit(jodit: IJodit): void;
+    /**
+     * The user pressed a button inside the selection toolbar — after the
+     * command fires `closeAllPopups`, the toolbar should be shown again
+     * while the selection is still there. See #1238
+     */
+    private __reopenSelectionPopup;
+    private __onDocumentMouseDown;
+    private __onCloseAllPopups;
+    /**
+     * The selection rect comes from the editor document — in iframe mode its
+     * coordinates are iframe-local, while the popup lives in the host
+     * document, so the iframe offset must be added. See
+     * https://github.com/xdan/jodit/issues/1058
+     */
+    private __selectionBound;
     private snapRange;
     private onSelectionStart;
     private onSelectionEnd;

package/types/plugins/paste/paste.d.ts

@@ -45,7 +45,7 @@ export declare class paste extends Plugin {
      */
     private __insertByType;
     /**
-     * Replace all \\n chars in plain text to br
+     * Escape plain text and replace all \\n chars with br
      */
     private onProcessPasteReplaceNl2Br;
 }