@ones-editor/editor 2.2.9 → 2.2.10-beta.3

package/@ones-editor/ui-base/src/command-bar/command-bar.d.ts

@@ -56,4 +56,5 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     static registerManualCommandBar(type: string, creator: CreateManualCommandBarFunction): void;
     static createSubCommandBar(item: CommandItem, closeable: Closeable, options?: CommandBarOptions): AbstractManualCommandBar;
     static hasExistsCommandBar(): boolean;
+    static hideAll(): void;
 }

package/dist/index.js

@@ -11559,7 +11559,7 @@ var __publicField = (obj, key, value) => {
           }
           this.editor.selectionHandler.handleMouseDown(event, { autoScroll: true });
         }
-        this.editor.input.focus();
+        this.editor.input.focus({ preventScroll: true });
       });
       __publicField(this, "handleMouseMove", (event) => {
         assert(logger$4p, this.mouseDownEvent, "no mouse down event");
@@ -13107,7 +13107,8 @@ var __publicField = (obj, key, value) => {
       if (pointX < rect.left) {
         x = rect.left;
       } else if (pointX > rect.right) {
-        x = rect.right - 50;
+        const offset = targetBlock && isTextKindBlock(editor, targetBlock) ? 3 : 50;
+        x = rect.right - offset;
       }
     }
     for (let i = 0; i < yOffsets.length; i++) {
@@ -14456,10 +14457,6 @@ var __publicField = (obj, key, value) => {
       }
       if (isTextBlockContentBoxChild(child)) {
         const boxChild = child;
-        const nextChild = children[i + 1];
-        if (!nextChild) {
-          break;
-        }
         const prevChild = children[i - 1];
         if (prevChild) {
           if (endAtNewLine(prevChild, boxChild)) {
@@ -14476,6 +14473,10 @@ var __publicField = (obj, key, value) => {
             });
           }
         }
+        const nextChild = children[i + 1];
+        if (!nextChild) {
+          break;
+        }
         if (nextChildStartsNewLine(boxChild, nextChild)) {
           offset += 1;
           lineBreaks.push({
@@ -39899,17 +39900,23 @@ ${codeText}
           return true;
         }
         if (event.key === "ArrowUp") {
-          const prev = this.getPrevItemIndex(this.getSelectedItemIndex());
-          this.startPauseMouseEnter();
-          this.selectItem(this.items[prev].id);
-          event.preventDefault();
-          event.stopPropagation();
+          const curr = this.getSelectedItemIndex();
+          const prev = this.getPrevItemIndex(curr);
+          if (curr !== prev) {
+            this.startPauseMouseEnter();
+            this.selectItem(this.items[prev].id);
+            event.preventDefault();
+            event.stopPropagation();
+          }
         } else if (event.key === "ArrowDown") {
-          const next2 = this.getNextItemIndex(this.getSelectedItemIndex());
-          this.startPauseMouseEnter();
-          this.selectItem(this.items[next2].id);
-          event.preventDefault();
-          event.stopPropagation();
+          const curr = this.getSelectedItemIndex();
+          const next2 = this.getNextItemIndex(curr);
+          if (curr !== next2) {
+            this.startPauseMouseEnter();
+            this.selectItem(this.items[next2].id);
+            event.preventDefault();
+            event.stopPropagation();
+          }
         } else if (event.key === "ArrowRight") {
           const item = this.getSelectedItem();
           if (item && item.children) {
@@ -40481,6 +40488,9 @@ ${codeText}
     static hasExistsCommandBar() {
       return !!document.querySelector("[data-command-bar-id]");
     }
+    static hideAll() {
+      tippy$1.hideAll();
+    }
   };
   let CommandBar = _CommandBar;
   __publicField(CommandBar, "commandBarCreators", /* @__PURE__ */ new Map());
@@ -52278,6 +52288,7 @@ ${codeText}
       __publicField(this, "editMathjaxPopup", null);
       __publicField(this, "onChange", null);
       __publicField(this, "tex", "");
+      __publicField(this, "oldTex", "");
       __publicField(this, "observer", null);
       __publicField(this, "handleClose", (commandBar2) => {
         var _a;
@@ -52301,6 +52312,10 @@ ${codeText}
       });
       __publicField(this, "handleChange", debounce__default.default((text2) => {
         var _a;
+        if (text2 === this.oldTex) {
+          return;
+        }
+        this.oldTex = text2;
         (_a = this.onChange) == null ? void 0 : _a.call(this, text2, false);
       }, 300));
     }
@@ -52313,6 +52328,7 @@ ${codeText}
         const textarea2 = this.getTextarea();
         textarea2.value = tex;
       }
+      this.oldTex = tex;
       this.tex = tex;
       this.editMathjaxPopup.manualShow(elem, { theme: "light", placement: options == null ? void 0 : options.placement });
       this.editMathjaxPopup.removeAllListeners("close");
@@ -52608,7 +52624,7 @@ ${codeText}
     }
     const data2 = editor.getBlockData(block);
     const embedData = data2.embedData;
-    editMathjax(editor, elem, embedData.mathjaxText, async (tex) => {
+    editMathjax(editor, block, embedData.mathjaxText, async (tex) => {
       const { resourceId: src, width, height } = await convertAndUploadMathjaxForEmbed(editor, tex);
       const newData = {
         mathjaxText: tex,
@@ -60866,7 +60882,6 @@ $$${mathData.mathjaxText}$$
             editor.selection.setSelection(anchor2, void 0, { noScroll: direction === "next" });
           }
         }
-        editor.focus();
         if (direction === "next") {
           const targetElementRect = targetElement.getBoundingClientRect();
           const clientHeight = editor.scrollContainer.clientHeight;
@@ -62904,6 +62919,7 @@ $$${mathData.mathjaxText}$$
       dropdown2.setSelectedId(codeData.language);
       selectCodeBlock(editor2, block, { focusToEditor: false });
       setTimeout(() => {
+        CommandBar.hideAll();
         dropdown2.show(select2);
       });
       addClass(codeBlock2, "editing-language");
@@ -88068,20 +88084,32 @@ ${data2.flowchartText}
       return docx.Packer.toBlob(doc2);
     }
   }
+  class ExportImageError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = this.constructor.name;
+    }
+  }
   const logger$1 = getLogger("editor-to-docx");
+  const ERROR_MESSAGE = "editor-to-docx: read image error";
   async function readImage(editor, _appId, _docId, _src) {
-    const url = editor.doc.buildResourceUrl(_src, { withToken: true });
-    let file2 = await downloadImageToFile$1(url);
-    if (!file2)
-      return [void 0, url];
-    if (file2.type.indexOf("/svg") !== -1) {
-      const pngFile = await convertImageFileToPng(file2);
-      if (pngFile) {
-        file2 = new File([pngFile], file2.name);
+    try {
+      const url = editor.doc.buildResourceUrl(_src, { withToken: true });
+      let file2 = await downloadImageToFile$1(url);
+      if (!file2) {
+        throw new Error(ERROR_MESSAGE);
       }
+      if (file2.type.indexOf("/svg") !== -1) {
+        const pngFile = await convertImageFileToPng(file2);
+        if (pngFile) {
+          file2 = new File([pngFile], file2.name);
+        }
+      }
+      const arrayBuffer = await file2.arrayBuffer();
+      return [arrayBuffer, url];
+    } catch (error2) {
+      throw new ExportImageError(error2.message || ERROR_MESSAGE);
     }
-    const arrayBuffer = await file2.arrayBuffer();
-    return [arrayBuffer, url];
   }
   async function getDocByBlock(editor, doc2, block) {
     const blockClass = editor.editorBlocks.getBlockClass(block.type);
@@ -88315,7 +88343,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.2.9";
+    editor.version = "2.2.10-beta.3";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -88416,7 +88444,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.9";
+    editor.version = "2.2.10-beta.3";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -134195,6 +134223,7 @@ ${data2.flowchartText}
   exports2.EmbedBlockResizer = EmbedBlockResizer;
   exports2.EnforceWithDocumentTitleHandler = EnforceWithDocumentTitleHandler;
   exports2.EventCallbacks = EventCallbacks;
+  exports2.ExportImageError = ExportImageError;
   exports2.FILL_CHAR = FILL_CHAR;
   exports2.FileExtError = FileExtError;
   exports2.FixedToolbar = FixedToolbar;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.2.9",
+  "version": "2.2.10-beta.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,6 +31,7 @@
     "lodash.findlastindex": "^4.6.0",
     "lodash.intersection": "^4.4.0",
     "lodash.isequal": "^4.5.0",
+    "lodash.memoize": "^4.1.2",
     "lodash.merge": "^4.6.2",
     "lodash.pick": "^4.4.0",
     "lodash.throttle": "^4.1.1",