jodit-pro-react 5.5.40 → 5.5.41

package/build/esm/JoditEditor.mjs

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

package/build/esm/{chunk-O6YNTRQ2.mjs → chunk-4T2ZQM4O.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.22";
+    APP_VERSION = "4.12.23";
     ES = "es2020";
     IS_ES_MODERN = true;
     IS_ES_NEXT = true;
@@ -3063,7 +3063,13 @@ var init_is_equal = __esm({
 
 // node_modules/jodit/esm/core/helpers/checker/is-html-from-word.js
 function isHtmlFromWord(data) {
-  return data.search(/<meta.*?Microsoft Excel\s[\d].*?>/) !== -1 || data.search(/<meta.*?Microsoft Word\s[\d].*?>/) !== -1 || data.search(/style="[^"]*mso-/) !== -1 && data.search(/<font/) !== -1;
+  return data.search(/<meta.*?Microsoft Excel\s[\d].*?>/) !== -1 || data.search(/<meta.*?Microsoft Word\s[\d].*?>/) !== -1 || // `<meta name=ProgId content=Word.Document>` — attribute values are
+  // unquoted in the raw Word clipboard fragment
+  data.search(/<meta[^>]*?ProgId[^>]*?(Word|Excel)\./i) !== -1 || // LibreOffice/OpenOffice Writer & Calc
+  data.search(/<meta[^>]*?(LibreOffice|OpenOffice)/i) !== -1 || // Office namespaces on the root element of the clipboard fragment
+  data.search(/urn:schemas-microsoft-com:office:(word|excel)/) !== -1 || // `class=MsoNormal` and friends (unquoted/quoted)
+  data.search(/<\w[^>]*\sclass=("|')?Mso/) !== -1 || // the raw Word clipboard uses SINGLE quotes: style='mso-…'
+  data.search(/style='[^']*mso-/) !== -1 || data.search(/style="[^"]*mso-/) !== -1 && data.search(/<font/) !== -1;
 }
 var init_is_html_from_word = __esm({
   "node_modules/jodit/esm/core/helpers/checker/is-html-from-word.js"() {
@@ -5843,6 +5849,9 @@ var init_view_component = __esm({
        */
       setParentView(jodit) {
         this.jodit = jodit;
+        if (jodit.ow) {
+          this.ownerWindow = jodit.ow;
+        }
         jodit.components.add(this);
         return this;
       }
@@ -8934,8 +8943,9 @@ var Popup = class _Popup extends UIGroup {
    * Calculate static bound for point
    */
   getKeepBound(getBound) {
+    var _a2;
     const oldBound = getBound();
-    const elmUnderCursor = this.od.elementFromPoint(oldBound.left, oldBound.top);
+    const elmUnderCursor = ((_a2 = this.j.o.shadowRoot) !== null && _a2 !== void 0 ? _a2 : this.od).elementFromPoint(oldBound.left, oldBound.top);
     if (!elmUnderCursor) {
       return getBound;
     }
@@ -16134,13 +16144,29 @@ var ToolbarContent = class ToolbarContent2 extends UIButton {
   }
   /** @override */
   update() {
-    const content = this.control.getContent(this.j, this);
+    var _a2, _b, _c;
+    const { control } = this;
+    const content = control.getContent(this.j, this);
     if (isString(content) || content.parentNode !== this.container) {
       Dom.detach(this.container);
       this.container.appendChild(isString(content) ? this.j.create.fromHTML(content) : content);
     }
+    this.state.disabled = Boolean((_a2 = control.isDisabled) === null || _a2 === void 0 ? void 0 : _a2.call(control, this.j, this));
+    this.state.activated = Boolean((_b = control.isActive) === null || _b === void 0 ? void 0 : _b.call(control, this.j, this));
+    (_c = control.update) === null || _c === void 0 ? void 0 : _c.call(control, this.j, this);
+    this.onChangeDisabled();
+    this.onChangeActivated();
     super.update();
   }
+  /**
+   * The content is arbitrary HTML — propagate the disabled state to the
+   * nested form controls (e.g. the file input of the Upload button),
+   * otherwise they stay interactive.
+   */
+  onChangeDisabled() {
+    super.onChangeDisabled();
+    this.container.querySelectorAll("input,button,select,textarea").forEach((elm) => attr(elm, "disabled", this.state.disabled || null));
+  }
   /** @override */
   createContainer() {
     return this.j.c.span(this.componentName);
@@ -17457,6 +17483,7 @@ function unwrapChildren(style, font2) {
 // node_modules/jodit/esm/core/selection/style/api/wrap.js
 init_dom2();
 init_attr();
+init_css();
 
 // node_modules/jodit/esm/core/selection/style/api/wrap-unwrapped-text.js
 init_dom();
@@ -17499,7 +17526,18 @@ function wrapUnwrappedText(style, elm, jodit) {
 // node_modules/jodit/esm/core/selection/style/api/wrap.js
 function wrap(commitStyle, font2, jodit) {
   const wrapper = findOrCreateWrapper(commitStyle, font2, jodit);
-  return commitStyle.elementIsList ? wrapList(commitStyle, wrapper, jodit) : Dom.replace(wrapper, commitStyle.element, jodit.createInside, true);
+  if (commitStyle.elementIsList) {
+    return wrapList(commitStyle, wrapper, jodit);
+  }
+  const newWrapper = Dom.replace(wrapper, commitStyle.element, jodit.createInside, true);
+  if (commitStyle.elementIsBlock) {
+    css(newWrapper, "fontSize", null);
+    css(newWrapper, "fontWeight", null);
+    if (!attr(newWrapper, "style")) {
+      attr(newWrapper, "style", null);
+    }
+  }
+  return newWrapper;
 }
 var WRAP_NODES = /* @__PURE__ */ new Set([
   "td",
@@ -19023,8 +19061,9 @@ var addNewLine = class extends Plugin {
     }
   }
   __onMouseMove(e42) {
+    var _a2;
     const editor = this.j;
-    let currentElement = editor.ed.elementFromPoint(e42.clientX, e42.clientY);
+    let currentElement = ((_a2 = editor.o.shadowRoot) !== null && _a2 !== void 0 ? _a2 : editor.ed).elementFromPoint(e42.clientX, e42.clientY);
     if (!Dom.isHTMLElement(currentElement) || !Dom.isOrContains(editor.editor, currentElement)) {
       return;
     }
@@ -19160,13 +19199,20 @@ function checkJoinNeighbors(jodit, fakeNode, backspace2) {
       jodit.s.setCursorBefore(fakeNode);
       return true;
     }
-    if (sibling && (checkMoveListContent(jodit, mainClosestBox, sibling, backspace2) || moveContentAndRemoveEmpty(jodit, mainClosestBox, sibling, backspace2))) {
+    if (sibling && (checkMoveListContent(jodit, mainClosestBox, sibling, backspace2) || moveContentAndRemoveEmpty(jodit, mainClosestBox, resolveTableSibling(sibling, backspace2), backspace2))) {
       jodit.s.setCursorBefore(fakeNode);
       return true;
     }
   }
   return false;
 }
+function resolveTableSibling(sibling, backspace2) {
+  if (!Dom.isTag(sibling, "table")) {
+    return sibling;
+  }
+  const cells = sibling.querySelectorAll("td,th");
+  return cells.length ? cells[backspace2 ? cells.length - 1 : 0] : null;
+}
 function checkMoveListContent(jodit, mainClosestBox, sibling, backspace2) {
   const siblingIsList = Dom.isTag(sibling, LIST_TAGS);
   const boxIsList = Dom.isTag(mainClosestBox, LIST_TAGS);
@@ -20993,26 +21039,19 @@ function color(editor) {
     group: "color"
   });
   const callback = (command, second, third) => {
+    var _a2;
     const colorHEX = normalizeColor(third);
-    switch (command) {
-      case "background":
-        editor.s.commitStyle({
-          attributes: {
-            style: {
-              backgroundColor: !colorHEX ? "" : colorHEX
-            }
-          }
-        });
-        break;
-      case "forecolor":
-        editor.s.commitStyle({
-          attributes: {
-            style: {
-              color: !colorHEX ? "" : colorHEX
-            }
-          }
-        });
-        break;
+    const value = !colorHEX ? "" : colorHEX;
+    const style = command === "background" ? { backgroundColor: value } : { color: value };
+    const selectedCells = editor.getInstance("Table", editor.o).getAllSelectedCells();
+    if (selectedCells.length && editor.s.isCollapsed()) {
+      selectedCells.forEach((cell) => {
+        editor.s.select(cell, true);
+        editor.s.commitStyle({ attributes: { style } });
+      });
+      (_a2 = editor.s.sel) === null || _a2 === void 0 ? void 0 : _a2.removeAllRanges();
+    } else {
+      editor.s.commitStyle({ attributes: { style } });
     }
     editor.synchronizeValues();
     return false;
@@ -24504,10 +24543,26 @@ var inlinePopup = class extends Plugin {
     this.j.async.setTimeout(() => {
       const sel = this.j.s.sel;
       if (sel && !sel.isCollapsed) {
-        this.showPopup(() => this.j.s.range.getBoundingClientRect(), "selection");
+        this.showPopup(() => this.__selectionBound(), "selection");
       }
     }, 1);
   }
+  /**
+   * The selection rect comes from the editor document — in iframe mode its
+   * coordinates are iframe-local, while the popup lives in the host
+   * document, so the iframe offset must be added. See
+   * https://github.com/xdan/jodit/issues/1058
+   */
+  __selectionBound() {
+    const rect = this.j.s.range.getBoundingClientRect();
+    let { left, top } = rect;
+    if (this.j.iframe) {
+      const offset2 = position(this.j.iframe, this.j, true);
+      left += offset2.left;
+      top += offset2.top;
+    }
+    return { left, top, width: rect.width, height: rect.height };
+  }
   onSelectionStart() {
     this.snapRange = this.j.s.range.cloneRange();
   }
@@ -24540,7 +24595,7 @@ var inlinePopup = class extends Plugin {
     if (!node) {
       return;
     }
-    this.showPopup(() => range.getBoundingClientRect(), type);
+    this.showPopup(() => this.__selectionBound(), type);
   }
   /**
    * In not collapsed selection - only one image
@@ -26107,6 +26162,7 @@ Config.prototype.controls.paste = {
   tooltip: "Paste from clipboard",
   exec(_0, _1, _22) {
     return __async(this, arguments, function* (editor, _12, { control }) {
+      var _a2;
       if (control.name === psKey) {
         editor.execCommand("showPasteStorage");
         return;
@@ -26117,7 +26173,9 @@ Config.prototype.controls.paste = {
         try {
           const items = yield navigator.clipboard.read();
           if (items && items.length) {
-            const textBlob = yield items[0].getType(TEXT_PLAIN);
+            const item = items[0];
+            const type = ((_a2 = item.types) === null || _a2 === void 0 ? void 0 : _a2.includes(TEXT_HTML)) ? TEXT_HTML : TEXT_PLAIN;
+            const textBlob = yield item.getType(type);
             text = yield new Response(textBlob).text();
           }
           error2 = false;
@@ -28086,20 +28144,27 @@ var UISearch = class UISearch2 extends UIElement {
       return false;
     }).on(this.queryInput, "input", () => {
       this.setMod("empty-query", !trim(this.queryInput.value).length);
-    }).on(this.queryInput, "keydown", this.j.async.debounce((e42) => __async(this, null, function* () {
-      switch (e42.key) {
-        case KEY_ENTER:
+    }).on(this.queryInput, "keydown", (() => {
+      const debounced = this.j.async.debounce((e42) => __async(this, null, function* () {
+        switch (e42.key) {
+          case KEY_ENTER:
+            if (yield jodit.e.fire("searchNext")) {
+              this.close();
+            }
+            break;
+          default:
+            jodit.e.fire(this, "needUpdateCounters");
+            break;
+        }
+      }), this.j.defaultTimeout);
+      return (e42) => {
+        if (e42.key === KEY_ENTER) {
           e42.preventDefault();
           e42.stopImmediatePropagation();
-          if (yield jodit.e.fire("searchNext")) {
-            this.close();
-          }
-          break;
-        default:
-          jodit.e.fire(this, "needUpdateCounters");
-          break;
-      }
-    }), this.j.defaultTimeout));
+        }
+        debounced(e42);
+      };
+    })());
   }
   onEditorKeyDown(e42) {
     if (!this.isOpened) {
@@ -28793,14 +28858,14 @@ var selectCells = class extends Plugin {
    * Mouse move inside the table
    */
   __onMove(table2, e42) {
-    var _a2;
+    var _a2, _b;
     if (this.j.o.readonly && !this.j.isLocked) {
       return;
     }
     if (this.j.isLockedNotBy(key2)) {
       return;
     }
-    const node = this.j.ed.elementFromPoint(e42.clientX, e42.clientY);
+    const node = ((_a2 = this.j.o.shadowRoot) !== null && _a2 !== void 0 ? _a2 : this.j.ed).elementFromPoint(e42.clientX, e42.clientY);
     if (!node) {
       return;
     }
@@ -28823,7 +28888,7 @@ var selectCells = class extends Plugin {
     }
     const cellsCount = this.__tableModule.getAllSelectedCells().length;
     if (cellsCount > 1) {
-      (_a2 = this.j.s.sel) === null || _a2 === void 0 ? void 0 : _a2.removeAllRanges();
+      (_b = this.j.s.sel) === null || _b === void 0 ? void 0 : _b.removeAllRanges();
     }
     this.j.e.fire("hidePopup");
     e42.stopPropagation();
@@ -28854,13 +28919,13 @@ var selectCells = class extends Plugin {
    * Stop a selection process
    */
   __onStopSelection(table2, e42) {
-    var _a2, _b;
+    var _a2, _b, _c;
     if (!this.__selectedCell) {
       return;
     }
     this.__isSelectionMode = false;
     this.j.unlock();
-    const node = this.j.ed.elementFromPoint(e42.clientX, e42.clientY);
+    const node = ((_a2 = this.j.o.shadowRoot) !== null && _a2 !== void 0 ? _a2 : this.j.ed).elementFromPoint(e42.clientX, e42.clientY);
     if (!node) {
       return;
     }
@@ -28876,7 +28941,7 @@ var selectCells = class extends Plugin {
       cell,
       this.__selectedCell
     ]), box = this.__tableModule.formalMatrix(table2);
-    const max = (_a2 = box[bound[1][0]]) === null || _a2 === void 0 ? void 0 : _a2[bound[1][1]], min = (_b = box[bound[0][0]]) === null || _b === void 0 ? void 0 : _b[bound[0][1]];
+    const max = (_b = box[bound[1][0]]) === null || _b === void 0 ? void 0 : _b[bound[1][1]], min = (_c = box[bound[0][0]]) === null || _c === void 0 ? void 0 : _c[bound[0][1]];
     if (!min || !max) {
       return;
     }
@@ -31281,7 +31346,9 @@ var aiAssistant = class extends Plugin {
     return new UiAiAssistant(jodit, {
       onInsertAfter(html) {
         jodit.s.focus();
-        jodit.s.setCursorAfter(jodit.s.current());
+        const range = jodit.s.range;
+        range.collapse(false);
+        jodit.s.selectRange(range);
         jodit.s.insertHTML(html);
         __dialog.close();
       },
@@ -33117,6 +33184,13 @@ var Jodit2 = Jodit_1 = class Jodit3 extends ViewWithToolbar {
     const init2 = () => {
       if (opt.enableDragAndDropFileToEditor && opt.uploader && (opt.uploader.url || opt.uploader.insertImageAsBase64URI)) {
         this.uploader.bind(this.editor);
+      } else if (!opt.enableDragAndDropFileToEditor) {
+        this.e.on(editor, "drop", (e42) => {
+          var _a2, _b;
+          if ((_b = (_a2 = e42.dataTransfer) === null || _a2 === void 0 ? void 0 : _a2.files) === null || _b === void 0 ? void 0 : _b.length) {
+            e42.preventDefault();
+          }
+        });
       }
       if (!this.__elementToPlace.get(this.editor)) {
         this.__elementToPlace.set(this.editor, currentPlace);

package/build/esm/index.mjs

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