jodit 4.12.17 → 4.12.20

package/es2015/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.12.17
+ * Version: v4.12.20
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1808,7 +1808,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.12.17";
+ */ const APP_VERSION = "4.12.20";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -5790,6 +5790,16 @@ function normalizeCSS(s) {
             iframeDoc.open();
             iframeDoc.write(html);
             iframeDoc.close();
+            // Word marks its auto-generated list markers (the literal
+            // bullet/number, e.g. `1.` or `·`) with `mso-list:Ignore`.
+            // They are display-only and must not be imported, otherwise
+            // the marker text leaks into the content. Drop them before any
+            // style normalization strips the `mso-list` hint. See #948
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.each(iframeDoc.body, (node)=>{
+                if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && /mso-list:\s*ignore/i.test(node.getAttribute('style') || '')) {
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+                }
+            });
             try {
                 for(let i = 0; i < iframeDoc.styleSheets.length; i += 1){
                     const rules = iframeDoc.styleSheets[i].cssRules;
@@ -5887,6 +5897,15 @@ function normalizeCSS(s) {
                                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.unwrap(node);
                                 break;
                             default:
+                                // Word marks its auto-generated list markers
+                                // (the literal bullet/number, e.g. `1.` or `·`)
+                                // with `mso-list:Ignore`. They are display-only
+                                // and must not be imported, otherwise the marker
+                                // text leaks into the content. See #948
+                                if (/mso-list:\s*ignore/i.test(node.getAttribute('style') || '')) {
+                                    marks.push(node);
+                                    break;
+                                }
                                 (0,jodit_core_helpers_array_to_array__WEBPACK_IMPORTED_MODULE_2__.toArray)(node.attributes).forEach((attr)=>{
                                     if ([
                                         'src',
@@ -6028,20 +6047,20 @@ function normalizeCSS(s) {
         return;
     }
     const removeEvents = (_options_removeEventAttributes = options.removeEventAttributes) !== null && _options_removeEventAttributes !== void 0 ? _options_removeEventAttributes : options.removeOnError;
-    if (removeEvents) {
-        removeAllEventAttributes(box);
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.$$)('*', box).forEach((elm)=>removeAllEventAttributes(elm));
-    } else if (options.removeOnError) {
-        sanitizeHTMLElement(box, options);
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.$$)('[onerror]', box).forEach((elm)=>sanitizeHTMLElement(elm, options));
-    }
-    if (options.safeJavaScriptLink) {
-        sanitizeHTMLElement(box, options);
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.$$)('a[href^="javascript"]', box).forEach((elm)=>sanitizeHTMLElement(elm, options));
-    }
-    if (options.safeLinksTarget) {
-        (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.$$)('a[target="_blank"]', box).forEach((elm)=>{
-            const rel = elm.getAttribute('rel') || '';
+    // Single synchronous traversal of the subtree. Besides removing event
+    // handlers and `javascript:` links, `sanitizeHTMLElement` neutralises
+    // executable `iframe[srcdoc]`, `data:text/html` / SVG `data:` document
+    // sources and dangerous schemes in every URL-bearing attribute.
+    const process = (node)=>{
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(node)) {
+            return;
+        }
+        if (removeEvents) {
+            removeAllEventAttributes(node);
+        }
+        sanitizeHTMLElement(node, options);
+        if (options.safeLinksTarget && node.nodeName === 'A' && node.getAttribute('target') === '_blank') {
+            const rel = node.getAttribute('rel') || '';
             const parts = rel.split(/\s+/).filter(Boolean);
             if (!parts.includes('noopener')) {
                 parts.push('noopener');
@@ -6049,9 +6068,11 @@ function normalizeCSS(s) {
             if (!parts.includes('noreferrer')) {
                 parts.push('noreferrer');
             }
-            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'rel', parts.join(' '));
-        });
-    }
+            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(node, 'rel', parts.join(' '));
+        }
+    };
+    process(box);
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.each(box, process);
 }
 /**
  * Remove all on* event handler attributes from an element
@@ -6072,6 +6093,41 @@ function normalizeCSS(s) {
     }
     return effected;
 }
+/**
+ * URL-bearing attributes (besides `href`) that can load or execute content.
+ */ const URL_ATTRIBUTES = [
+    'src',
+    'data',
+    'action',
+    'formaction',
+    'poster',
+    'background',
+    'xlink:href'
+];
+/**
+ * Tags that load their URL as a *document* (scripts inside run). An SVG data
+ * URL is only an XSS vector here — as an `<img>` source it renders inertly.
+ */ const DOCUMENT_EMBED_TAGS = new Set([
+    'iframe',
+    'frame',
+    'object',
+    'embed'
+]);
+/**
+ * Detects executable / script-bearing URL schemes. The attribute value is
+ * already HTML-entity-decoded by `getAttribute`, so only whitespace and
+ * control characters (which browsers ignore inside a scheme) need stripping.
+ */ function isDangerousUrl(value, tagName) {
+    // eslint-disable-next-line no-control-regex
+    const normalized = value.replace(/[\u0000-\u0020]+/g, '').toLowerCase();
+    if (/^(?:javascript|vbscript|livescript|mocha):/.test(normalized)) {
+        return true;
+    }
+    if (/^data:(?:text\/html|application\/xhtml)/.test(normalized)) {
+        return true;
+    }
+    return /^data:image\/svg/.test(normalized) && DOCUMENT_EMBED_TAGS.has(tagName);
+}
 function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
     safeJavaScriptLink: true,
     removeOnError: true
@@ -6089,6 +6145,22 @@ function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
         (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', location.protocol + '//' + href);
         effected = true;
     }
+    if (safeJavaScriptLink) {
+        // `srcdoc` runs its content as a full HTML document — drop it entirely.
+        if (elm.hasAttribute('srcdoc')) {
+            (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'srcdoc', null);
+            effected = true;
+        }
+        // Strip executable schemes from any other URL-bearing attribute.
+        const tagName = elm.nodeName.toLowerCase();
+        for (const name of URL_ATTRIBUTES){
+            const value = elm.getAttribute(name);
+            if (value && isDangerousUrl(value, tagName)) {
+                (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, name, null);
+                effected = true;
+            }
+        }
+    }
     return effected;
 }
 
@@ -6139,7 +6211,7 @@ const ALONE_TAGS = new Set([
 ]);
 /**
  * Extract plain text from HTML text
- */ function stripTags(html, doc = document, exclude = null) {
+ */ function stripTags(html, doc = document, exclude = null, blockBr = false) {
     const tmp = doc.createElement('div');
     if ((0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_1__.isString)(html)) {
         tmp.innerHTML = html;
@@ -6153,7 +6225,7 @@ const ALONE_TAGS = new Set([
         }
         if (exclude && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(p, exclude)) {
             const tag = p.nodeName.toLowerCase();
-            const text = !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(p, ALONE_TAGS) ? `%%%jodit-${tag}%%%${stripTags(p.innerHTML, doc, exclude)}%%%/jodit-${tag}%%%` : `%%%jodit-single-${tag}%%%`;
+            const text = !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(p, ALONE_TAGS) ? `%%%jodit-${tag}%%%${stripTags(p.innerHTML, doc, exclude, blockBr)}%%%/jodit-${tag}%%%` : `%%%jodit-single-${tag}%%%`;
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.before(p, doc.createTextNode(text));
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(p);
             return;
@@ -6170,7 +6242,11 @@ const ALONE_TAGS = new Set([
             return;
         }
         if (nx) {
-            pr.insertBefore(doc.createTextNode(' '), nx);
+            // By default blocks are joined with a single space (single-line
+            // plain text). When `blockBr` is set, separate them with a line
+            // break instead, so paragraph structure survives — e.g. the
+            // "Insert only Text" paste option. See #1232
+            pr.insertBefore(doc.createTextNode(blockBr ? '%%%jodit-single-br%%%' : ' '), nx);
         }
     });
     return restoreTags((0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__.trim)(tmp.innerText));
@@ -7661,6 +7737,18 @@ const completeUrl = (url)=>{
 
 
 
+/**
+ * Keys that must never be copied from a (potentially untrusted) config object —
+ * assigning them during a recursive merge can reach and mutate
+ * `Object.prototype` (prototype pollution, CWE-1321).
+ */ const UNSAFE_PROTO_KEYS = [
+    '__proto__',
+    'constructor',
+    'prototype'
+];
+function isUnsafeProtoKey(key) {
+    return UNSAFE_PROTO_KEYS.indexOf(key) !== -1;
+}
 /**
  * @example
  * ```js
@@ -7709,6 +7797,9 @@ const completeUrl = (url)=>{
     }
     const newOpt = {};
     Object.keys(options).forEach((key)=>{
+        if (isUnsafeProtoKey(key)) {
+            return;
+        }
         const opt = options[key], protoKey = proto ? proto[key] : null;
         if ((0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(opt) && (0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(protoKey) && !(0,_extend__WEBPACK_IMPORTED_MODULE_5__.isAtom)(opt)) {
             newOpt[key] = ConfigProto(opt, protoKey, deep + 1);
@@ -7770,6 +7861,9 @@ function ConfigFlatten(obj) {
  * @see {@link ConfigProto} for the prototype-chain variant used at editor creation time
  */ function ConfigMerge(target, source) {
     Object.keys(source).forEach((key)=>{
+        if (isUnsafeProtoKey(key)) {
+            return;
+        }
         const srcVal = source[key];
         const tgtVal = target[key];
         if ((0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(srcVal) && (0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(tgtVal) && !(0,_extend__WEBPACK_IMPORTED_MODULE_5__.isAtom)(srcVal)) {
@@ -7815,7 +7909,6 @@ function ConfigDeepFlatten(obj) {
         return url;
     }
     const parser = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.globalDocument.createElement('a');
-    const pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
     parser.href = url;
     if (!width) {
         width = 400;
@@ -7827,19 +7920,41 @@ function ConfigDeepFlatten(obj) {
     switch(parser.hostname){
         case 'www.vimeo.com':
         case 'vimeo.com':
-            return pattern1.test(url) ? url.replace(pattern1, '<iframe width="' + width + '" height="' + height + '" src="' + protocol + '//player.vimeo.com/video/$1" frameborder="0" allowfullscreen></iframe>') : url;
+            {
+                // The numeric video id can be preceded by `channels/<name>/` or
+                // `groups/<name>/videos/` and followed by tracking params (e.g.
+                // `?share=copy`). Unlisted videos keep a hash right after the id
+                // (`vimeo.com/<id>/<hash>`). Extract the id (+ hash) from the path
+                // so all of those forms produce a valid embed. See #1209
+                const segments = parser.pathname.split('/').filter(Boolean);
+                const idIndex = segments.findIndex((s)=>/^\d+$/.test(s));
+                if (idIndex === -1) {
+                    return url;
+                }
+                let path = segments[idIndex];
+                const hash = segments[idIndex + 1];
+                if (hash && idIndex === 0) {
+                    path += '/' + hash;
+                }
+                return '<iframe width="' + width + '" height="' + height + '" src="' + protocol + '//player.vimeo.com/video/' + path + '" frameborder="0" allowfullscreen></iframe>';
+            }
         case 'youtube.com':
         case 'www.youtube.com':
+        case 'm.youtube.com':
+        case 'music.youtube.com':
         case 'youtu.be':
         case 'www.youtu.be':
             {
-                const query = parser.search ? (0,_parse_query__WEBPACK_IMPORTED_MODULE_2__.parseQuery)(parser.search) : {
-                    v: parser.pathname.substring(1)
-                };
-                if (/^embed\/.*/.test(query.v)) {
-                    query.v = query.v.substring(6);
-                }
-                return query.v ? '<iframe width="' + width + '" height="' + height + '" src="' + protocol + '//www.youtube.com/embed/' + query.v + '" frameborder="0" allowfullscreen></iframe>' : url;
+                const query = parser.search ? (0,_parse_query__WEBPACK_IMPORTED_MODULE_2__.parseQuery)(parser.search) : {};
+                // `youtube.com/watch` keeps the video id in the `v` query
+                // parameter, while the short `youtu.be/<id>` links and the
+                // `/embed/`, `/shorts/`, `/live/` paths keep it in the pathname.
+                // Modern share urls add tracking params (e.g. `?si=`, `?t=`), so
+                // the pathname must still be used as a fallback when there is no
+                // `v`. See #1209
+                let v = query.v || parser.pathname.substring(1);
+                v = v.replace(/^(watch|embed|shorts|live|v)\//, '').replace(/\/$/, '');
+                return v ? '<iframe width="' + width + '" height="' + height + '" src="' + protocol + '//www.youtube.com/embed/' + v + '" frameborder="0" allowfullscreen></iframe>' : url;
             }
     }
     return url;
@@ -17752,6 +17867,23 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_10__.ViewWithToolbar
                 }
                 this.synchronizeValues();
             }
+        }).on(this.ow, 'mouseup', (event)=>{
+            if (this.o.readonly || this.__isSilentChange) {
+                return;
+            }
+            // When a selection is started inside the editor and the
+            // mouse button is released outside of it, the editable
+            // area never receives the `mouseup` event, so the toolbar
+            // state (active buttons) is not recalculated. Re-fire the
+            // event manually for that case while the selection still
+            // belongs to the editor. See #1251
+            const target = event.target;
+            const insideEditor = Boolean(target && (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.isNumber)(target.nodeType) && editor.contains(target));
+            if (insideEditor || !this.s.isInsideArea) {
+                return;
+            }
+            this.e.fire('changeSelection');
+            this.synchronizeValues();
         });
     }
     fetch(url, options) {
@@ -24221,9 +24353,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.uploader = {
     insertImageAsBase64URI: false,
     imagesExtensions: [
         'jpg',
-        'png',
         'jpeg',
-        'gif'
+        'png',
+        'gif',
+        'webp',
+        'bmp',
+        'svg',
+        'tiff',
+        'avif'
     ],
     headers: null,
     data: null,
@@ -28194,7 +28331,11 @@ function filterStyleProperties(style, allowed) {
     if (!jodit.o.cleanHTML.removeEmptyElements) {
         return false;
     }
-    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current));
+    // Never drop an empty inline element that currently holds the caret — it is
+    // a pending-format marker the user is about to type into (#1291). `current`
+    // is captured before a click moves the caret, so also check the live caret.
+    const liveCaret = jodit.s.isCollapsed() ? jodit.s.range.startContainer : null;
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,jodit_core_helpers_string_trim__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current)) && (liveCaret == null || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, liveCaret));
 }
 
 
@@ -28503,8 +28644,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
         const update = (key, value)=>{
             if (value && value !== (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(editor.editor, key).toString()) {
                 button.state.icon.fill = value;
-                return;
+                return true;
             }
+            return false;
         };
         if (color) {
             const mode = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color');
@@ -28514,8 +28656,16 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
         const current = editor.s.current();
         if (current && !button.state.disabled) {
             const currentBpx = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(current, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement, editor.editor) || editor.editor;
-            update('color', (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentBpx, 'color').toString());
-            update('background-color', (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentBpx, 'background-color').toString());
+            // The icon's fill mirrors the current text/background color so the
+            // button reflects the formatting under the caret. Both calls run so
+            // that a background color (the second call) wins over the text color
+            // when both are set. Keep the computed fill instead of resetting it
+            // below. See #195, #182
+            const hasColor = update('color', (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentBpx, 'color').toString());
+            const hasBackground = update('background-color', (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentBpx, 'background-color').toString());
+            if (hasColor || hasBackground) {
+                return;
+            }
         }
         button.state.icon.fill = '';
         button.state.activated = false;
@@ -29324,11 +29474,33 @@ var DragState = /*#__PURE__*/ function(DragState) {
  */ class dragAndDropElement extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugin {
     /** @override */ afterInit() {
         this.dragList = this.j.o.draggableTags ? (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.splitArray)(this.j.o.draggableTags).filter(Boolean).map((item)=>item.toLowerCase()) : [];
+        // Allow another plugin (e.g. a drag handle/anchor) to start dragging
+        // an element programmatically, regardless of the `draggableTags` list.
+        this.j.e.on('startDragElement', this.onStartDragElement);
         if (!this.dragList.length) {
             return;
         }
         this.j.e.on('mousedown dragstart', this.onDragStart);
     }
+    /**
+	 * 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);
+	 * });
+	 * ```
+	 */ onStartDragElement(element, event) {
+        if (this.isInDestruct || this.state > 0 || !element) {
+            return;
+        }
+        this.startDragging(element, event);
+    }
     /**
 	 * Drag start handler
 	 */ onDragStart(event) {
@@ -29350,11 +29522,18 @@ var DragState = /*#__PURE__*/ function(DragState) {
         if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(lastTarget.parentElement, 'a') && lastTarget.parentElement.firstChild === lastTarget && lastTarget.parentElement.lastChild === lastTarget) {
             lastTarget = lastTarget.parentElement;
         }
+        this.startDragging(lastTarget, event);
+    }
+    /**
+	 * Prepare the ghost element and switch to the waiting state.
+	 * Shared by the native mousedown handler and the programmatic
+	 * `startDragElement` event handler.
+	 */ startDragging(target, event) {
         this.startX = event.clientX;
         this.startY = event.clientY;
         this.isCopyMode = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.ctrlKey)(event); // we can move only element from editor
-        this.draggable = lastTarget.cloneNode(true);
-        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(this.draggable, 'target', lastTarget);
+        this.draggable = target.cloneNode(true);
+        (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(this.draggable, 'target', target);
         this.state = 1;
         this.addDragListeners();
     }
@@ -29424,6 +29603,18 @@ var DragState = /*#__PURE__*/ function(DragState) {
         }
         const { parentElement } = fragment;
         this.j.s.insertNode(fragment, true, false);
+        // Dropping a non-editable block (e.g. a `<pre>` code sample) can leave an
+        // invisible filler text node beside it. Remove it so the drop does not
+        // introduce a stray empty line (which clean-html would otherwise strip
+        // later, causing a flash).
+        [
+            fragment.previousSibling,
+            fragment.nextSibling
+        ].forEach((node)=>{
+            if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isEmptyTextNode(node)) {
+                jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(node);
+            }
+        });
         if (parentElement && jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isEmpty(parentElement) && !jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isCell(parentElement)) {
             jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(parentElement);
         }
@@ -29450,7 +29641,7 @@ var DragState = /*#__PURE__*/ function(DragState) {
     }
     /** @override */ beforeDestruct() {
         this.onDragEnd();
-        this.j.e.off('mousedown dragstart', this.onDragStart);
+        this.j.e.off('mousedown dragstart', this.onDragStart).off('startDragElement', this.onStartDragElement);
         this.removeDragListeners();
     }
     constructor(...args){
@@ -29459,6 +29650,9 @@ var DragState = /*#__PURE__*/ function(DragState) {
 	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "diffStep", 10), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "startX", 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "startY", 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "state", 0);
     }
 }
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
+], dragAndDropElement.prototype, "onStartDragElement", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
 ], dragAndDropElement.prototype, "onDragStart", null);
@@ -29960,12 +30154,17 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('dtd', dtd);
             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;
         }
@@ -31084,7 +31283,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.commandToHotkeys = {
         'cmd+shift+7'
     ],
     insertUnorderedList: [
-        'ctrl+shift+8, cmd+shift+8'
+        'ctrl+shift+8',
+        'cmd+shift+8'
     ],
     selectall: [
         'ctrl+a',
@@ -33333,14 +33533,31 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.indent = {
 };
 jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.outdent = {
     isDisabled: (editor)=>{
+        var _editor_o_tab;
         const current = editor.s.current();
-        if (current) {
-            const currentBox = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock, editor.editor);
-            if (currentBox) {
-                const arrow = (0,_helpers__WEBPACK_IMPORTED_MODULE_5__.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 ((_editor_o_tab = editor.o.tab) === null || _editor_o_tab === void 0 ? void 0 : _editor_o_tab.tabInsideLiInsertNewList) {
+            const li = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(current, 'li', editor.editor);
+            if (li) {
+                const list = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(li, [
+                    'ul',
+                    'ol'
+                ], editor.editor);
+                if (list && jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(list, 'li', editor.editor)) {
+                    return false;
+                }
             }
         }
+        const currentBox = jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(current, jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock, editor.editor);
+        if (currentBox) {
+            const arrow = (0,_helpers__WEBPACK_IMPORTED_MODULE_5__.getKey)(editor.o.direction, currentBox);
+            return !currentBox.style[arrow] || parseInt(currentBox.style[arrow], 10) <= 0;
+        }
         return true;
     },
     tooltip: 'Decrease Indent'
@@ -36217,7 +36434,7 @@ class pasteFromWord extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugi
                 }
             case jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INSERT_ONLY_TEXT:
                 {
-                    html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.stripTags)((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.cleanFromWord)(html));
+                    html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.stripTags)((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.cleanFromWord)(html), this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
                     break;
                 }
         }
@@ -36776,10 +36993,15 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.paste = {
                     html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.cleanFromWord)(html);
                     break;
                 case jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INSERT_ONLY_TEXT:
-                    html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.stripTags)(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags));
+                    html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.stripTags)(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
                     break;
                 case jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INSERT_AS_TEXT:
                     html = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.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 = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.nl2br)(html);
+                    }
                     break;
                 default:
                     {
@@ -39523,13 +39745,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 /* unused harmony export select */
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25045);
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31635);
-/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23211);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers_string_camel_case__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57821);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91206);
-/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(4099);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(47670);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers_string_camel_case__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(57821);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(91206);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(4099);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(47670);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -39547,6 +39770,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 
 
 
+
 /**
  * A utility plugin that allows you to subscribe to a click/mousedown/touchstart/mouseup on an element in DOM order
  *
@@ -39557,7 +39781,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
  *   console.log(img.src);
  * })
  * ```
- */ class select extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugin {
+ */ class select extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
     afterInit(jodit) {
         this.proxyEventsList.forEach((eventName)=>{
             jodit.e.on(eventName + '.select', this.onStartSelection);
@@ -39572,7 +39796,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         const { j } = this;
         let result, target = e.target;
         while(result === undefined && target && target !== j.editor){
-            result = j.e.fire((0,jodit_core_helpers_string_camel_case__WEBPACK_IMPORTED_MODULE_5__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
+            result = j.e.fire((0,jodit_core_helpers_string_camel_case__WEBPACK_IMPORTED_MODULE_6__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
             target = target.parentElement;
         }
         if (e.type === 'click' && result === undefined && target === j.editor) {
@@ -39583,10 +39807,10 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 	 * @event outsideClick(e) - when user clicked on the outside of editor
 	 */ onOutsideClick(e) {
         const node = e.target;
-        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.up(node, (elm)=>elm === this.j.editor)) {
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.up(node, (elm)=>elm === this.j.editor)) {
             return;
         }
-        const box = jodit_core_ui__WEBPACK_IMPORTED_MODULE_7__.UIElement.closestElement(node, jodit_core_ui__WEBPACK_IMPORTED_MODULE_7__.Popup);
+        const box = jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.UIElement.closestElement(node, jodit_core_ui__WEBPACK_IMPORTED_MODULE_8__.Popup);
         if (!box) {
             this.j.e.fire('outsideClick', e);
         }
@@ -39595,7 +39819,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         const { s } = this.j;
         if (!s.isCollapsed()) {
             const current = s.current();
-            if (current && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isOrContains(this.j.editor, current)) {
+            if (current && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isOrContains(this.j.editor, current)) {
                 this.onCopyNormalizeSelectionBound();
             }
         }
@@ -39614,14 +39838,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 	 */ onClickRightOfNestedListItem(e) {
         const { s } = this.j;
         const range = s.range;
-        if (!range.collapsed || range.startOffset !== 0 || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isText(range.startContainer)) {
+        if (!range.collapsed || range.startOffset !== 0 || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(range.startContainer)) {
             return;
         }
         const text = range.startContainer;
         const li = text.parentNode;
         // The text must be the direct content of a list item that has a nested
         // list (the last level has no nested list and behaves correctly).
-        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isTag(li, 'li') || !(li.querySelector('ul') || li.querySelector('ol'))) {
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isTag(li, 'li') || !(li.querySelector('ul') || li.querySelector('ol'))) {
             return;
         }
         const measure = this.j.ed.createRange();
@@ -39632,6 +39856,36 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
             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 _ref;
+        var _text_nodeValue;
+        const { s } = this.j;
+        const range = s.range;
+        if (!range.collapsed || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.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 !== ((_ref = (_text_nodeValue = text.nodeValue) === null || _text_nodeValue === void 0 ? void 0 : _text_nodeValue.length) !== null && _ref !== void 0 ? _ref : 0)) {
+            return;
+        }
+        const marker = text.nextSibling;
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isElement(marker) || !marker.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.IS_INLINE) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isEmpty(marker)) {
+            return;
+        }
+        let inner = marker;
+        // Descend into the innermost empty formatting marker.
+        while(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isElement(inner.firstElementChild) && inner.firstElementChild.nodeName.match(jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.IS_INLINE)){
+            inner = inner.firstElementChild;
+        }
+        s.setCursorIn(inner);
+    }
     /**
 	 * Normalize selection after triple click
 	 */ onTripleClickNormalizeSelection(e) {
@@ -39640,8 +39894,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         }
         const { s } = this.j;
         const { startContainer, startOffset } = s.range;
-        if (startOffset === 0 && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isText(startContainer)) {
-            s.select(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.closest(startContainer, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isBlock, this.j.editor) || startContainer, true);
+        if (startOffset === 0 && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(startContainer)) {
+            s.select(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.closest(startContainer, jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isBlock, this.j.editor) || startContainer, true);
         }
     }
     onCopyNormalizeSelectionBound(e) {
@@ -39649,7 +39903,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         if (!o.select.normalizeSelectionBeforeCutAndCopy || s.isCollapsed()) {
             return;
         }
-        if (e && (!e.isTrusted || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isNode(e.target) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isOrContains(editor, e.target))) {
+        if (e && (!e.isTrusted || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isNode(e.target) || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isOrContains(editor, e.target))) {
             return;
         }
         this.jodit.s.expandSelection();
@@ -39665,38 +39919,43 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
     }
 }
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.autobind
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.autobind
 ], select.prototype, "onStartSelection", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)('ow:click')
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)('ow:click')
 ], select.prototype, "onOutsideClick", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
         ':beforeCommandCut'
     ])
 ], select.prototype, "beforeCommandCut", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
         ':beforeCommandSelectall'
     ])
 ], select.prototype, "beforeCommandSelectAll", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
         ':click'
     ])
 ], select.prototype, "onClickRightOfNestedListItem", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
+        ':click'
+    ])
+], select.prototype, "onClickKeepPendingFormat", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
         ':click'
     ])
 ], select.prototype, "onTripleClickNormalizeSelection", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.watch)([
         ':copy',
         ':cut'
     ])
 ], select.prototype, "onCopyNormalizeSelectionBound", null);
-jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('select', select);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_5__.pluginSystem.add('select', select);
 
 
 /***/ }),