jodit-pro 2.0.0-beta.18 → 2.0.0-beta.21

package/es2021.en/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v2.0.0-beta.18
+ * Version: v2.0.0-beta.21
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2269,7 +2269,7 @@ __webpack_require__.r(__webpack_exports__);
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2023 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-const APP_VERSION = "2.0.0-beta.18";
+const APP_VERSION = "2.0.0-beta.21";
 // eslint-disable-next-line prettier/prettier
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -3848,8 +3848,15 @@ class Dom {
     static safeInsertNode(range, node) {
         range.collapsed || range.deleteContents();
         const child = Dom.isFragment(node) ? node.lastChild : node;
-        range.insertNode(node);
-        child && range.setStartBefore(child);
+        if (range.startContainer === range.endContainer &&
+            range.collapsed &&
+            Dom.isTag(range.startContainer, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS)) {
+            Dom.after(range.startContainer, node);
+        }
+        else {
+            range.insertNode(node);
+            child && range.setStartBefore(child);
+        }
         range.collapse(true);
         // https://developer.mozilla.org/en-US/docs/Web/API/Range/insertNode
         // if the new node is to be added to a text Node, that Node is split at the
@@ -9125,25 +9132,29 @@ function reset(key) {
 /**
  * @module helpers/utils
  */
-const inView = (elm, root, doc) => {
+/**
+ * Check if element is in view
+ */
+function inView(elm, root, doc) {
     let rect = elm.getBoundingClientRect(), el = elm;
     const top = rect.top, height = rect.height;
-    do {
-        if (el && el.parentNode) {
-            el = el.parentNode;
-            rect = el.getBoundingClientRect();
-            if (!(top <= rect.bottom)) {
-                return false;
-            }
-            // Check if the element is out of view due to a container scrolling
-            if (top + height <= rect.top) {
-                return false;
-            }
+    while (el && el !== root && el.parentNode) {
+        el = el.parentNode;
+        rect = el.getBoundingClientRect();
+        if (!(top <= rect.bottom)) {
+            return false;
         }
-    } while (el && el !== root && el.parentNode);
-    // Check its within the document viewport
+        // Check if the element is out of view due to a container scrolling
+        if (top + height <= rect.top) {
+            return false;
+        }
+    }
+    // Check it's within the document viewport
     return (top <= ((doc.documentElement && doc.documentElement.clientHeight) || 0));
-};
+}
+/**
+ * Scroll element into view if it is not in view
+ */
 function scrollIntoViewIfNeeded(elm, root, doc) {
     if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom.isHTMLElement */ .i.isHTMLElement(elm) && !inView(elm, root, doc)) {
         if (root.clientHeight !== root.scrollHeight) {
@@ -10669,14 +10680,14 @@ class Selection {
         const left = range.cloneRange();
         left.collapse(true);
         const fakeLeft = this.j.createInside.fake();
-        left.insertNode(fakeLeft);
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.safeInsertNode */ .i.safeInsertNode(left, fakeLeft);
         range.setStartBefore(fakeLeft);
         const result = [fakeLeft];
         if (!range.collapsed) {
             const right = range.cloneRange();
             right.collapse(false);
             const fakeRight = this.j.createInside.fake();
-            right.insertNode(fakeRight);
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.safeInsertNode */ .i.safeInsertNode(right, fakeRight);
             range.setEndAfter(fakeRight);
             result.push(fakeRight);
         }
@@ -10900,13 +10911,7 @@ class Selection {
             if (sel && sel.rangeCount) {
                 const range = sel.getRangeAt(0);
                 if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.isOrContains */ .i.isOrContains(this.area, range.commonAncestorContainer)) {
-                    if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.isTag */ .i.isTag(range.startContainer, jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSEPARABLE_TAGS) &&
-                        range.collapsed) {
-                        range.startContainer.parentNode?.insertBefore(node, range.startContainer);
-                    }
-                    else {
-                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.safeInsertNode */ .i.safeInsertNode(range, node);
-                    }
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.safeInsertNode */ .i.safeInsertNode(range, node);
                 }
                 else {
                     this.area.appendChild(node);
@@ -10915,14 +10920,26 @@ class Selection {
             else {
                 this.area.appendChild(node);
             }
+            const setCursor = (node) => {
+                if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.isBlock */ .i.isBlock(node)) {
+                    const child = node.lastChild;
+                    if (child) {
+                        return setCursor(child);
+                    }
+                }
+                this.setCursorAfter(node);
+            };
             if (insertCursorAfter) {
                 if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.isFragment */ .i.isFragment(node)) {
-                    child && this.setCursorAfter(child);
+                    child && setCursor(child);
                 }
                 else {
-                    this.setCursorAfter(node);
+                    setCursor(node);
                 }
             }
+            if (this.j.o.scrollToPastedContent) {
+                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_2__.scrollIntoViewIfNeeded)(child ?? node, this.j.editor, this.doc);
+            }
         });
         if (fireChange && this.j.events) {
             this.j.__imdSynchronizeValues();
@@ -15642,6 +15659,13 @@ Icon.__cache = new Map();
 
 
 
+const EVENTS_FOR_AUTOCLOSE = [
+    'escape',
+    'cut',
+    'delete',
+    'backSpaceAfterDelete',
+    'beforeCommandDelete'
+];
 class Popup extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_3__/* .UIElement */ .u {
     /** @override */
     className() {
@@ -15880,7 +15904,7 @@ class Popup extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_3__/* .UIElem
         jodit_core_global__WEBPACK_IMPORTED_MODULE_6__/* .eventEmitter.on */ .TB.on('closeAllPopups', this.close);
         if (this.smart) {
             this.j.e
-                .on('escape', this.close)
+                .on(EVENTS_FOR_AUTOCLOSE, this.close)
                 .on('mousedown touchstart', this.closeOnOutsideClick)
                 .on(ow, 'mousedown touchstart', this.closeOnOutsideClick);
         }
@@ -15899,7 +15923,7 @@ class Popup extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_3__/* .UIElem
         jodit_core_global__WEBPACK_IMPORTED_MODULE_6__/* .eventEmitter.off */ .TB.off('closeAllPopups', this.close);
         if (this.smart) {
             this.j.e
-                .off('escape', this.close)
+                .off(EVENTS_FOR_AUTOCLOSE, this.close)
                 .off('mousedown touchstart', this.closeOnOutsideClick)
                 .off(ow, 'mousedown touchstart', this.closeOnOutsideClick);
         }
@@ -17089,7 +17113,10 @@ let Jodit = Jodit_1 = class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE
          * })
          * ```
          */
-        result = this.e.fire('beforeCommand', command, showUI, value, ...args);
+        result = this.e.fire(`beforeCommand${(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.ucfirst)(command)}`, showUI, value, ...args);
+        if (result !== false) {
+            result = this.e.fire('beforeCommand', command, showUI, value, ...args);
+        }
         if (result !== false) {
             result = this.__execCustomCommands(command, showUI, value, ...args);
         }
@@ -32029,7 +32056,7 @@ class inlinePopup extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_0__/* .Plug
      * Hide opened popup
      */
     hidePopup(type) {
-        if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.isString)(type) || type === this.type) {
+        if (this.popup.isOpened && (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.isString)(type) || type === this.type)) {
             this.popup.close();
         }
     }
@@ -32192,7 +32219,7 @@ inlinePopup.requires = ['select'];
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_6__.wait)((ctx) => !ctx.j.isLocked)
 ], inlinePopup.prototype, "showPopup", null);
 (0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .gn)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_6__.watch)(':clickEditor'),
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_6__.watch)([':clickEditor', ':beforeCommandDelete', ':backSpaceAfterDelete']),
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_6__.autobind
 ], inlinePopup.prototype, "hidePopup", null);
 (0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .gn)([
@@ -33863,6 +33890,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_5__/* .pluginSystem.add */ .pw.add('p
 
 jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.askBeforePasteHTML = true;
 jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.processPasteHTML = true;
+jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.scrollToPastedContent = true;
 jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.pasteHTMLActionList = [
     { value: jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSERT_AS_HTML, text: 'Keep' },
     { value: jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INSERT_AS_TEXT, text: 'Insert as Text' },
@@ -34164,7 +34192,7 @@ class paste extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_0__/* .Plu
                 text = result;
             }
             if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.isString)(text) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom.isNode */ .i.isNode(text)) {
-                this.insertByType(e, text, this.j.o.defaultActionOnPaste);
+                this.__insertByType(e, text, this.j.o.defaultActionOnPaste);
             }
             e.preventDefault();
             e.stopPropagation();
@@ -34174,35 +34202,35 @@ class paste extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_0__/* .Plu
      * Process usual HTML text fragment
      */
     processHTML(e, html) {
-        if (this.j.o.askBeforePasteHTML) {
-            if (this.j.o.memorizeChoiceWhenPasteFragment) {
-                const cached = this.pasteStack.find(cachedItem => cachedItem.html === html);
-                if (cached) {
-                    this.insertByType(e, html, cached.action || this.j.o.defaultActionOnPaste);
-                    return true;
-                }
-            }
-            if (this._isDialogOpened) {
+        if (!this.j.o.askBeforePasteHTML) {
+            return false;
+        }
+        if (this.j.o.memorizeChoiceWhenPasteFragment) {
+            const cached = this.pasteStack.find(cachedItem => cachedItem.html === html);
+            if (cached) {
+                this.__insertByType(e, html, cached.action || this.j.o.defaultActionOnPaste);
                 return true;
             }
-            const dialog = (0,_helpers__WEBPACK_IMPORTED_MODULE_6__/* .askInsertTypeDialog */ .$t)(this.j, 'Your code is similar to HTML. Keep as HTML?', 'Paste as HTML', insertType => {
-                this._isDialogOpened = false;
-                this.insertByType(e, html, insertType);
-            }, this.j.o.pasteHTMLActionList);
-            if (dialog) {
-                this._isDialogOpened = true;
-                dialog.e.on('beforeClose', () => {
-                    this._isDialogOpened = false;
-                });
-            }
+        }
+        if (this._isDialogOpened) {
             return true;
         }
-        return false;
+        const dialog = (0,_helpers__WEBPACK_IMPORTED_MODULE_6__/* .askInsertTypeDialog */ .$t)(this.j, 'Your code is similar to HTML. Keep as HTML?', 'Paste as HTML', insertType => {
+            this._isDialogOpened = false;
+            this.__insertByType(e, html, insertType);
+        }, this.j.o.pasteHTMLActionList);
+        if (dialog) {
+            this._isDialogOpened = true;
+            dialog.e.on('beforeClose', () => {
+                this._isDialogOpened = false;
+            });
+        }
+        return true;
     }
     /**
      * Insert HTML by option type
      */
-    insertByType(e, html, action) {
+    __insertByType(e, html, action) {
         this.pasteStack.push({ html, action });
         if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_4__.isString)(html)) {
             this.j.buffer.set(jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.CLIPBOARD_ID, html);