jodit 4.2.38 → 4.2.40

package/es5/plugins/debug/debug.css

@@ -0,0 +1,53 @@
+/*!
+ * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
+ * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
+ * Version: v4.2.40
+ * Url: https://xdsoft.net/jodit/
+ * License(s): MIT
+ */
+	
+.jodit-debug {
+  background: #f6f6f6;
+  position: relative;
+  padding: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: stretch;
+}
+.jodit-debug > * {
+  padding: var(--jd-padding-default);
+}
+.jodit-debug__tree {
+  width: 40%;
+}
+.jodit-debug__tree .jodit-debug__tree-elm-name {
+  color: #052e88;
+}
+.jodit-debug__tree .jodit-debug__tree-element_selected {
+  background: #1e7e34;
+  color: #fff;
+}
+.jodit-debug__tree .jodit-debug__tree-cursor {
+  background: #dc3232;
+  color: #fff;
+}
+.jodit-debug__events {
+  width: 40%;
+  max-height: 500px;
+  overflow: auto;
+  background: #1e7e34;
+  color: #fff;
+}
+.jodit-debug__events span {
+  color: #cacaca;
+  font-size: 0.8em;
+}
+.jodit-debug__events .jodit-debug__events-clear {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 5px;
+  cursor: pointer;
+  color: red;
+}
+

package/es5/plugins/debug/debug.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.38
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -44,49 +44,186 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 var Debug = /** @class */ (function (_super) {
     (0,tslib__WEBPACK_IMPORTED_MODULE_5__/* .__extends */ .C6)(Debug, _super);
     function Debug() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Debug.prototype.afterInit = function (jodit) {
-        var mirror = jodit.create.div();
-        var tree = jodit.create.div();
-        var sel = jodit.create.div();
+        var mirror = jodit.create.div('jodit-debug');
+        var tree = jodit.create.div('jodit-debug__tree');
+        var events = jodit.create.div('jodit-debug__events');
+        var clear = jodit.create.div('jodit-debug__events-clear', ['x']);
+        var sel = jodit.create.div('jodit-debug__sel');
         mirror.appendChild(tree);
+        mirror.appendChild(events);
+        events.appendChild(clear);
         mirror.appendChild(sel);
-        jodit.workplace.appendChild(mirror);
-        Object.assign(mirror.style, {
-            padding: '16px',
-            backgroundColor: '#fcfcfc'
-        });
-        Object.assign(sel.style, {
-            paddingTop: '16px'
+        clear.addEventListener('click', function () {
+            events.innerHTML = '';
+            events.appendChild(clear);
         });
-        jodit.e
-            .on('keydown keyup keypress change afterInit updateDebug', function () {
-            tree.innerHTML = render(jodit.editor);
-        })
-            .on(jodit.od, 'selectionchange', function () {
+        jodit.workplace.appendChild(mirror);
+        var allEvents = [
+            'activate',
+            'afterInit',
+            'beforeactivate',
+            'beforeblur',
+            'beforedeactivate',
+            'beforefocus',
+            'beforeinput',
+            'blur',
+            'change',
+            'click',
+            'compositionend',
+            'compositionstart',
+            'compositionupdate',
+            'contextmenu',
+            'copy',
+            'cut',
+            'dblclick',
+            'deactivate',
+            'focus',
+            'focusin',
+            'focusout',
+            'focusout',
+            'input',
+            'keydown',
+            'keypress',
+            'keyup',
+            'mousedown',
+            'mouseup',
+            'paste',
+            'selectionchange',
+            'selectionstart',
+            'dragstart',
+            'drop',
+            'dragover',
+            'resize touchstart touchend',
+            'updateDebug',
+            'beforeCommand',
+            'afterCommand',
+            'wheel'
+        ];
+        function updateTree() {
             var range = jodit.selection.range;
-            tree.innerHTML = render(jodit.editor);
+            tree.innerHTML = render(jodit.editor, 0, range);
             sel.innerHTML = "start ".concat(range.startContainer.nodeName, " ").concat(range.startOffset, "<br>end ").concat(range.endContainer.nodeName, " ").concat(range.endOffset);
-        });
+        }
+        function onSomeEvent(e) {
+            var event = jodit.e.current;
+            var div = jodit.create.div();
+            div.innerHTML = "<span>".concat(new Date().toLocaleTimeString(), "</span> ").concat(renderEvent(event, e));
+            events.appendChild(div);
+            events.scrollTop = events.scrollHeight;
+            jodit.async.setTimeout(function () {
+                events.children.length > 100 &&
+                    events.removeChild(events.children[0]);
+            }, 100);
+        }
+        function renderEvent(event, e) {
+            var result = [event !== null && event !== void 0 ? event : e.type];
+            switch (event) {
+                case 'beforeCommand':
+                case 'afterCommand':
+                    result.push("<span>".concat(e.toString(), "</span>"));
+                    break;
+                case 'keydown':
+                case 'keyup':
+                case 'keypress':
+                    if (e.shiftKey &&
+                        e.key !== 'Shift') {
+                        result.push('Shift+');
+                    }
+                    if (e.ctrlKey &&
+                        e.key !== 'Control') {
+                        result.push('Ctrl+');
+                    }
+                    if (e.altKey &&
+                        e.key !== 'Alt') {
+                        result.push('Alt');
+                    }
+                    result.push("".concat(e.key));
+                    break;
+            }
+            if (e && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isNode(e.target)) {
+                result.push("<span>".concat(e.target.nodeName, "</span>"));
+            }
+            return result.join(' ');
+        }
+        jodit.e
+            .on('keydown keyup keypress change afterInit updateDebug', updateTree)
+            .on(allEvents, onSomeEvent)
+            .on(jodit.od, 'selectionchange', onSomeEvent)
+            .on(jodit.od, 'selectionchange', updateTree);
     };
     Debug.prototype.beforeDestruct = function (jodit) { };
     return Debug;
 }(jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plugin */ .k));
 
-function renderText(elm) {
+function renderText(elm, range) {
     if (!elm.nodeValue) {
         return "<span style='color:red'>empty</span>";
     }
-    return (0,jodit_core_helpers_html_strip_tags__WEBPACK_IMPORTED_MODULE_3__/* .stripTags */ .K)(elm.nodeValue.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP)(), 'INV'));
+    var value = elm.nodeValue;
+    if (range.collapsed) {
+        if (elm === range.startContainer) {
+            value =
+                value.slice(0, range.startOffset) +
+                    '%CURSOR%' +
+                    value.slice(range.startOffset);
+        }
+    }
+    else {
+        if (elm === range.startContainer && elm === range.endContainer) {
+            value =
+                value.slice(0, range.startOffset) +
+                    '%START-CURSOR%' +
+                    value.slice(range.startOffset, range.endOffset) +
+                    '%END-CURSOR%' +
+                    value.slice(range.endOffset);
+        }
+        else if (elm === range.startContainer) {
+            value =
+                value.slice(0, range.startOffset) +
+                    '%CURSOR%' +
+                    value.slice(range.startOffset);
+        }
+        else if (elm === range.endContainer) {
+            value =
+                value.slice(0, range.endOffset) +
+                    '%CURSOR%' +
+                    value.slice(range.endOffset);
+        }
+    }
+    return (0,jodit_core_helpers_html_strip_tags__WEBPACK_IMPORTED_MODULE_3__/* .stripTags */ .K)(value.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.INVISIBLE_SPACE_REG_EXP)(), 'INV'))
+        .replace(/%CURSOR%/, '<span class="jodit-debug__tree-cursor">|</span>')
+        .replace(/%START-CURSOR%/, '<span class="jodit-debug__tree-cursor">|')
+        .replace(/%END-CURSOR%/, '|</span>');
 }
-function render(elm, level) {
-    if (level === void 0) { level = 0; }
-    return "<div style='padding-left: ".concat(level * 5, "px'>\n\t\t").concat(elm.nodeName, " ").concat(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(elm) ? "- ".concat(renderText(elm)) : '', "\n\t").concat(Array.from(elm.childNodes)
-        .map(function (ch) { return render(ch, level + 1); })
+function render(elm, level, range) {
+    var _a;
+    var isSelected = (_a = window.getSelection()) === null || _a === void 0 ? void 0 : _a.containsNode(elm);
+    var content = [
+        "<span class=\"jodit-debug__tree-elm-name\">".concat(elm.nodeName, "</span>"),
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(elm) ? "- ".concat(renderText(elm, range)) : ''
+    ]
+        .map(function (i) { return i.trim(); })
+        .filter(Boolean);
+    return "<div class=\"".concat(isSelected ? 'jodit-debug__tree-element_selected' : '', "\" style='padding-left: ").concat(level * 5, "px'>\n\t\t").concat(content.join('&nbsp;'), "\n\t").concat(Array.from(elm.childNodes)
+        .map(function (ch, index) {
+        var result = [];
+        if (range.startContainer === elm && index === range.startOffset) {
+            result.push('<span class="jodit-debug__tree-cursor">|</span>');
+        }
+        result.push(render(ch, level + 1, range));
+        if (range.endContainer === elm && index === range.endOffset) {
+            result.push('<span class="jodit-debug__tree-cursor">|</span>');
+        }
+        return result;
+    })
+        .flat()
         .join(''), "\n</div>");
 }
 // pluginSystem.add('debug', Debug);

package/es5/plugins/debug/debug.min.css

@@ -0,0 +1 @@
+.jodit-debug{align-items:stretch;background:#f6f6f6;display:flex;justify-content:space-between;padding:0;position:relative}.jodit-debug>*{padding:var(--jd-padding-default)}.jodit-debug__tree{width:40%}.jodit-debug__tree .jodit-debug__tree-elm-name{color:#052e88}.jodit-debug__tree .jodit-debug__tree-element_selected{background:#1e7e34;color:#fff}.jodit-debug__tree .jodit-debug__tree-cursor{background:#dc3232;color:#fff}.jodit-debug__events{background:#1e7e34;color:#fff;max-height:500px;overflow:auto;width:40%}.jodit-debug__events span{color:#cacaca;font-size:.8em}.jodit-debug__events .jodit-debug__events-clear{color:red;cursor:pointer;padding:5px;position:absolute;right:0;top:0}

package/es5/plugins/debug/debug.min.js

@@ -1,10 +1,10 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.2.38
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
 
 
-"use strict";!function(e,n){if("object"==typeof exports&&"object"==typeof module)module.exports=n();else if("function"==typeof define&&define.amd)define([],n);else{var t=n();for(var o in t)("object"==typeof exports?exports:e)[o]=t[o]}}(self,(function(){return(self.webpackChunkjodit=self.webpackChunkjodit||[]).push([[486],{40773:function(e,n,t){t.r(n),t.d(n,{Debug:function(){return a}});var o=t(31635),r=t(17352),c=t(55186),i=(t(56298),t(61793)),a=function(e){function n(){return null!==e&&e.apply(this,arguments)||this}return(0,o.C6)(n,e),n.prototype.afterInit=function(e){var n=e.create.div(),t=e.create.div(),o=e.create.div();n.appendChild(t),n.appendChild(o),e.workplace.appendChild(n),Object.assign(n.style,{padding:"16px",backgroundColor:"#fcfcfc"}),Object.assign(o.style,{paddingTop:"16px"}),e.e.on("keydown keyup keypress change afterInit updateDebug",(function(){t.innerHTML=d(e.editor)})).on(e.od,"selectionchange",(function(){var n=e.selection.range;t.innerHTML=d(e.editor),o.innerHTML="start ".concat(n.startContainer.nodeName," ").concat(n.startOffset,"<br>end ").concat(n.endContainer.nodeName," ").concat(n.endOffset)}))},n.prototype.beforeDestruct=function(e){},n}(t(29866).k);function d(e,n){return void 0===n&&(n=0),"<div style='padding-left: ".concat(5*n,"px'>\n\t\t").concat(e.nodeName," ").concat(c.J.isText(e)?"- ".concat(function(e){return e.nodeValue?(0,i.K)(e.nodeValue.replace((0,r.INVISIBLE_SPACE_REG_EXP)(),"INV")):"<span style='color:red'>empty</span>"}(e)):"","\n\t").concat(Array.from(e.childNodes).map((function(e){return d(e,n+1)})).join(""),"\n</div>")}}},function(e){return e(e.s=40773)}])}));
+"use strict";!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var o in n)("object"==typeof exports?exports:e)[o]=n[o]}}(self,(function(){return(self.webpackChunkjodit=self.webpackChunkjodit||[]).push([[486],{40773:function(e,t,n){n.r(t),n.d(t,{Debug:function(){return c}});var o=n(31635),a=n(17352),r=n(55186),s=(n(56298),n(61793)),c=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return(0,o.C6)(t,e),t.prototype.afterInit=function(e){var t=e.create.div("jodit-debug"),n=e.create.div("jodit-debug__tree"),o=e.create.div("jodit-debug__events"),a=e.create.div("jodit-debug__events-clear",["x"]),s=e.create.div("jodit-debug__sel");function c(){var t=e.selection.range;n.innerHTML=d(e.editor,0,t),s.innerHTML="start ".concat(t.startContainer.nodeName," ").concat(t.startOffset,"<br>end ").concat(t.endContainer.nodeName," ").concat(t.endOffset)}function i(t){var n=e.e.current,a=e.create.div();a.innerHTML="<span>".concat((new Date).toLocaleTimeString(),"</span> ").concat(function(e,t){var n=[null!=e?e:t.type];switch(e){case"beforeCommand":case"afterCommand":n.push("<span>".concat(t.toString(),"</span>"));break;case"keydown":case"keyup":case"keypress":t.shiftKey&&"Shift"!==t.key&&n.push("Shift+"),t.ctrlKey&&"Control"!==t.key&&n.push("Ctrl+"),t.altKey&&"Alt"!==t.key&&n.push("Alt"),n.push("".concat(t.key))}return t&&r.J.isNode(t.target)&&n.push("<span>".concat(t.target.nodeName,"</span>")),n.join(" ")}(n,t)),o.appendChild(a),o.scrollTop=o.scrollHeight,e.async.setTimeout((function(){o.children.length>100&&o.removeChild(o.children[0])}),100)}t.appendChild(n),t.appendChild(o),o.appendChild(a),t.appendChild(s),a.addEventListener("click",(function(){o.innerHTML="",o.appendChild(a)})),e.workplace.appendChild(t),e.e.on("keydown keyup keypress change afterInit updateDebug",c).on(["activate","afterInit","beforeactivate","beforeblur","beforedeactivate","beforefocus","beforeinput","blur","change","click","compositionend","compositionstart","compositionupdate","contextmenu","copy","cut","dblclick","deactivate","focus","focusin","focusout","focusout","input","keydown","keypress","keyup","mousedown","mouseup","paste","selectionchange","selectionstart","dragstart","drop","dragover","resize touchstart touchend","updateDebug","beforeCommand","afterCommand","wheel"],i).on(e.od,"selectionchange",i).on(e.od,"selectionchange",c)},t.prototype.beforeDestruct=function(e){},t}(n(29866).k);function i(e,t){if(!e.nodeValue)return"<span style='color:red'>empty</span>";var n=e.nodeValue;return t.collapsed?e===t.startContainer&&(n=n.slice(0,t.startOffset)+"%CURSOR%"+n.slice(t.startOffset)):e===t.startContainer&&e===t.endContainer?n=n.slice(0,t.startOffset)+"%START-CURSOR%"+n.slice(t.startOffset,t.endOffset)+"%END-CURSOR%"+n.slice(t.endOffset):e===t.startContainer?n=n.slice(0,t.startOffset)+"%CURSOR%"+n.slice(t.startOffset):e===t.endContainer&&(n=n.slice(0,t.endOffset)+"%CURSOR%"+n.slice(t.endOffset)),(0,s.K)(n.replace((0,a.INVISIBLE_SPACE_REG_EXP)(),"INV")).replace(/%CURSOR%/,'<span class="jodit-debug__tree-cursor">|</span>').replace(/%START-CURSOR%/,'<span class="jodit-debug__tree-cursor">|').replace(/%END-CURSOR%/,"|</span>")}function d(e,t,n){var o,a=null===(o=window.getSelection())||void 0===o?void 0:o.containsNode(e),s=['<span class="jodit-debug__tree-elm-name">'.concat(e.nodeName,"</span>"),r.J.isText(e)?"- ".concat(i(e,n)):""].map((function(e){return e.trim()})).filter(Boolean);return'<div class="'.concat(a?"jodit-debug__tree-element_selected":"","\" style='padding-left: ").concat(5*t,"px'>\n\t\t").concat(s.join("&nbsp;"),"\n\t").concat(Array.from(e.childNodes).map((function(o,a){var r=[];return n.startContainer===e&&a===n.startOffset&&r.push('<span class="jodit-debug__tree-cursor">|</span>'),r.push(d(o,t+1,n)),n.endContainer===e&&a===n.endOffset&&r.push('<span class="jodit-debug__tree-cursor">|</span>'),r})).flat().join(""),"\n</div>")}}},function(e){return e(e.s=40773)}])}));

package/es5/plugins/speech-recognize/speech-recognize.css

@@ -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.38
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.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.38
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.min.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.38
+ * Version: v4.2.40
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/esm/core/constants.js

@@ -3,7 +3,7 @@
  * 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
  */
-export const APP_VERSION = "4.2.38";
+export const APP_VERSION = "4.2.40";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;

package/esm/core/ui/button/tooltip/tooltip.d.ts

@@ -16,6 +16,7 @@ export declare class UITooltip extends UIElement {
     className(): string;
     protected render(): string;
     constructor(view: IViewBased);
+    private __attachedContainers;
     private __onAttach;
     private __listenClose;
     private __addListenersOnEnter;

package/esm/core/ui/button/tooltip/tooltip.js

@@ -32,6 +32,7 @@ const JODIT_EVENTS_ON_HIDE = [
     'changePlace.tooltip',
     'afterOpenPopup.tooltip',
     'hidePopup.tooltip',
+    'beforePopupClose.tooltip',
     'closeAllPopups.tooltip'
 ];
 let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
@@ -44,6 +45,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
     constructor(view) {
         super(view);
         this.__isOpened = false;
+        this.__attachedContainers = new Set();
         this.__listenClose = false;
         this.__currentTarget = null;
         this.__delayShowTimeout = 0;
@@ -62,7 +64,16 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
     __onAttach(container) {
         // TODO Move it inside __show method. Now it is here because testcase failed with capturing
         getContainer(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
         });
     }
@@ -74,10 +85,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
         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) {
@@ -87,8 +95,7 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
         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) {
@@ -165,7 +172,11 @@ let UITooltip = UITooltip_1 = class UITooltip extends UIElement {
         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();
     }

package/esm/core/view/view-with-toolbar.d.ts

@@ -41,6 +41,7 @@ export declare abstract class ViewWithToolbar extends View implements IViewWithT
      */
     private beforeToolbarBuild;
     readonly isJodit: boolean;
+    private __tooltip;
     /** @override **/
     protected constructor(options?: Partial<IViewOptions>, isJodit?: boolean);
     destruct(): void;

package/esm/core/view/view-with-toolbar.js

@@ -20,6 +20,7 @@ import { Dom } from "../dom/dom.js";
 import { splitArray } from "../helpers/array/index.js";
 import { isString } from "../helpers/checker/is-string.js";
 import { resolveElement } from "../helpers/utils/selector.js";
+import { UITooltip } from "../ui/index.js";
 import { isButtonGroup } from "../ui/helpers/buttons.js";
 import { View } from "./view.js";
 import { makeCollection } from "../../modules/toolbar/factory.js";
@@ -124,6 +125,7 @@ export class ViewWithToolbar extends View {
         this.registeredButtons = new Set();
         this.groupToButtons = {};
         this.isJodit = false;
+        this.__tooltip = new UITooltip(this);
         this.isJodit = isJodit;
         this.e.on('beforeToolbarBuild', this.beforeToolbarBuild);
     }
@@ -133,6 +135,7 @@ export class ViewWithToolbar extends View {
         }
         this.setStatus(STATUSES.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;

package/esm/modules/toolbar/collection/collection.d.ts

@@ -39,7 +39,6 @@ export declare class ToolbarCollection<T extends IViewWithToolbar = IViewWithToo
      * Set direction
      */
     setDirection(direction: 'rtl' | 'ltr'): void;
-    private __tooltip;
     constructor(jodit: IViewBased);
     protected __initEvents(): void;
     hide(): void;

package/esm/modules/toolbar/collection/collection.js

@@ -15,7 +15,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { autobind, component, debounce, hook } from "../../../core/decorators/index.js";
 import { error } from "../../../core/helpers/utils/error/error.js";
-import { UIList, UITooltip } from "../../../core/ui/index.js";
+import { UIList } from "../../../core/ui/index.js";
 import { makeButton, makeSelect } from "../factory.js";
 let ToolbarCollection = class ToolbarCollection extends UIList {
     /** @override */
@@ -74,7 +74,6 @@ let ToolbarCollection = class ToolbarCollection extends UIList {
         super(jodit);
         this.__listenEvents = 'updatePlugins updateToolbar changeStack mousedown mouseup keydown change afterInit readonly afterResize ' +
             'selectionchange changeSelection focus afterSetMode touchstart focus blur';
-        this.__tooltip = new UITooltip(this.jodit);
     }
     __initEvents() {
         this.j.e
@@ -104,8 +103,6 @@ let ToolbarCollection = class ToolbarCollection extends UIList {
         if (this.isDestructed) {
             return;
         }
-        this.__tooltip?.destruct();
-        this.__tooltip = null;
         this.j.e
             .off(this.__listenEvents, this.update)
             .off('afterSetMode focus', this.__immediateUpdate);

package/esm/plugins/debug/debug.d.ts

@@ -10,6 +10,7 @@
  */
 import type { IJodit } from "../../types";
 import { Plugin } from "../../core/plugin/plugin";
+
 export declare class Debug extends Plugin {
     protected afterInit(jodit: IJodit): void;
     protected beforeDestruct(jodit: IJodit): void;

package/esm/plugins/enter/helpers/check-br.js

@@ -12,9 +12,11 @@ import { scrollIntoViewIfNeeded } from "../../../core/helpers/utils/scroll-into-
  */
 export function checkBR(fake, jodit, shiftKeyPressed) {
     const isMultiLineBlock = Boolean(Dom.closest(fake, ['pre', 'blockquote'], jodit.editor));
+    const isCell = !isMultiLineBlock && Dom.closest(fake, ['td', 'th'], jodit.editor);
     const isBRMode = jodit.o.enter.toLowerCase() === 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

package/esm/plugins/index.js

@@ -10,6 +10,7 @@
  */
 import "./about/about.js";
 import "./backspace/backspace.js";
+// import 'jodit/plugins/debug/debug';
 import "./delete/delete.js";
 import "./bold/bold.js";
 import "./color/color.js";

package/esm/plugins/inline-popup/inline-popup.d.ts

@@ -57,7 +57,6 @@ export declare class inlinePopup extends Plugin {
     /**
      * Shortcut for Table module
      */
-    private get tableModule();
     /** @override **/
     protected beforeDestruct(jodit: IJodit): void;
     private elmsList;

package/esm/plugins/inline-popup/inline-popup.js

@@ -167,10 +167,10 @@ export class inlinePopup extends Plugin {
         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();
             }
@@ -195,9 +195,9 @@ export class inlinePopup extends Plugin {
     /**
      * 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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.2.38",
+	"version": "4.2.40",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/core/ui/button/tooltip/tooltip.d.ts

@@ -16,6 +16,7 @@ export declare class UITooltip extends UIElement {
     className(): string;
     protected render(): string;
     constructor(view: IViewBased);
+    private __attachedContainers;
     private __onAttach;
     private __listenClose;
     private __addListenersOnEnter;

package/types/core/view/view-with-toolbar.d.ts

@@ -41,6 +41,7 @@ export declare abstract class ViewWithToolbar extends View implements IViewWithT
      */
     private beforeToolbarBuild;
     readonly isJodit: boolean;
+    private __tooltip;
     /** @override **/
     protected constructor(options?: Partial<IViewOptions>, isJodit?: boolean);
     destruct(): void;

package/types/modules/toolbar/collection/collection.d.ts

@@ -39,7 +39,6 @@ export declare class ToolbarCollection<T extends IViewWithToolbar = IViewWithToo
      * Set direction
      */
     setDirection(direction: 'rtl' | 'ltr'): void;
-    private __tooltip;
     constructor(jodit: IViewBased);
     protected __initEvents(): void;
     hide(): void;

package/types/plugins/debug/debug.d.ts

@@ -10,6 +10,7 @@
  */
 import type { IJodit } from "../../types";
 import { Plugin } from "../../core/plugin/plugin";
+
 export declare class Debug extends Plugin {
     protected afterInit(jodit: IJodit): void;
     protected beforeDestruct(jodit: IJodit): void;

package/types/plugins/inline-popup/inline-popup.d.ts

@@ -57,7 +57,6 @@ export declare class inlinePopup extends Plugin {
     /**
      * Shortcut for Table module
      */
-    private get tableModule();
     /** @override **/
     protected beforeDestruct(jodit: IJodit): void;
     private elmsList;