jodit 4.12.17 → 4.12.20

package/esm/plugins/enter/enter.js

@@ -45,12 +45,17 @@ export class enter extends Plugin {
             if (beforeEnter !== undefined) {
                 return beforeEnter;
             }
-            if (!editor.s.isCollapsed()) {
-                editor.execCommand('Delete');
-            }
-            editor.s.focus();
-            this.onEnter(event);
-            editor.e.fire('afterEnter', event);
+            // Delete-of-selection + new block must be a single history step,
+            // otherwise pressing Enter over a selection needs two Ctrl+Z to undo
+            // (the first only reverts to the intermediate empty state). #1292
+            editor.history.snapshot.transaction(() => {
+                if (!editor.s.isCollapsed()) {
+                    editor.execCommand('Delete');
+                }
+                editor.s.focus();
+                this.onEnter(event);
+                editor.e.fire('afterEnter', event);
+            });
             editor.synchronizeValues(); // fire change
             return false;
         }

package/esm/plugins/hotkeys/config.js

@@ -7,6 +7,6 @@ import { Config } from "../../config.js";
 Config.prototype.commandToHotkeys = {
     removeFormat: ['ctrl+shift+m', 'cmd+shift+m'],
     insertOrderedList: ['ctrl+shift+7', 'cmd+shift+7'],
-    insertUnorderedList: ['ctrl+shift+8, cmd+shift+8'],
+    insertUnorderedList: ['ctrl+shift+8', 'cmd+shift+8'],
     selectall: ['ctrl+a', 'cmd+a']
 };

package/esm/plugins/indent/config.js

@@ -15,15 +15,29 @@ Config.prototype.controls.indent = {
 };
 Config.prototype.controls.outdent = {
     isDisabled: (editor) => {
+        var _a;
         const current = editor.s.current();
-        if (current) {
-            const currentBox = Dom.closest(current, Dom.isBlock, editor.editor);
-            if (currentBox) {
-                const arrow = getKey(editor.o.direction, currentBox);
-                return (!currentBox.style[arrow] ||
-                    parseInt(currentBox.style[arrow], 10) <= 0);
+        if (!current) {
+            return true;
+        }
+        // A list item whose list is nested inside another list item can be
+        // outdented (un-nested) by the `tab` plugin, even without an inline
+        // indent margin. Keep the button enabled in that case. See #1247
+        if ((_a = editor.o.tab) === null || _a === void 0 ? void 0 : _a.tabInsideLiInsertNewList) {
+            const li = Dom.closest(current, 'li', editor.editor);
+            if (li) {
+                const list = Dom.closest(li, ['ul', 'ol'], editor.editor);
+                if (list && Dom.closest(list, 'li', editor.editor)) {
+                    return false;
+                }
             }
         }
+        const currentBox = Dom.closest(current, Dom.isBlock, editor.editor);
+        if (currentBox) {
+            const arrow = getKey(editor.o.direction, currentBox);
+            return (!currentBox.style[arrow] ||
+                parseInt(currentBox.style[arrow], 10) <= 0);
+        }
         return true;
     },
     tooltip: 'Decrease Indent'

package/esm/plugins/paste/paste.js

@@ -148,10 +148,15 @@ export class paste extends Plugin {
                     html = cleanFromWord(html);
                     break;
                 case INSERT_ONLY_TEXT:
-                    html = stripTags(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags));
+                    html = stripTags(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
                     break;
                 case INSERT_AS_TEXT:
                     html = htmlspecialchars(html);
+                    // Keep the source line breaks instead of letting the raw
+                    // newlines collapse into spaces when rendered. See #1093
+                    if (this.j.o.nl2brInPlainText) {
+                        html = nl2br(html);
+                    }
                     break;
                 default: {
                     const newHTML = this.j.e.fire('onCustomPasteHTMLOption', action, html, e);

package/esm/plugins/paste-from-word/paste-from-word.js

@@ -61,7 +61,7 @@ export class pasteFromWord extends Plugin {
                 break;
             }
             case INSERT_ONLY_TEXT: {
-                html = stripTags(cleanFromWord(html));
+                html = stripTags(cleanFromWord(html), this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
                 break;
             }
         }

package/esm/plugins/select/select.d.ts

@@ -39,6 +39,14 @@ export declare class select extends Plugin {
      * of the end (#1296); move it to the end of the item's own text.
      */
     protected onClickRightOfNestedListItem(e: MouseEvent): void;
+    /**
+     * Keep pending inline formatting after a click. Toggling Bold/Italic/etc. on
+     * a collapsed cursor leaves empty marker elements with the caret inside; a
+     * click puts the caret right before them (outside), so they get cleaned up
+     * and the formatting is lost. Move the caret back into the innermost marker
+     * so the next typed character keeps every pending format (#1291).
+     */
+    protected onClickKeepPendingFormat(): void;
     /**
      * Normalize selection after triple click
      */

package/esm/plugins/select/select.js

@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
                 r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+import { IS_INLINE } from "../../core/constants.js";
 import { autobind, watch } from "../../core/decorators/index.js";
 import { Dom } from "../../core/dom/dom.js";
 import { pluginSystem } from "../../core/global.js";
@@ -121,6 +122,39 @@ export class select extends Plugin {
             s.setCursorAfter(text);
         }
     }
+    /**
+     * Keep pending inline formatting after a click. Toggling Bold/Italic/etc. on
+     * a collapsed cursor leaves empty marker elements with the caret inside; a
+     * click puts the caret right before them (outside), so they get cleaned up
+     * and the formatting is lost. Move the caret back into the innermost marker
+     * so the next typed character keeps every pending format (#1291).
+     */
+    onClickKeepPendingFormat() {
+        var _a, _b;
+        const { s } = this.j;
+        const range = s.range;
+        if (!range.collapsed || !Dom.isText(range.startContainer)) {
+            return;
+        }
+        const text = range.startContainer;
+        // Caret must sit at the very end of the text, right before the markers.
+        if (range.startOffset !== ((_b = (_a = text.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0)) {
+            return;
+        }
+        const marker = text.nextSibling;
+        if (!Dom.isElement(marker) ||
+            !marker.nodeName.match(IS_INLINE) ||
+            !Dom.isEmpty(marker)) {
+            return;
+        }
+        let inner = marker;
+        // Descend into the innermost empty formatting marker.
+        while (Dom.isElement(inner.firstElementChild) &&
+            inner.firstElementChild.nodeName.match(IS_INLINE)) {
+            inner = inner.firstElementChild;
+        }
+        s.setCursorIn(inner);
+    }
     /**
      * Normalize selection after triple click
      */
@@ -164,6 +198,9 @@ __decorate([
 __decorate([
     watch([':click'])
 ], select.prototype, "onClickRightOfNestedListItem", null);
+__decorate([
+    watch([':click'])
+], select.prototype, "onClickKeepPendingFormat", null);
 __decorate([
     watch([':click'])
 ], select.prototype, "onTripleClickNormalizeSelection", null);

package/package.json

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

package/types/core/helpers/html/strip-tags.d.ts

@@ -10,4 +10,4 @@ import type { HTMLTagNames, Nullable } from "../../../types/index";
 /**
  * Extract plain text from HTML text
  */
-export declare function stripTags(html: string | Node, doc?: Document, exclude?: Nullable<Set<HTMLTagNames>>): string;
+export declare function stripTags(html: string | Node, doc?: Document, exclude?: Nullable<Set<HTMLTagNames>>, blockBr?: boolean): string;

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

@@ -21,10 +21,31 @@ export declare class dragAndDropElement extends Plugin {
     private state;
     /** @override */
     protected afterInit(): void;
+    /**
+     * Start dragging a specific element programmatically.
+     *
+     * Allows a separate UI element (for example a drag handle/anchor shown next
+     * to a block) to initiate the drag without the user pressing directly on the
+     * draggable element itself.
+     *
+     * @example
+     * ```js
+     * handle.addEventListener('mousedown', e => {
+     * 	editor.e.fire('startDragElement', preBlock, e);
+     * });
+     * ```
+     */
+    private onStartDragElement;
     /**
      * Drag start handler
      */
     private onDragStart;
+    /**
+     * Prepare the ghost element and switch to the waiting state.
+     * Shared by the native mousedown handler and the programmatic
+     * `startDragElement` event handler.
+     */
+    private startDragging;
     /**
      * Mouse move handler handler
      */

package/types/plugins/select/select.d.ts

@@ -39,6 +39,14 @@ export declare class select extends Plugin {
      * of the end (#1296); move it to the end of the item's own text.
      */
     protected onClickRightOfNestedListItem(e: MouseEvent): void;
+    /**
+     * Keep pending inline formatting after a click. Toggling Bold/Italic/etc. on
+     * a collapsed cursor leaves empty marker elements with the caret inside; a
+     * click puts the caret right before them (outside), so they get cleaned up
+     * and the formatting is lost. Move the caret back into the innermost marker
+     * so the next typed character keeps every pending format (#1291).
+     */
+    protected onClickKeepPendingFormat(): void;
     /**
      * Normalize selection after triple click
      */