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

package/es5/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
  */
@@ -7598,7 +7598,7 @@ __webpack_require__.r(__webpack_exports__);
  * Copyright (c) 2013-2023 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-var APP_VERSION = "2.0.0-beta.18";
+var APP_VERSION = "2.0.0-beta.21";
 // eslint-disable-next-line prettier/prettier
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -9361,8 +9361,15 @@ var Dom = /** @class */ (function () {
     Dom.safeInsertNode = function (range, node) {
         range.collapsed || range.deleteContents();
         var 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
@@ -14863,25 +14870,29 @@ function reset(key) {
 /**
  * @module helpers/utils
  */
-var inView = function (elm, root, doc) {
+/**
+ * Check if element is in view
+ */
+function inView(elm, root, doc) {
     var rect = elm.getBoundingClientRect(), el = elm;
     var 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) {
@@ -16533,14 +16544,14 @@ var Selection = /** @class */ (function () {
         var left = range.cloneRange();
         left.collapse(true);
         var 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);
         var result = [fakeLeft];
         if (!range.collapsed) {
             var right = range.cloneRange();
             right.collapse(false);
             var 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);
         }
@@ -16778,7 +16789,6 @@ var Selection = /** @class */ (function () {
         }
         var sel = this.sel;
         this.j.history.snapshot.transaction(function () {
-            var _a;
             if (!_this.isCollapsed()) {
                 _this.j.execCommand('Delete');
             }
@@ -16786,13 +16796,7 @@ var Selection = /** @class */ (function () {
             if (sel && sel.rangeCount) {
                 var 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) {
-                        (_a = range.startContainer.parentNode) === null || _a === void 0 ? void 0 : _a.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);
@@ -16801,14 +16805,26 @@ var Selection = /** @class */ (function () {
             else {
                 _this.area.appendChild(node);
             }
+            var setCursor = function (node) {
+                if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom.isBlock */ .i.isBlock(node)) {
+                    var child_1 = node.lastChild;
+                    if (child_1) {
+                        return setCursor(child_1);
+                    }
+                }
+                _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 !== null && child !== void 0 ? child : node, _this.j.editor, _this.doc);
+            }
         });
         if (fireChange && this.j.events) {
             this.j.__imdSynchronizeValues();
@@ -21808,6 +21824,13 @@ var Icon = /** @class */ (function () {
 
 
 
+var EVENTS_FOR_AUTOCLOSE = [
+    'escape',
+    'cut',
+    'delete',
+    'backSpaceAfterDelete',
+    'beforeCommandDelete'
+];
 var Popup = /** @class */ (function (_super) {
     (0,tslib__WEBPACK_IMPORTED_MODULE_7__/* .__extends */ .ZT)(Popup, _super);
     function Popup(jodit, smart) {
@@ -22076,7 +22099,7 @@ var Popup = /** @class */ (function (_super) {
         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);
         }
@@ -22096,7 +22119,7 @@ var Popup = /** @class */ (function (_super) {
         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);
         }
@@ -23516,7 +23539,7 @@ var Jodit = /** @class */ (function (_super) {
      * ```
      */
     Jodit.prototype.execCommand = function (command, showUI, value) {
-        var _a;
+        var _a, _b;
         var args = [];
         for (var _i = 3; _i < arguments.length; _i++) {
             args[_i - 3] = arguments[_i];
@@ -23548,7 +23571,14 @@ var Jodit = /** @class */ (function (_super) {
          * })
          * ```
          */
-        result = (_a = this.e).fire.apply(_a, (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__spreadArray */ .ev)(['beforeCommand', command, showUI, value], (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__read */ .CR)(args), false));
+        result = (_a = this.e).fire.apply(_a, (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__spreadArray */ .ev)(["beforeCommand".concat((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.ucfirst)(command)), showUI,
+            value], (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__read */ .CR)(args), false));
+        if (result !== false) {
+            result = (_b = this.e).fire.apply(_b, (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__spreadArray */ .ev)(['beforeCommand',
+                command,
+                showUI,
+                value], (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__read */ .CR)(args), false));
+        }
         if (result !== false) {
             result = this.__execCustomCommands.apply(this, (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__spreadArray */ .ev)([command, showUI, value], (0,tslib__WEBPACK_IMPORTED_MODULE_8__/* .__read */ .CR)(args), false));
         }
@@ -39245,7 +39275,7 @@ var inlinePopup = /** @class */ (function (_super) {
      * Hide opened popup
      */
     inlinePopup.prototype.hidePopup = function (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();
         }
     };
@@ -39415,7 +39445,7 @@ var inlinePopup = /** @class */ (function (_super) {
         (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_6__.wait)(function (ctx) { return !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)([
@@ -41523,6 +41553,7 @@ var _a;
 
 jodit_config__WEBPACK_IMPORTED_MODULE_1__/* .Config.prototype.askBeforePasteHTML */ .D.prototype.askBeforePasteHTML = true;
 jodit_config__WEBPACK_IMPORTED_MODULE_1__/* .Config.prototype.processPasteHTML */ .D.prototype.processPasteHTML = true;
+jodit_config__WEBPACK_IMPORTED_MODULE_1__/* .Config.prototype.scrollToPastedContent */ .D.prototype.scrollToPastedContent = true;
 jodit_config__WEBPACK_IMPORTED_MODULE_1__/* .Config.prototype.pasteHTMLActionList */ .D.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' },
@@ -41862,7 +41893,7 @@ var paste = /** @class */ (function (_super) {
                 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();
@@ -41873,35 +41904,35 @@ var paste = /** @class */ (function (_super) {
      */
     paste.prototype.processHTML = function (e, html) {
         var _this = this;
-        if (this.j.o.askBeforePasteHTML) {
-            if (this.j.o.memorizeChoiceWhenPasteFragment) {
-                var cached = this.pasteStack.find(function (cachedItem) { return 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) {
+            var cached = this.pasteStack.find(function (cachedItem) { return cachedItem.html === html; });
+            if (cached) {
+                this.__insertByType(e, html, cached.action || this.j.o.defaultActionOnPaste);
                 return true;
             }
-            var dialog = (0,_helpers__WEBPACK_IMPORTED_MODULE_6__/* .askInsertTypeDialog */ .$t)(this.j, 'Your code is similar to HTML. Keep as HTML?', 'Paste as HTML', function (insertType) {
-                _this._isDialogOpened = false;
-                _this.insertByType(e, html, insertType);
-            }, this.j.o.pasteHTMLActionList);
-            if (dialog) {
-                this._isDialogOpened = true;
-                dialog.e.on('beforeClose', function () {
-                    _this._isDialogOpened = false;
-                });
-            }
+        }
+        if (this._isDialogOpened) {
             return true;
         }
-        return false;
+        var dialog = (0,_helpers__WEBPACK_IMPORTED_MODULE_6__/* .askInsertTypeDialog */ .$t)(this.j, 'Your code is similar to HTML. Keep as HTML?', 'Paste as HTML', function (insertType) {
+            _this._isDialogOpened = false;
+            _this.__insertByType(e, html, insertType);
+        }, this.j.o.pasteHTMLActionList);
+        if (dialog) {
+            this._isDialogOpened = true;
+            dialog.e.on('beforeClose', function () {
+                _this._isDialogOpened = false;
+            });
+        }
+        return true;
     };
     /**
      * Insert HTML by option type
      */
-    paste.prototype.insertByType = function (e, html, action) {
+    paste.prototype.__insertByType = function (e, html, action) {
         this.pasteStack.push({ html: html, action: 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);

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * 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
  */
 	/*!
  * 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
  */