jodit-pro-react 5.5.36 → 5.5.38

package/build/esm/JoditEditor.mjs

@@ -1,6 +1,6 @@
 import {
   JoditEditor_default
-} from "./chunk-JEVJ5NDX.mjs";
+} from "./chunk-HUTDB76G.mjs";
 export {
   JoditEditor_default as default
 };

package/build/esm/{chunk-JEVJ5NDX.mjs → chunk-HUTDB76G.mjs}

@@ -193,7 +193,7 @@ var APP_VERSION, ES, IS_ES_MODERN, IS_ES_NEXT, IS_PROD, IS_TEST, FAT_MODE, HOMEP
 var init_constants = __esm({
   "node_modules/jodit/esm/core/constants.js"() {
     "use strict";
-    APP_VERSION = "4.12.17";
+    APP_VERSION = "4.12.21";
     ES = "es2020";
     IS_ES_MODERN = true;
     IS_ES_NEXT = true;
@@ -3326,6 +3326,11 @@ function applyStyles(html) {
       iframeDoc.open();
       iframeDoc.write(html);
       iframeDoc.close();
+      Dom.each(iframeDoc.body, (node) => {
+        if (Dom.isElement(node) && /mso-list:\s*ignore/i.test(node.getAttribute("style") || "")) {
+          Dom.safeRemove(node);
+        }
+      });
       try {
         for (let i53 = 0; i53 < iframeDoc.styleSheets.length; i53 += 1) {
           const rules = iframeDoc.styleSheets[i53].cssRules;
@@ -3407,6 +3412,10 @@ function cleanFromWord(html) {
                 Dom.unwrap(node);
                 break;
               default:
+                if (/mso-list:\s*ignore/i.test(node.getAttribute("style") || "")) {
+                  marks.push(node);
+                  break;
+                }
                 toArray(node.attributes).forEach((attr2) => {
                   if ([
                     "src",
@@ -3868,6 +3877,9 @@ var init_extend = __esm({
 });
 
 // node_modules/jodit/esm/core/helpers/utils/config-proto.js
+function isUnsafeProtoKey(key3) {
+  return UNSAFE_PROTO_KEYS.indexOf(key3) !== -1;
+}
 function ConfigProto(options2, proto, deep = 0) {
   if (Object.getPrototypeOf(options2) !== Object.prototype) {
     return options2;
@@ -3886,6 +3898,9 @@ function ConfigProto(options2, proto, deep = 0) {
   }
   const newOpt = {};
   Object.keys(options2).forEach((key3) => {
+    if (isUnsafeProtoKey(key3)) {
+      return;
+    }
     const opt = options2[key3], protoKey = proto ? proto[key3] : null;
     if (isPlainObject(opt) && isPlainObject(protoKey) && !isAtom(opt)) {
       newOpt[key3] = ConfigProto(opt, protoKey, deep + 1);
@@ -3908,6 +3923,9 @@ function ConfigFlatten(obj) {
 }
 function ConfigMerge(target, source2) {
   Object.keys(source2).forEach((key3) => {
+    if (isUnsafeProtoKey(key3)) {
+      return;
+    }
     const srcVal = source2[key3];
     const tgtVal = target[key3];
     if (isPlainObject(srcVal) && isPlainObject(tgtVal) && !isAtom(srcVal)) {
@@ -3923,6 +3941,7 @@ function ConfigDeepFlatten(obj) {
     return app;
   }, {});
 }
+var UNSAFE_PROTO_KEYS;
 var init_config_proto = __esm({
   "node_modules/jodit/esm/core/helpers/utils/config-proto.js"() {
     "use strict";
@@ -3933,6 +3952,7 @@ var init_config_proto = __esm({
     init_config();
     init_extend();
     init_utils();
+    UNSAFE_PROTO_KEYS = ["__proto__", "constructor", "prototype"];
   }
 });
 
@@ -3965,7 +3985,6 @@ var init_convert_media_url_to_video_embed = __esm({
         return url2;
       }
       const parser = globalDocument.createElement("a");
-      const pattern1 = /(?:http?s?:\/\/)?(?:www\.)?(?:vimeo\.com)\/?(.+)/g;
       parser.href = url2;
       if (!width) {
         width = 400;
@@ -3976,17 +3995,29 @@ var init_convert_media_url_to_video_embed = __esm({
       const protocol = parser.protocol || "";
       switch (parser.hostname) {
         case "www.vimeo.com":
-        case "vimeo.com":
-          return pattern1.test(url2) ? url2.replace(pattern1, '<iframe width="' + width + '" height="' + height + '" src="' + protocol + '//player.vimeo.com/video/$1" frameborder="0" allowfullscreen></iframe>') : url2;
+        case "vimeo.com": {
+          const segments = parser.pathname.split("/").filter(Boolean);
+          const idIndex = segments.findIndex((s48) => /^\d+$/.test(s48));
+          if (idIndex === -1) {
+            return url2;
+          }
+          let path = segments[idIndex];
+          const hash = segments[idIndex + 1];
+          if (hash && idIndex === 0) {
+            path += "/" + hash;
+          }
+          return '<iframe width="' + width + '" height="' + height + '" src="' + protocol + "//player.vimeo.com/video/" + path + '" frameborder="0" allowfullscreen></iframe>';
+        }
         case "youtube.com":
         case "www.youtube.com":
+        case "m.youtube.com":
+        case "music.youtube.com":
         case "youtu.be":
         case "www.youtu.be": {
-          const query = parser.search ? parseQuery(parser.search) : { v: parser.pathname.substring(1) };
-          if (/^embed\/.*/.test(query.v)) {
-            query.v = query.v.substring(6);
-          }
-          return query.v ? '<iframe width="' + width + '" height="' + height + '" src="' + protocol + "//www.youtube.com/embed/" + query.v + '" frameborder="0" allowfullscreen></iframe>' : url2;
+          const query = parser.search ? parseQuery(parser.search) : {};
+          let v18 = query.v || parser.pathname.substring(1);
+          v18 = v18.replace(/^(watch|embed|shorts|live|v)\//, "").replace(/\/$/, "");
+          return v18 ? '<iframe width="' + width + '" height="' + height + '" src="' + protocol + "//www.youtube.com/embed/" + v18 + '" frameborder="0" allowfullscreen></iframe>' : url2;
         }
       }
       return url2;
@@ -4347,20 +4378,16 @@ function safeHTML(box, options2) {
     return;
   }
   const removeEvents = (_a2 = options2.removeEventAttributes) !== null && _a2 !== void 0 ? _a2 : options2.removeOnError;
-  if (removeEvents) {
-    removeAllEventAttributes(box);
-    $$("*", box).forEach((elm) => removeAllEventAttributes(elm));
-  } else if (options2.removeOnError) {
-    sanitizeHTMLElement(box, options2);
-    $$("[onerror]", box).forEach((elm) => sanitizeHTMLElement(elm, options2));
-  }
-  if (options2.safeJavaScriptLink) {
-    sanitizeHTMLElement(box, options2);
-    $$('a[href^="javascript"]', box).forEach((elm) => sanitizeHTMLElement(elm, options2));
-  }
-  if (options2.safeLinksTarget) {
-    $$('a[target="_blank"]', box).forEach((elm) => {
-      const rel = elm.getAttribute("rel") || "";
+  const process2 = (node) => {
+    if (!Dom.isElement(node)) {
+      return;
+    }
+    if (removeEvents) {
+      removeAllEventAttributes(node);
+    }
+    sanitizeHTMLElement(node, options2);
+    if (options2.safeLinksTarget && node.nodeName === "A" && node.getAttribute("target") === "_blank") {
+      const rel = node.getAttribute("rel") || "";
       const parts = rel.split(/\s+/).filter(Boolean);
       if (!parts.includes("noopener")) {
         parts.push("noopener");
@@ -4368,9 +4395,11 @@ function safeHTML(box, options2) {
       if (!parts.includes("noreferrer")) {
         parts.push("noreferrer");
       }
-      attr(elm, "rel", parts.join(" "));
-    });
-  }
+      attr(node, "rel", parts.join(" "));
+    }
+  };
+  process2(box);
+  Dom.each(box, process2);
 }
 function removeAllEventAttributes(elm) {
   if (!Dom.isElement(elm)) {
@@ -4389,6 +4418,16 @@ function removeAllEventAttributes(elm) {
   }
   return effected;
 }
+function isDangerousUrl(value, tagName) {
+  const normalized = value.replace(/[\u0000-\u0020]+/g, "").toLowerCase();
+  if (/^(?:javascript|vbscript|livescript|mocha):/.test(normalized)) {
+    return true;
+  }
+  if (/^data:(?:text\/html|application\/xhtml)/.test(normalized)) {
+    return true;
+  }
+  return /^data:image\/svg/.test(normalized) && DOCUMENT_EMBED_TAGS.has(tagName);
+}
 function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
   safeJavaScriptLink: true,
   removeOnError: true
@@ -4406,18 +4445,43 @@ function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
     attr(elm, "href", location.protocol + "//" + href);
     effected = true;
   }
+  if (safeJavaScriptLink) {
+    if (elm.hasAttribute("srcdoc")) {
+      attr(elm, "srcdoc", null);
+      effected = true;
+    }
+    const tagName = elm.nodeName.toLowerCase();
+    for (const name of URL_ATTRIBUTES) {
+      const value = elm.getAttribute(name);
+      if (value && isDangerousUrl(value, tagName)) {
+        attr(elm, name, null);
+        effected = true;
+      }
+    }
+  }
   return effected;
 }
+var URL_ATTRIBUTES, DOCUMENT_EMBED_TAGS;
 var init_safe_html = __esm({
   "node_modules/jodit/esm/core/helpers/html/safe-html.js"() {
     "use strict";
     init_dom();
     init_utils3();
+    URL_ATTRIBUTES = [
+      "src",
+      "data",
+      "action",
+      "formaction",
+      "poster",
+      "background",
+      "xlink:href"
+    ];
+    DOCUMENT_EMBED_TAGS = /* @__PURE__ */ new Set(["iframe", "frame", "object", "embed"]);
   }
 });
 
 // node_modules/jodit/esm/core/helpers/html/strip-tags.js
-function stripTags(html, doc = document, exclude = null) {
+function stripTags(html, doc = document, exclude = null, blockBr = false) {
   const tmp = doc.createElement("div");
   if (isString(html)) {
     tmp.innerHTML = html;
@@ -4431,7 +4495,7 @@ function stripTags(html, doc = document, exclude = null) {
     }
     if (exclude && Dom.isTag(p62, exclude)) {
       const tag = p62.nodeName.toLowerCase();
-      const text = !Dom.isTag(p62, ALONE_TAGS) ? `%%%jodit-${tag}%%%${stripTags(p62.innerHTML, doc, exclude)}%%%/jodit-${tag}%%%` : `%%%jodit-single-${tag}%%%`;
+      const text = !Dom.isTag(p62, ALONE_TAGS) ? `%%%jodit-${tag}%%%${stripTags(p62.innerHTML, doc, exclude, blockBr)}%%%/jodit-${tag}%%%` : `%%%jodit-single-${tag}%%%`;
       Dom.before(p62, doc.createTextNode(text));
       Dom.safeRemove(p62);
       return;
@@ -4448,7 +4512,7 @@ function stripTags(html, doc = document, exclude = null) {
       return;
     }
     if (nx) {
-      pr.insertBefore(doc.createTextNode(" "), nx);
+      pr.insertBefore(doc.createTextNode(blockBr ? "%%%jodit-single-br%%%" : " "), nx);
     }
   });
   return restoreTags(trim(tmp.innerText));
@@ -16622,7 +16686,17 @@ Config.prototype.enableDragAndDropFileToEditor = true;
 Config.prototype.uploader = {
   url: "",
   insertImageAsBase64URI: false,
-  imagesExtensions: ["jpg", "png", "jpeg", "gif"],
+  imagesExtensions: [
+    "jpg",
+    "jpeg",
+    "png",
+    "gif",
+    "webp",
+    "bmp",
+    "svg",
+    "tiff",
+    "avif"
+  ],
   headers: null,
   data: null,
   filesVariableName(i53) {
@@ -20259,7 +20333,8 @@ function isRemovableNode(jodit, node, current, allow, deny) {
   if (!jodit.o.cleanHTML.removeEmptyElements) {
     return false;
   }
-  return Dom.isElement(node) && node.nodeName.match(IS_INLINE) != null && !Dom.isTemporary(node) && trimInv(node.innerHTML).length === 0 && (current == null || !Dom.isOrContains(node, current));
+  const liveCaret = jodit.s.isCollapsed() ? jodit.s.range.startContainer : null;
+  return Dom.isElement(node) && node.nodeName.match(IS_INLINE) != null && !Dom.isTemporary(node) && trimInv(node.innerHTML).length === 0 && (current == null || !Dom.isOrContains(node, current)) && (liveCaret == null || !Dom.isOrContains(node, liveCaret));
 }
 
 // node_modules/jodit/esm/plugins/clean-html/helpers/visitor/visit-node-walker.js
@@ -20780,8 +20855,9 @@ Config.prototype.controls.brush = {
     const update = (key3, value) => {
       if (value && value !== css(editor.editor, key3).toString()) {
         button.state.icon.fill = value;
-        return;
+        return true;
       }
+      return false;
     };
     if (color2) {
       const mode = dataBind(button, "color");
@@ -20791,8 +20867,11 @@ Config.prototype.controls.brush = {
     const current = editor.s.current();
     if (current && !button.state.disabled) {
       const currentBpx = Dom.closest(current, Dom.isElement, editor.editor) || editor.editor;
-      update("color", css(currentBpx, "color").toString());
-      update("background-color", css(currentBpx, "background-color").toString());
+      const hasColor = update("color", css(currentBpx, "color").toString());
+      const hasBackground = update("background-color", css(currentBpx, "background-color").toString());
+      if (hasColor || hasBackground) {
+        return;
+      }
     }
     button.state.icon.fill = "";
     button.state.activated = false;
@@ -21342,11 +21421,32 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
   /** @override */
   afterInit() {
     this.dragList = this.j.o.draggableTags ? splitArray(this.j.o.draggableTags).filter(Boolean).map((item) => item.toLowerCase()) : [];
+    this.j.e.on("startDragElement", this.onStartDragElement);
     if (!this.dragList.length) {
       return;
     }
     this.j.e.on("mousedown dragstart", this.onDragStart);
   }
+  /**
+   * Start dragging a specific element programmatically.
+   *
+   * Allows a separate UI element (for example a drag handle/anchor shown next
+   * to a block) to initiate the drag without the user pressing directly on the
+   * draggable element itself.
+   *
+   * @example
+   * ```js
+   * handle.addEventListener('mousedown', e => {
+   * 	editor.e.fire('startDragElement', preBlock, e);
+   * });
+   * ```
+   */
+  onStartDragElement(element, event) {
+    if (this.isInDestruct || this.state > DragState.IDLE || !element) {
+      return;
+    }
+    this.startDragging(element, event);
+  }
   /**
    * Drag start handler
    */
@@ -21369,11 +21469,19 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
     if (Dom.isTag(lastTarget.parentElement, "a") && lastTarget.parentElement.firstChild === lastTarget && lastTarget.parentElement.lastChild === lastTarget) {
       lastTarget = lastTarget.parentElement;
     }
+    this.startDragging(lastTarget, event);
+  }
+  /**
+   * Prepare the ghost element and switch to the waiting state.
+   * Shared by the native mousedown handler and the programmatic
+   * `startDragElement` event handler.
+   */
+  startDragging(target, event) {
     this.startX = event.clientX;
     this.startY = event.clientY;
     this.isCopyMode = ctrlKey(event);
-    this.draggable = lastTarget.cloneNode(true);
-    dataBind(this.draggable, "target", lastTarget);
+    this.draggable = target.cloneNode(true);
+    dataBind(this.draggable, "target", target);
     this.state = DragState.WAIT_DRAGGING;
     this.addDragListeners();
   }
@@ -21446,6 +21554,11 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
     }
     const { parentElement } = fragment;
     this.j.s.insertNode(fragment, true, false);
+    [fragment.previousSibling, fragment.nextSibling].forEach((node) => {
+      if (Dom.isEmptyTextNode(node)) {
+        Dom.safeRemove(node);
+      }
+    });
     if (parentElement && Dom.isEmpty(parentElement) && !Dom.isCell(parentElement)) {
       Dom.safeRemove(parentElement);
     }
@@ -21469,10 +21582,13 @@ var dragAndDropElement = class _dragAndDropElement extends Plugin {
   /** @override */
   beforeDestruct() {
     this.onDragEnd();
-    this.j.e.off("mousedown dragstart", this.onDragStart);
+    this.j.e.off("mousedown dragstart", this.onDragStart).off("startDragElement", this.onStartDragElement);
     this.removeDragListeners();
   }
 };
+__decorate41([
+  autobind
+], dragAndDropElement.prototype, "onStartDragElement", null);
 __decorate41([
   autobind
 ], dragAndDropElement.prototype, "onDragStart", null);
@@ -21710,12 +21826,14 @@ var enter = class extends Plugin {
       if (beforeEnter !== void 0) {
         return beforeEnter;
       }
-      if (!editor.s.isCollapsed()) {
-        editor.execCommand("Delete");
-      }
-      editor.s.focus();
-      this.onEnter(event);
-      editor.e.fire("afterEnter", event);
+      editor.history.snapshot.transaction(() => {
+        if (!editor.s.isCollapsed()) {
+          editor.execCommand("Delete");
+        }
+        editor.s.focus();
+        this.onEnter(event);
+        editor.e.fire("afterEnter", event);
+      });
       editor.synchronizeValues();
       return false;
     }
@@ -22208,7 +22326,7 @@ init_config();
 Config.prototype.commandToHotkeys = {
   removeFormat: ["ctrl+shift+m", "cmd+shift+m"],
   insertOrderedList: ["ctrl+shift+7", "cmd+shift+7"],
-  insertUnorderedList: ["ctrl+shift+8, cmd+shift+8"],
+  insertUnorderedList: ["ctrl+shift+8", "cmd+shift+8"],
   selectall: ["ctrl+a", "cmd+a"]
 };
 
@@ -23838,14 +23956,25 @@ Config.prototype.controls.indent = {
 };
 Config.prototype.controls.outdent = {
   isDisabled: (editor) => {
+    var _a2;
     const current = editor.s.current();
-    if (current) {
-      const currentBox = Dom.closest(current, Dom.isBlock, editor.editor);
-      if (currentBox) {
-        const arrow = getKey(editor.o.direction, currentBox);
-        return !currentBox.style[arrow] || parseInt(currentBox.style[arrow], 10) <= 0;
+    if (!current) {
+      return true;
+    }
+    if ((_a2 = editor.o.tab) === null || _a2 === void 0 ? void 0 : _a2.tabInsideLiInsertNewList) {
+      const li = Dom.closest(current, "li", editor.editor);
+      if (li) {
+        const list = Dom.closest(li, ["ul", "ol"], editor.editor);
+        if (list && Dom.closest(list, "li", editor.editor)) {
+          return false;
+        }
       }
     }
+    const currentBox = Dom.closest(current, Dom.isBlock, editor.editor);
+    if (currentBox) {
+      const arrow = getKey(editor.o.direction, currentBox);
+      return !currentBox.style[arrow] || parseInt(currentBox.style[arrow], 10) <= 0;
+    }
     return true;
   },
   tooltip: "Decrease Indent"
@@ -26096,10 +26225,13 @@ var paste = class extends Plugin {
           html = cleanFromWord(html);
           break;
         case INSERT_ONLY_TEXT:
-          html = stripTags(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags));
+          html = stripTags(html, this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
           break;
         case INSERT_AS_TEXT:
           html = htmlspecialchars(html);
+          if (this.j.o.nl2brInPlainText) {
+            html = nl2br(html);
+          }
           break;
         default: {
           const newHTML = this.j.e.fire("onCustomPasteHTMLOption", action, html, e42);
@@ -26199,7 +26331,7 @@ var pasteFromWord = class extends Plugin {
         break;
       }
       case INSERT_ONLY_TEXT: {
-        html = stripTags(cleanFromWord(html));
+        html = stripTags(cleanFromWord(html), this.j.ed, new Set(this.j.o.pasteExcludeStripTags), this.j.o.nl2brInPlainText);
         break;
       }
     }
@@ -28299,6 +28431,7 @@ __decorate61([
 pluginSystem.add("search", search);
 
 // node_modules/jodit/esm/plugins/select/select.js
+init_constants();
 init_decorators();
 init_dom();
 init_global2();
@@ -28407,6 +28540,34 @@ var select = class extends Plugin {
       s48.setCursorAfter(text);
     }
   }
+  /**
+   * Keep pending inline formatting after a click. Toggling Bold/Italic/etc. on
+   * a collapsed cursor leaves empty marker elements with the caret inside; a
+   * click puts the caret right before them (outside), so they get cleaned up
+   * and the formatting is lost. Move the caret back into the innermost marker
+   * so the next typed character keeps every pending format (#1291).
+   */
+  onClickKeepPendingFormat() {
+    var _a2, _b;
+    const { s: s48 } = this.j;
+    const range = s48.range;
+    if (!range.collapsed || !Dom.isText(range.startContainer)) {
+      return;
+    }
+    const text = range.startContainer;
+    if (range.startOffset !== ((_b = (_a2 = text.nodeValue) === null || _a2 === void 0 ? void 0 : _a2.length) !== null && _b !== void 0 ? _b : 0)) {
+      return;
+    }
+    const marker = text.nextSibling;
+    if (!Dom.isElement(marker) || !marker.nodeName.match(IS_INLINE) || !Dom.isEmpty(marker)) {
+      return;
+    }
+    let inner = marker;
+    while (Dom.isElement(inner.firstElementChild) && inner.firstElementChild.nodeName.match(IS_INLINE)) {
+      inner = inner.firstElementChild;
+    }
+    s48.setCursorIn(inner);
+  }
   /**
    * Normalize selection after triple click
    */
@@ -28446,6 +28607,9 @@ __decorate62([
 __decorate62([
   watch([":click"])
 ], select.prototype, "onClickRightOfNestedListItem", null);
+__decorate62([
+  watch([":click"])
+], select.prototype, "onClickKeepPendingFormat", null);
 __decorate62([
   watch([":click"])
 ], select.prototype, "onTripleClickNormalizeSelection", null);
@@ -33005,6 +33169,17 @@ var Jodit2 = Jodit_1 = class Jodit3 extends ViewWithToolbar {
         }
         this.synchronizeValues();
       }
+    }).on(this.ow, "mouseup", (event) => {
+      if (this.o.readonly || this.__isSilentChange) {
+        return;
+      }
+      const target = event.target;
+      const insideEditor = Boolean(target && isNumber(target.nodeType) && editor.contains(target));
+      if (insideEditor || !this.s.isInsideArea) {
+        return;
+      }
+      this.e.fire("changeSelection");
+      this.synchronizeValues();
     });
   }
   fetch(url2, options2) {

package/build/esm/index.mjs

@@ -2,7 +2,7 @@ import {
   Config,
   JoditEditor_default,
   n
-} from "./chunk-JEVJ5NDX.mjs";
+} from "./chunk-HUTDB76G.mjs";
 
 // src/index.ts
 var index_default = JoditEditor_default;