jodit 4.17.5 → 4.17.6

package/es2021/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.17.5
+ * Version: v4.17.6
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1799,7 +1799,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.17.5";
+ */ const APP_VERSION = "4.17.6";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -10845,6 +10845,11 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 
 
 
+/**
+ * A text node that is empty or holds only invisible caret placeholders.
+ */ function isBlankTextNode(node) {
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(node) && (node.nodeValue ?? '').replace(jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INVISIBLE_SPACE_REG_EXP(), '').length === 0;
+}
 class Selection {
     /**
 	 * Short alias for this.jodit
@@ -11089,10 +11094,21 @@ class Selection {
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.append(marker, this.j.createInside.text(jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INVISIBLE_SPACE));
         if (newRange) {
             if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.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 (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(node) && offset === 0) {
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.before(node, marker);
+                } else if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(node) && offset === node.nodeValue?.length) {
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.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;
@@ -11414,7 +11430,9 @@ class Selection {
                     ()=>firstChild?.previousSibling?.lastChild
                 ].forEach((getChildNode)=>{
                     const childNode = getChildNode();
-                    if (childNode && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.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)) {
                         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.safeRemove(childNode);
                     }
                 });
@@ -22318,19 +22336,27 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.history = {
 	 * Update history stack
 	 */ updateStack(replace = false) {
         const newValue = this.snapshot.make();
-        if (!_snapshot__WEBPACK_IMPORTED_MODULE_6__.Snapshot.equal(newValue, this.startValue)) {
-            const newCommand = new _command__WEBPACK_IMPORTED_MODULE_5__.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__WEBPACK_IMPORTED_MODULE_6__.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__WEBPACK_IMPORTED_MODULE_5__.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() {
         this.j && !this.j.isInDestruct && this.j.events?.fire('changeStack');
@@ -37099,7 +37125,7 @@ class lineHeight extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugin {
         try {
             if (s.isCollapsed()) {
                 const fake = c.fake();
-                s.insertNode(fake, false, false);
+                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeInsertNode(s.range, fake);
                 apply(fake);
                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.safeRemove(fake);
             } else {
@@ -39122,7 +39148,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.useInputsPlaceholder
                 this.placeholderElm.innerHTML = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_7__.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();
         });
@@ -42267,10 +42293,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 /* harmony export */   AceEditor: function() { return /* binding */ AceEditor; }
 /* harmony export */ });
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25045);
-/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(81937);
-/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23211);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(65946);
-/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(94193);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49574);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(65946);
+/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(94193);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -42282,7 +42310,9 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 
 
 
-class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_4__.SourceEditor {
+
+
+class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_6__.SourceEditor {
     aceExists() {
         return this.j.ow.ace !== undefined;
     }
@@ -42340,7 +42370,7 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
                 return;
             }
             const fakeMirror = this.j.c.div('jodit-source__mirror-fake');
-            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__.Dom.append(this.container, fakeMirror);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.append(this.container, fakeMirror);
             const ace = editor.ow.ace;
             this.instance = ace.edit(fakeMirror);
             if (editor.o.direction === 'rtl') {
@@ -42361,15 +42391,15 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
             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);
-            if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.MODE_WYSIWYG) {
+            if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.MODE_WYSIWYG) {
                 this.setValue(this.getValue());
             }
             const onResize = this.j.async.throttle(()=>{
-                if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.MODE_WYSIWYG) {
+                if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.MODE_WYSIWYG) {
                     return;
                 }
                 const hasFocus = this.instance.isFocused();
@@ -42387,7 +42417,7 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
         };
         let loading = false;
         const initAceEditor = ()=>{
-            if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.MODE_SPLIT) {
+            if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.MODE_SPLIT) {
                 return;
             }
             // ACE (~400 KiB from the CDN) is only needed once the source view
@@ -42396,7 +42426,7 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
             if (!this.aceExists()) {
                 if (!loading) {
                     loading = true;
-                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(()=>null);
+                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(()=>null);
                 }
                 return;
             }
@@ -42408,7 +42438,7 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
         initAceEditor();
     }
     destruct() {
-        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();
@@ -42417,13 +42447,29 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
     setValue(value) {
         if (!this.j.o.editHTMLDocumentMode && this.j.o.beautifyHTML) {
             const html = this.j.e.fire('beautifyHTML', value);
-            if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.isString)(html)) {
+            if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.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();
     }
@@ -42497,9 +42543,12 @@ class AceEditor extends jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORT
             this.j.e.fire('focus', e);
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "proxyOnMouseDown", (e)=>{
             this.j.e.fire('mousedown', e);
-        });
+        }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__settingValue", false);
     }
 }
+;(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_3__.autobind
+], AceEditor.prototype, "__onChange", null);
 
 
 /***/ }),