jodit 4.2.39 → 4.2.40

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.2.39
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1736,7 +1736,7 @@ __webpack_require__.r(__webpack_exports__);
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-const APP_VERSION = "4.2.39";
+const APP_VERSION = "4.2.40";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -13410,6 +13410,7 @@ const JODIT_EVENTS_ON_HIDE = [
     'changePlace.tooltip',
     'afterOpenPopup.tooltip',
     'hidePopup.tooltip',
+    'beforePopupClose.tooltip',
     'closeAllPopups.tooltip'
 ];
 let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_5__/* .UIElement */ .D {
@@ -13422,6 +13423,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
     constructor(view) {
         super(view);
         this.__isOpened = false;
+        this.__attachedContainers = new Set();
         this.__listenClose = false;
         this.__currentTarget = null;
         this.__delayShowTimeout = 0;
@@ -13440,7 +13442,16 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
     __onAttach(container) {
         // TODO Move it inside __show method. Now it is here because testcase failed with capturing
         (0,jodit_core_global__WEBPACK_IMPORTED_MODULE_3__/* .getContainer */ .My)(this.j, UITooltip_1).appendChild(this.container);
-        this.j.e.on(container, 'mouseenter.tooltip', this.__onMouseEnter, {
+        this.__attachedContainers.add(container);
+        this.__attachedContainers.add(this.j.container);
+        this.j.e
+            .on(container, 'mouseenter.tooltip', this.__onMouseEnter, {
+            capture: true
+        })
+            .on(container, 'mouseleave.tooltip', this.__onMouseLeave, {
+            capture: true
+        })
+            .on(this.j.container, 'mouseleave.tooltip', this.__onMouseLeave, {
             capture: true
         });
     }
@@ -13452,10 +13463,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
         const view = this.j;
         view.e
             .on(view.ow, WINDOW_EVENTS_ON_HIDE, this.__hide)
-            .on(JODIT_EVENTS_ON_HIDE, this.__hide)
-            .on(view.container, 'mouseleave.tooltip', this.__onMouseLeave, {
-            capture: true
-        });
+            .on(JODIT_EVENTS_ON_HIDE, this.__hide);
     }
     __removeListenersOnLeave() {
         if (!this.__listenClose) {
@@ -13465,8 +13473,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
         const view = this.j;
         view.e
             .off(view.ow, WINDOW_EVENTS_ON_HIDE, this.__hide)
-            .off(JODIT_EVENTS_ON_HIDE, this.__hide)
-            .off(view.container, 'mouseleave.tooltip', this.__onMouseLeave);
+            .off(JODIT_EVENTS_ON_HIDE, this.__hide);
     }
     __onMouseLeave(e) {
         if (this.__currentTarget === e.target) {
@@ -13543,7 +13550,11 @@ let UITooltip = UITooltip_1 = class UITooltip extends jodit_core_ui_element__WEB
         this.__hideTimeout = this.async.setTimeout(this.__hide, this.j.defaultTimeout);
     }
     destruct() {
-        this.j.e.off(this.j.container, 'mouseenter.tooltip', this.__onMouseEnter);
+        this.__attachedContainers.forEach(container => {
+            this.j.e
+                .off(container, 'mouseenter.tooltip', this.__onMouseEnter)
+                .off(container, 'mouseleave.tooltip', this.__onMouseLeave);
+        });
         this.__hide();
         super.destruct();
     }
@@ -15762,17 +15773,18 @@ class ProgressBar extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_1__/* .
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   T: function() { return /* binding */ ViewWithToolbar; }
 /* harmony export */ });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(31635);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_component_statuses__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(64567);
-/* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(26318);
+/* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(26318);
 /* harmony import */ var jodit_core_decorators_watch_watch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66927);
 /* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(55186);
 /* harmony import */ var jodit_core_helpers_array__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32709);
-/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(98253);
+/* harmony import */ var jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(98253);
 /* harmony import */ var jodit_core_helpers_utils_selector__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(58720);
-/* harmony import */ var jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(39611);
-/* harmony import */ var jodit_core_view_view__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(77782);
-/* harmony import */ var jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(8809);
+/* harmony import */ var jodit_core_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53048);
+/* harmony import */ var jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39611);
+/* harmony import */ var jodit_core_view_view__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(77782);
+/* harmony import */ var jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8809);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -15790,13 +15802,14 @@ class ProgressBar extends jodit_core_ui_element__WEBPACK_IMPORTED_MODULE_1__/* .
 
 
 
-class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_5__/* .View */ .S {
+
+class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_6__/* .View */ .S {
     /**
      * Container for toolbar
      */
     get toolbarContainer() {
         if (!this.o.fullsize &&
-            ((0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_7__/* .isString */ .K)(this.o.toolbar) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isHTMLElement(this.o.toolbar))) {
+            ((0,jodit_core_helpers_checker_is_string__WEBPACK_IMPORTED_MODULE_8__/* .isString */ .K)(this.o.toolbar) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isHTMLElement(this.o.toolbar))) {
             return (0,jodit_core_helpers_utils_selector__WEBPACK_IMPORTED_MODULE_4__/* .resolveElement */ .tI)(this.o.toolbar, this.o.shadowRoot || this.od);
         }
         this.o.toolbar &&
@@ -15868,7 +15881,7 @@ class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_5__/
     beforeToolbarBuild(items) {
         if (Object.keys(this.groupToButtons).length) {
             return items.map(item => {
-                if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_8__/* .isButtonGroup */ .i)(item) &&
+                if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_9__/* .isButtonGroup */ .i)(item) &&
                     item.group &&
                     this.groupToButtons[item.group]) {
                     return {
@@ -15886,11 +15899,12 @@ class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_5__/
     /** @override **/
     constructor(options, isJodit = false) {
         super(options, isJodit);
-        this.toolbar = (0,jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_6__/* .makeCollection */ .$K)(this);
+        this.toolbar = (0,jodit_modules_toolbar_factory__WEBPACK_IMPORTED_MODULE_7__/* .makeCollection */ .$K)(this);
         this.__defaultToolbarContainer = this.c.div('jodit-toolbar__box');
         this.registeredButtons = new Set();
         this.groupToButtons = {};
         this.isJodit = false;
+        this.__tooltip = new jodit_core_ui__WEBPACK_IMPORTED_MODULE_5__/* .UITooltip */ .SB(this);
         this.isJodit = isJodit;
         this.e.on('beforeToolbarBuild', this.beforeToolbarBuild);
     }
@@ -15900,17 +15914,18 @@ class ViewWithToolbar extends jodit_core_view_view__WEBPACK_IMPORTED_MODULE_5__/
         }
         this.setStatus(jodit_core_component_statuses__WEBPACK_IMPORTED_MODULE_0__/* .STATUSES */ .f.beforeDestruct);
         this.e.off('beforeToolbarBuild', this.beforeToolbarBuild);
+        this.__tooltip.destruct();
         this.toolbar.destruct();
         // @ts-ignore After destruct, we are not responsible for anything
         this.toolbar = undefined;
         super.destruct();
     }
 }
-(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
+(0,tslib__WEBPACK_IMPORTED_MODULE_10__/* .__decorate */ .Cg)([
     (0,jodit_core_decorators_watch_watch__WEBPACK_IMPORTED_MODULE_1__/* .watch */ .w)(':rebuildToolbar')
 ], ViewWithToolbar.prototype, "buildToolbar", null);
-(0,tslib__WEBPACK_IMPORTED_MODULE_9__/* .__decorate */ .Cg)([
-    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Ay
+(0,tslib__WEBPACK_IMPORTED_MODULE_10__/* .__decorate */ .Cg)([
+    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Ay
 ], ViewWithToolbar.prototype, "beforeToolbarBuild", null);
 
 
@@ -23598,7 +23613,6 @@ let ToolbarCollection = class ToolbarCollection extends jodit_core_ui__WEBPACK_I
         super(jodit);
         this.__listenEvents = 'updatePlugins updateToolbar changeStack mousedown mouseup keydown change afterInit readonly afterResize ' +
             'selectionchange changeSelection focus afterSetMode touchstart focus blur';
-        this.__tooltip = new jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__/* .UITooltip */ .SB(this.jodit);
     }
     __initEvents() {
         this.j.e
@@ -23628,8 +23642,6 @@ let ToolbarCollection = class ToolbarCollection extends jodit_core_ui__WEBPACK_I
         if (this.isDestructed) {
             return;
         }
-        this.__tooltip?.destruct();
-        this.__tooltip = null;
         this.j.e
             .off(this.__listenEvents, this.update)
             .off('afterSetMode focus', this.__immediateUpdate);
@@ -29606,9 +29618,11 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_3__/* .pluginSystem */ .fg.add('enter
  */
 function checkBR(fake, jodit, shiftKeyPressed) {
     const isMultiLineBlock = Boolean(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.closest(fake, ['pre', 'blockquote'], jodit.editor));
+    const isCell = !isMultiLineBlock && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.closest(fake, ['td', 'th'], jodit.editor);
     const isBRMode = jodit.o.enter.toLowerCase() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.BR.toLowerCase();
     // if you use <br> defaultTag for break line or when was entered SHIFt key or in <td> or <th> or <blockquote>
     if (isBRMode ||
+        isCell ||
         (shiftKeyPressed && !isMultiLineBlock) ||
         (!shiftKeyPressed && isMultiLineBlock)) {
         // 2 BR before
@@ -33085,6 +33099,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_2__/* .pluginSystem */ .fg.add('inden
 
 
 
+// import 'jodit/plugins/debug/debug';
 
 
 
@@ -33714,10 +33729,10 @@ class inlinePopup extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plug
         if (!this.j.o.toolbarInlineForSelection) {
             return;
         }
-        const type = 'selection', sel = this.j.s.sel, range = this.j.s.range;
-        if (sel?.isCollapsed ||
-            this.isSelectedTarget(range) ||
-            this.tableModule.getAllSelectedCells().length) {
+        const type = 'selection';
+        const sel = this.j.s.sel;
+        const range = this.j.s.range;
+        if (sel?.isCollapsed || this.isSelectedTarget(range)) {
             if (this.type === type && this.popup.isOpened) {
                 this.hidePopup();
             }
@@ -33742,9 +33757,9 @@ class inlinePopup extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plug
     /**
      * Shortcut for Table module
      */
-    get tableModule() {
-        return this.j.getInstance('Table', this.j.o);
-    }
+    // private get tableModule(): Table {
+    // 	return this.j.getInstance<Table>('Table', this.j.o);
+    // }
     /** @override **/
     beforeDestruct(jodit) {
         jodit.e