@ones-editor/editor 2.9.8-beta.25 → 2.9.8-beta.27

package/dist/index.js

@@ -26431,6 +26431,10 @@ var __publicField = (obj, key, value) => {
       if (isNodeRemoved(this.editor.rootElement)) {
         return;
       }
+      const rootRect = this.editor.rootElement.getBoundingClientRect();
+      if (rootRect.width === 0 || rootRect.height === 0) {
+        return;
+      }
       const cursor = this.caretElem;
       if (this.hasCaret()) {
         cursor.style.display = "";
@@ -26439,42 +26443,46 @@ var __publicField = (obj, key, value) => {
         moveInputToScreenCenter(this.editor);
         return;
       }
-      const { range } = this.editor.selection;
-      assert(logger$3S, range.isCollapsed, "range is not collapsed");
-      const pos = range.start;
-      assert(logger$3S, pos instanceof EditorSimpleBlockPosition, "only simple block position can has caret");
-      const block = this.editor.getBlockById(pos.blockId);
-      assert(logger$3S, isTextKindBlock(this.editor, block), "only text kind block can has caret");
-      let rect;
-      const compositionSpan = block.querySelector("span.inputting-insertion");
-      if (compositionSpan) {
-        rect = getLastClientRect(compositionSpan);
-        rect = new DOMRect(rect.right, rect.top, 1, rect.height);
-      } else {
-        rect = getTextCaretRect(block, pos);
-      }
-      const editorRect = this.editor.contentElement.getBoundingClientRect();
-      const x = rect.left - editorRect.left;
-      const y = rect.top - editorRect.top;
-      cursor.style.left = `${x}px`;
-      cursor.style.top = `${y}px`;
-      cursor.style.height = `${rect.height}px`;
-      const input2 = this.editor.input.inputElement;
-      input2.style.left = `${x}px`;
-      input2.style.top = `${y + rect.height - 24}px`;
-      if (clientType.isMobileSafari) {
-        input2.style.left = `${x - 4}px`;
-        input2.style.height = `${rect.height}px`;
-      }
-      const scrollContainer = getScrollContainer$1(block, { horizontal: true });
-      const scrollRect = scrollContainer.getBoundingClientRect();
-      const scrollLeft = scrollRect.left - editorRect.left;
-      const scrollRight = scrollLeft + scrollRect.width;
-      if (x < scrollLeft || x > scrollRight) {
-        moveInputToScreenCenter(this.editor);
-        cursor.style.display = "none";
-      } else {
-        cursor.style.display = "";
+      try {
+        const { range } = this.editor.selection;
+        assert(logger$3S, range.isCollapsed, "range is not collapsed");
+        const pos = range.start;
+        assert(logger$3S, pos instanceof EditorSimpleBlockPosition, "only simple block position can has caret");
+        const block = this.editor.getBlockById(pos.blockId);
+        assert(logger$3S, isTextKindBlock(this.editor, block), "only text kind block can has caret");
+        let rect;
+        const compositionSpan = block.querySelector("span.inputting-insertion");
+        if (compositionSpan) {
+          rect = getLastClientRect(compositionSpan);
+          rect = new DOMRect(rect.right, rect.top, 1, rect.height);
+        } else {
+          rect = getTextCaretRect(block, pos);
+        }
+        const editorRect = this.editor.contentElement.getBoundingClientRect();
+        const x = rect.left - editorRect.left;
+        const y = rect.top - editorRect.top;
+        cursor.style.left = `${x}px`;
+        cursor.style.top = `${y}px`;
+        cursor.style.height = `${rect.height}px`;
+        const input2 = this.editor.input.inputElement;
+        input2.style.left = `${x}px`;
+        input2.style.top = `${y + rect.height - 24}px`;
+        if (clientType.isMobileSafari) {
+          input2.style.left = `${x - 4}px`;
+          input2.style.height = `${rect.height}px`;
+        }
+        const scrollContainer = getScrollContainer$1(block, { horizontal: true });
+        const scrollRect = scrollContainer.getBoundingClientRect();
+        const scrollLeft = scrollRect.left - editorRect.left;
+        const scrollRight = scrollLeft + scrollRect.width;
+        if (x < scrollLeft || x > scrollRight) {
+          moveInputToScreenCenter(this.editor);
+          cursor.style.display = "none";
+        } else {
+          cursor.style.display = "";
+        }
+      } catch (err) {
+        logger$3S.error(err);
       }
     }
   }
@@ -85717,7 +85725,6 @@ ${docStr}
     });
     setTimeout(() => {
       textarea2.setSelectionRange(0, 0);
-      textarea2.focus();
       textarea2.scrollTop = 0;
       textarea2.style.height = `${textarea2.scrollHeight}px`;
     }, 20);
@@ -85728,6 +85735,9 @@ ${docStr}
     assert(logger$n, textarea2 instanceof HTMLTextAreaElement, "Textarea is not HTMLTextAreaElement");
     return textarea2;
   };
+  function focusToCodeEditor(block) {
+    getCodeEditor(block).focus();
+  }
   const logger$m = getLogger("graph-dom/view-select");
   var ViewId = /* @__PURE__ */ ((ViewId2) => {
     ViewId2["Both"] = "both";
@@ -87753,7 +87763,10 @@ ${data2.plantumlText}
       subText: `/${base.graphType}`,
       name: i18n$1.t(`graph.${base.graphType}`),
       execute: (editor, containerId, blockIndex) => {
-        editor.insertEmbed(containerId, blockIndex, base.graphType, base.createEmptyEmbedData());
+        const block = editor.insertEmbed(containerId, blockIndex, base.graphType, base.createEmptyEmbedData());
+        setTimeout(() => {
+          focusToCodeEditor(block);
+        });
       }
     }];
   };
@@ -90313,9 +90326,6 @@ ${data2.plantumlText}
       super.destroy();
     }
   }
-  const ErrCode = {
-    ANALYZER_UNKNOWN_URL: "analyzer cannot recognize this url"
-  };
   class FigmaAnalyzer {
     constructor() {
       __publicField(this, "regex", /https:\/\/([\w.-]+\.)?figma.com\/.*$/i);
@@ -90481,10 +90491,17 @@ ${data2.plantumlText}
           return ret;
         }
       }
-      throw new Error(ErrCode.ANALYZER_UNKNOWN_URL);
+      return {
+        providerName: "unknown",
+        type: "iframe",
+        url
+      };
     }
   }
   const urlAnalyzer = new URLAnalyzer();
+  const ErrCode = {
+    ANALYZER_UNKNOWN_URL: "analyzer cannot recognize this url"
+  };
   const getCommandItems = () => [
     {
       name: i18n$1.t("webpage.bilibili"),
@@ -94387,6 +94404,8 @@ ${JSON.stringify(error2, null, 2)}`);
       __publicField(this, "manualShowChildren", true);
       __publicField(this, "childrenPlacement", "bottom-start");
       __publicField(this, "children", []);
+      __publicField(this, "allChildren", []);
+      this.editor = editor;
       const provider = new InsertMenuProvider(editor);
       const startBlock = editor.getBlockById(editor.selection.range.start.blockId);
       const container = getParentContainer(startBlock);
@@ -94396,6 +94415,31 @@ ${JSON.stringify(error2, null, 2)}`);
         commands = commands.slice(index2);
       }
       this.children = commands;
+      this.allChildren = commands;
+    }
+    beforePopup(subBar) {
+      const focusBlock = this.editor.selection.focusedBlock;
+      if (focusBlock.closest('[data-block-type="callout"]')) {
+        const children = this.allChildren.filter((c) => {
+          const textOnlyCommands = [
+            "insert-emoji",
+            "insert-link",
+            "insert-date",
+            "insert-status",
+            "insert-math",
+            "insert-task"
+          ];
+          if (textOnlyCommands.includes(c.id)) {
+            return true;
+          }
+          return false;
+        });
+        this.children = children;
+        subBar.updateItems(this.children);
+      } else {
+        this.children = this.allChildren;
+        subBar.updateItems(this.children);
+      }
     }
     onClick(editor, item, commandBar2) {
       const provider = new InsertMenuProvider(editor);
@@ -94807,6 +94851,9 @@ ${JSON.stringify(error2, null, 2)}`);
               }
               const parent = findParent(child, id);
               if (parent) {
+                if (!parent.onClick) {
+                  return item2;
+                }
                 return parent;
               }
             }
@@ -95468,7 +95515,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.9.8-beta.25";
+    editor.version = "2.9.8-beta.27";
     return editor;
   }
   function isDoc(doc2) {
@@ -95600,7 +95647,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "2.9.8-beta.25";
+    editor.version = "2.9.8-beta.27";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.9.8-beta.25",
+  "version": "2.9.8-beta.27",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {