jodit-pro 4.12.21 → 4.12.23

package/es2021/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.12.21
+ * Version: v4.12.23
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1746,7 +1746,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.12.21";
+ */ const APP_VERSION = "4.12.23";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -7486,6 +7486,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
@@ -7534,6 +7546,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,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(opt) && (0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(protoKey) && !(0,_extend_js__WEBPACK_IMPORTED_MODULE_5__.isAtom)(opt)) {
             newOpt[key] = ConfigProto(opt, protoKey, deep + 1);
@@ -7595,6 +7610,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,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(srcVal) && (0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(tgtVal) && !(0,_extend_js__WEBPACK_IMPORTED_MODULE_5__.isAtom)(srcVal)) {
@@ -32864,7 +32882,11 @@ function filterStyleProperties(style, allowed) {
     if (!jodit.o.cleanHTML.removeEmptyElements) {
         return false;
     }
-    return _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__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 _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current)) && (liveCaret == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, liveCaret));
 }
 
 
@@ -33997,11 +34019,33 @@ var DragState;
  */ class dragAndDropElement extends _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plugin {
     /** @override */ afterInit() {
         this.dragList = this.j.o.draggableTags ? (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.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 > DragState.IDLE || !element) {
+            return;
+        }
+        this.startDragging(element, event);
+    }
     /**
      * Drag start handler
      */ onDragStart(event) {
@@ -34023,11 +34067,18 @@ var DragState;
         if (_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.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,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.ctrlKey)(event); // we can move only element from editor
-        this.draggable = lastTarget.cloneNode(true);
-        (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(this.draggable, 'target', lastTarget);
+        this.draggable = target.cloneNode(true);
+        (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(this.draggable, 'target', target);
         this.state = DragState.WAIT_DRAGGING;
         this.addDragListeners();
     }
@@ -34097,6 +34148,18 @@ var 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 (_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmptyTextNode(node)) {
+                _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+            }
+        });
         if (parentElement && _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmpty(parentElement) && !_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isCell(parentElement)) {
             _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(parentElement);
         }
@@ -34123,7 +34186,7 @@ var 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(){
@@ -34139,6 +34202,9 @@ var DragState;
         this.state = DragState.IDLE;
     }
 }
+__decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
+], dragAndDropElement.prototype, "onStartDragElement", null);
 __decorate([
     _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], dragAndDropElement.prototype, "onDragStart", null);
@@ -34625,12 +34691,17 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_1__.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;
         }
@@ -44033,13 +44104,14 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* unused harmony export select */
-/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(65478);
-/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2748);
-/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(580);
-/* harmony import */ var _core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(87058);
-/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(50911);
-/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(67510);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(67215);
+/* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82758);
+/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65478);
+/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2748);
+/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
+/* harmony import */ var _core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(87058);
+/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50911);
+/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(67510);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(67215);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -44057,6 +44129,7 @@ _config_js__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
  *
@@ -44067,7 +44140,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
  *   console.log(img.src);
  * })
  * ```
- */ class select extends _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plugin {
+ */ class select extends _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__.Plugin {
     afterInit(jodit) {
         this.proxyEventsList.forEach((eventName)=>{
             jodit.e.on(eventName + '.select', this.onStartSelection);
@@ -44082,7 +44155,7 @@ _config_js__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,_core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_3__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
+            result = j.e.fire((0,_core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_4__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
             target = target.parentElement;
         }
         if (e.type === 'click' && result === undefined && target === j.editor) {
@@ -44093,10 +44166,10 @@ _config_js__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 (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.up(node, (elm)=>elm === this.j.editor)) {
+        if (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.up(node, (elm)=>elm === this.j.editor)) {
             return;
         }
-        const box = _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__.UIElement.closestElement(node, _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__.Popup);
+        const box = _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__.UIElement.closestElement(node, _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__.Popup);
         if (!box) {
             this.j.e.fire('outsideClick', e);
         }
@@ -44105,7 +44178,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         const { s } = this.j;
         if (!s.isCollapsed()) {
             const current = s.current();
-            if (current && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(this.j.editor, current)) {
+            if (current && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isOrContains(this.j.editor, current)) {
                 this.onCopyNormalizeSelectionBound();
             }
         }
@@ -44117,6 +44190,60 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         s.expandSelection();
         return false;
     }
+    /**
+     * Fix caret position when clicking to the right of a list item that has a
+     * nested list. Blink/WebKit place the caret at the start of the line instead
+     * of the end (#1296); move it to the end of the item's own text.
+     */ onClickRightOfNestedListItem(e) {
+        const { s } = this.j;
+        const range = s.range;
+        if (!range.collapsed || range.startOffset !== 0 || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.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 (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isTag(li, 'li') || !(li.querySelector('ul') || li.querySelector('ol'))) {
+            return;
+        }
+        const measure = this.j.ed.createRange();
+        measure.selectNodeContents(text);
+        const rect = measure.getBoundingClientRect();
+        // Only when the click happened to the right of the text.
+        if (e.clientX > rect.right) {
+            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 || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.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 (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(marker) || !marker.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isEmpty(marker)) {
+            return;
+        }
+        let inner = marker;
+        // Descend into the innermost empty formatting marker.
+        while(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(inner.firstElementChild) && inner.firstElementChild.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE)){
+            inner = inner.firstElementChild;
+        }
+        s.setCursorIn(inner);
+    }
     /**
      * Normalize selection after triple click
      */ onTripleClickNormalizeSelection(e) {
@@ -44125,8 +44252,8 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         }
         const { s } = this.j;
         const { startContainer, startOffset } = s.range;
-        if (startOffset === 0 && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isText(startContainer)) {
-            s.select(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(startContainer, _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, this.j.editor) || startContainer, true);
+        if (startOffset === 0 && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(startContainer)) {
+            s.select(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.closest(startContainer, _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isBlock, this.j.editor) || startContainer, true);
         }
     }
     onCopyNormalizeSelectionBound(e) {
@@ -44134,7 +44261,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
         if (!o.select.normalizeSelectionBeforeCutAndCopy || s.isCollapsed()) {
             return;
         }
-        if (e && (!e.isTrusted || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isNode(e.target) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(editor, e.target))) {
+        if (e && (!e.isTrusted || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isNode(e.target) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isOrContains(editor, e.target))) {
             return;
         }
         this.jodit.s.expandSelection();
@@ -44151,33 +44278,43 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
     }
 }
 __decorate([
-    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], select.prototype, "onStartSelection", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)('ow:click')
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)('ow:click')
 ], select.prototype, "onOutsideClick", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':beforeCommandCut'
     ])
 ], select.prototype, "beforeCommandCut", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':beforeCommandSelectall'
     ])
 ], select.prototype, "beforeCommandSelectAll", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
+        ':click'
+    ])
+], select.prototype, "onClickRightOfNestedListItem", null);
+__decorate([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
+        ':click'
+    ])
+], select.prototype, "onClickKeepPendingFormat", null);
+__decorate([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':click'
     ])
 ], select.prototype, "onTripleClickNormalizeSelection", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':copy',
         ':cut'
     ])
 ], select.prototype, "onCopyNormalizeSelectionBound", null);
-_core_global_js__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('select', select);
+_core_global_js__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('select', select);
 
 
 /***/ }),