jodit-pro 4.17.7 → 4.17.8

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.17.7
+ * Version: v4.17.8
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -1791,7 +1791,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.17.7";
+ */ const APP_VERSION = "4.17.8";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -10837,6 +10837,12 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 
 
 
+/**
+ * A text node that is empty or holds only invisible caret placeholders.
+ */ function isBlankTextNode(node) {
+    var _a;
+    return _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(node) && ((_a = node.nodeValue) !== null && _a !== void 0 ? _a : '').replace(_constants_js__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP(), '').length === 0;
+}
 class Selection {
     /**
      * Short alias for this.jodit
@@ -11068,6 +11074,7 @@ class Selection {
     /**
      * Create marker element
      */ marker(atStart = false, range) {
+        var _a;
         let newRange = null;
         if (range) {
             newRange = range.cloneRange();
@@ -11084,10 +11091,21 @@ class Selection {
         _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(marker, this.j.createInside.text(_constants_js__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE));
         if (newRange) {
             if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isOrContains(this.area, atStart ? newRange.startContainer : newRange.endContainer)) {
-                // Here need do unsafe inserting
-                // Deny Dom.safeInsertNode(newRange, marker);
-                // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
-                newRange.insertNode(marker);
+                const { startContainer: node, startOffset: offset } = newRange;
+                // At either end of a text node the marker goes beside it. Splitting
+                // the node there would leave the selection's boundary in an empty
+                // text node, and WebKit neither repaints a selection that leaves one
+                // nor moves a selection that follows one when it's removed.
+                if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(node) && offset === 0) {
+                    _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.before(node, marker);
+                } else if (_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(node) && offset === ((_a = node.nodeValue) === null || _a === void 0 ? void 0 : _a.length)) {
+                    _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.after(node, marker);
+                } else {
+                    // Here need do unsafe inserting
+                    // Deny Dom.safeInsertNode(newRange, marker);
+                    // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
+                    newRange.insertNode(marker);
+                }
             }
         }
         return marker;
@@ -11415,7 +11433,9 @@ class Selection {
                     }
                 ].forEach((getChildNode)=>{
                     const childNode = getChildNode();
-                    if (childNode && _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isEmptyTextNode(childNode)) {
+                    // Only a text node left with nothing in it by the split
+                    // goes; one holding a space is content (`<b>a</b> |`).
+                    if (childNode && isBlankTextNode(childNode)) {
                         _dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.safeRemove(childNode);
                     }
                 });
@@ -28922,19 +28942,27 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.history = {
      * Update history stack
      */ updateStack(replace = false) {
         const newValue = this.snapshot.make();
-        if (!_snapshot_js__WEBPACK_IMPORTED_MODULE_4__.Snapshot.equal(newValue, this.startValue)) {
-            const newCommand = new _command_js__WEBPACK_IMPORTED_MODULE_3__.Command(this.startValue, newValue, this, this.updateTick);
-            if (replace) {
-                const command = this.__stack.current();
-                if (command && this.updateTick === command.tick) {
-                    this.__stack.replace(newCommand);
-                }
-            } else {
-                this.__stack.push(newCommand);
-            }
+        if (_snapshot_js__WEBPACK_IMPORTED_MODULE_4__.Snapshot.equal(newValue, this.startValue)) {
+            return;
+        }
+        // Only the selection moved, for example when the selection markers
+        // went in before a switch to the source view. There is nothing to
+        // undo, but the next change has to start from this selection.
+        if (newValue.html === this.startValue.html) {
             this.startValue = newValue;
-            this.fireChangeStack();
+            return;
+        }
+        const newCommand = new _command_js__WEBPACK_IMPORTED_MODULE_3__.Command(this.startValue, newValue, this, this.updateTick);
+        if (replace) {
+            const command = this.__stack.current();
+            if (command && this.updateTick === command.tick) {
+                this.__stack.replace(newCommand);
+            }
+        } else {
+            this.__stack.push(newCommand);
         }
+        this.startValue = newValue;
+        this.fireChangeStack();
     }
     fireChangeStack() {
         var _a;
@@ -44102,7 +44130,7 @@ class lineHeight extends _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plug
         try {
             if (s.isCollapsed()) {
                 const fake = c.fake();
-                s.insertNode(fake, false, false);
+                _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeInsertNode(s.range, fake);
                 apply(fake);
                 _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(fake);
             } else {
@@ -46164,7 +46192,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.useInputsPlaceholder =
                 this.placeholderElm.innerHTML = (0,_core_helpers_utils_attr_js__WEBPACK_IMPORTED_MODULE_5__.attr)(editor.element, 'placeholder') || '';
             }
             editor.e.fire('placeholder', this.placeholderElm.innerHTML);
-            editor.e.off('.placeholder').on('changePlace.placeholder', this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder', this.toggle).on(window, 'load', this.toggle);
+            editor.e.off('.placeholder').on('changePlace.placeholder', this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder afterCommand.placeholder', this.toggle).on(window, 'load', this.toggle);
             this.addNativeListeners();
             this.toggle();
         };
@@ -49382,18 +49410,26 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 /* harmony export */   AceEditor: function() { return /* binding */ AceEditor; }
 /* harmony export */ });
 /* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82758);
-/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2748);
-/* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21537);
-/* harmony import */ var _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23370);
+/* harmony import */ var _core_decorators_autobind_autobind_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(45219);
+/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2748);
+/* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21537);
+/* harmony import */ var _sourceEditor_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23370);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * 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
- */ 
+ */ var __decorate = undefined && undefined.__decorate || function(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) 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;
+};
 
 
 
-class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEditor {
+
+
+class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_4__.SourceEditor {
     aceExists() {
         return this.j.ow.ace !== undefined;
     }
@@ -49451,7 +49487,7 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
                 return;
             }
             const fakeMirror = this.j.c.div('jodit-source__mirror-fake');
-            _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.append(this.container, fakeMirror);
+            _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.append(this.container, fakeMirror);
             const ace = editor.ow.ace;
             this.instance = ace.edit(fakeMirror);
             if (editor.o.direction === 'rtl') {
@@ -49472,7 +49508,7 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
             this.instance.setOption('wrap', editor.o.sourceEditorNativeOptions.wrap);
             this.instance.getSession().setUseWorker(false);
             this.instance.$blockScrolling = Infinity;
-            this.instance.on('change', this.toWYSIWYG);
+            this.instance.on('change', this.__onChange);
             this.instance.on('focus', this.proxyOnFocus);
             this.instance.on('mousedown', this.proxyOnMouseDown);
             this.instance.on('blur', this.proxyOnBlur);
@@ -49507,7 +49543,7 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
             if (!this.aceExists()) {
                 if (!loading) {
                     loading = true;
-                    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(()=>null);
+                    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(()=>null);
                 }
                 return;
             }
@@ -49520,7 +49556,7 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
     }
     destruct() {
         var _a, _b;
-        this.instance.off('change', this.toWYSIWYG);
+        this.instance.off('change', this.__onChange);
         this.instance.off('focus', this.proxyOnFocus);
         this.instance.off('mousedown', this.proxyOnMouseDown);
         this.instance.destroy();
@@ -49529,13 +49565,29 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
     setValue(value) {
         if (!this.j.o.editHTMLDocumentMode && this.j.o.beautifyHTML) {
             const html = this.j.e.fire('beautifyHTML', value);
-            if ((0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_2__.isString)(html)) {
+            if ((0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.isString)(html)) {
                 value = html;
             }
         }
-        this.instance.setValue(value);
+        // ACE reports its own `setValue` as two changes, the removal of the
+        // old text and the insertion of the new one. Fed back into the
+        // editor they became two history entries, `content -> ''` and
+        // `'' -> content`, so the first undo after a switch to the source
+        // view and back emptied the editor. The text came from the editor
+        // in the first place, so there is nothing to send back.
+        this.__settingValue = true;
+        try {
+            this.instance.setValue(value);
+        } finally{
+            this.__settingValue = false;
+        }
         this.instance.clearSelection();
     }
+    __onChange() {
+        if (!this.__settingValue) {
+            this.toWYSIWYG();
+        }
+    }
     getValue() {
         return this.instance.getValue();
     }
@@ -49614,8 +49666,12 @@ class AceEditor extends _sourceEditor_js__WEBPACK_IMPORTED_MODULE_3__.SourceEdit
         this.proxyOnMouseDown = (e)=>{
             this.j.e.fire('mousedown', e);
         };
+        this.__settingValue = false;
     }
 }
+__decorate([
+    _core_decorators_autobind_autobind_js__WEBPACK_IMPORTED_MODULE_1__.autobind
+], AceEditor.prototype, "__onChange", null);
 
 
 /***/ }),