jodit 4.2.39 → 4.2.41

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.41
  * 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.41";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -7672,11 +7672,12 @@ function ConfigFlatten(obj) {
 /**
  * Javascript url pattern converter replace youtube/vimeo url in embed code.
  */
-const convertMediaUrlToVideoEmbed = (url, width = 400, height = 345) => {
+const convertMediaUrlToVideoEmbed = (url, { width = 400, height = 345 } = {}) => {
     if (!(0,jodit_core_helpers_checker_is_url__WEBPACK_IMPORTED_MODULE_1__/* .isURL */ .m)(url)) {
         return url;
     }
-    const parser = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.globalDocument.createElement('a'), pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
+    const parser = jodit_core_constants__WEBPACK_IMPORTED_MODULE_0__.globalDocument.createElement('a');
+    const pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
     parser.href = url;
     if (!width) {
         width = 400;
@@ -7703,7 +7704,10 @@ const convertMediaUrlToVideoEmbed = (url, width = 400, height = 345) => {
         case 'www.youtu.be': {
             const query = parser.search
                 ? (0,_parse_query__WEBPACK_IMPORTED_MODULE_2__/* .parseQuery */ .m)(parser.search)
-                : { v: parser.pathname.substr(1) };
+                : { v: parser.pathname.substring(1) };
+            if (/^embed\/.*/.test(query.v)) {
+                query.v = query.v.substring(6);
+            }
             return query.v
                 ? '<iframe width="' +
                     width +
@@ -13410,6 +13414,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 +13427,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 +13446,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 +13467,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 +13477,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 +13554,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 +15777,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 +15806,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 +15885,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 +15903,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 +15918,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 +23617,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 +23646,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 +29622,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 +33103,7 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_2__/* .pluginSystem */ .fg.add('inden
 
 
 
+// import 'jodit/plugins/debug/debug';
 
 
 
@@ -33714,10 +33733,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 +33761,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
@@ -34885,7 +34904,11 @@ class link extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_4__/* .Plugin */ .
         }
         jodit.e.stopPropagation('processPaste');
         if (jodit.o.link.processVideoLink) {
-            const embed = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.convertMediaUrlToVideoEmbed)(html);
+            const embed = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.call)(jodit.o.video?.parseUrlToVideoEmbed ??
+                jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.convertMediaUrlToVideoEmbed, html, {
+                width: jodit.o.video?.defaultWidth,
+                height: jodit.o.video?.defaultHeight
+            });
             if (embed !== html) {
                 return jodit.createInside.fromHTML(embed);
             }
@@ -42676,12 +42699,17 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_0__/* .pluginSystem */ .fg.add('table
 
 
 
+jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.video = {
+    parseUrlToVideoEmbed: jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed,
+    defaultWidth: 400,
+    defaultHeight: 345
+};
 jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_3__/* .Icon */ .I.set('video', (_video_svg__WEBPACK_IMPORTED_MODULE_6___default()));
 jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.controls.video = {
-    popup: (editor, current, close) => {
-        const formLink = new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIForm */ .XV(editor, [
-            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(editor, [
-                new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIInput */ .tS(editor, {
+    popup: (jodit, current, close) => {
+        const formLink = new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIForm */ .XV(jodit, [
+            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(jodit, [
+                new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIInput */ .tS(jodit, {
                     name: 'url',
                     required: true,
                     label: 'URL',
@@ -42689,26 +42717,26 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.controls.vid
                     validators: ['url']
                 })
             ]),
-            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(editor, [
-                (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_1__/* .Button */ .$n)(editor, '', 'Insert', 'primary').onAction(() => formLink.submit())
+            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(jodit, [
+                (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_1__/* .Button */ .$n)(jodit, '', 'Insert', 'primary').onAction(() => formLink.submit())
             ])
-        ]), formCode = new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIForm */ .XV(editor, [
-            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(editor, [
-                new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UITextArea */ .F0(editor, {
+        ]), formCode = new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIForm */ .XV(jodit, [
+            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(jodit, [
+                new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UITextArea */ .F0(jodit, {
                     name: 'code',
                     required: true,
                     label: 'Embed code'
                 })
             ]),
-            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(editor, [
-                (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_1__/* .Button */ .$n)(editor, '', 'Insert', 'primary').onAction(() => formCode.submit())
+            new jodit_core_ui_form__WEBPACK_IMPORTED_MODULE_2__/* .UIBlock */ .Yh(jodit, [
+                (0,jodit_core_ui_button__WEBPACK_IMPORTED_MODULE_1__/* .Button */ .$n)(jodit, '', 'Insert', 'primary').onAction(() => formCode.submit())
             ])
         ]), tabs = [], insertCode = (code) => {
-            editor.s.restore();
-            editor.s.insertHTML(code);
+            jodit.s.restore();
+            jodit.s.insertHTML(code);
             close();
         };
-        editor.s.save();
+        jodit.s.save();
         tabs.push({
             icon: 'link',
             name: 'Link',
@@ -42719,12 +42747,16 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__/* .Config */ .T.prototype.controls.vid
             content: formCode.container
         });
         formLink.onSubmit(data => {
-            insertCode((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed)(data.url));
+            insertCode((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.call)(jodit.o.video?.parseUrlToVideoEmbed ??
+                jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed, data.url, {
+                width: jodit.o.video?.defaultWidth,
+                height: jodit.o.video?.defaultHeight
+            }));
         });
         formCode.onSubmit(data => {
             insertCode(data.code);
         });
-        return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_5__/* .TabsWidget */ .Zg)(editor, tabs);
+        return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_5__/* .TabsWidget */ .Zg)(jodit, tabs);
     },
     tags: ['iframe'],
     tooltip: 'Insert youtube/vimeo video'