@ones-editor/editor 2.1.1-beta.70 → 2.1.1-beta.72

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

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { CloseReason, CommandItem, Closeable } from '../../../../@ones-editor/core';
 import { AbstractManualCommandBar, AbstractCommandBar, CommandBarEvents, CommandBarOptions, CommandItemElement, CreateManualCommandBarFunction, ManualShowCommandBarOptions, SelectItemFrom } from './types';
@@ -31,7 +30,8 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     private getSelectedItemIndex;
     private getPrevItemIndex;
     private getNextItemIndex;
-    protected clearSelectedItem: import("lodash").DebouncedFunc<() => void>;
+    protected clearSelectedItem(): void;
+    private debounceClearSelectedItem;
     selectItem(id: string, from?: SelectItemFrom): void;
     private lastEnterPauseTime;
     private startPauseMouseEnter;

package/dist/index.js

@@ -148,6 +148,7 @@ div.editor-root div.editor-content div[data-type=editor-container] div[data-type
 div.editor-root div.editor-content div[data-type=editor-container] div[data-type=editor-block] div[data-type=block-content] > span.text.link:hover, div.editor-root div.editor-content div[data-type=editor-container] div[data-type=editor-block] div[data-type=block-content] > span.inputting-insertion.link:hover {
   cursor: pointer;
   color: #0053cf;
+  text-decoration: underline;
 }
 div.editor-root div.editor-content div[data-type=editor-container] div[data-type=editor-block] div[data-type=block-content] > span.text.link.style-strikethrough:hover, div.editor-root div.editor-content div[data-type=editor-container] div[data-type=editor-block] div[data-type=block-content] > span.inputting-insertion.link.style-strikethrough:hover {
   text-decoration: underline line-through;
@@ -39112,16 +39113,7 @@ ${codeText}
           disablePageScroll(this.id);
         }
       });
-      __publicField(this, "clearSelectedItem", debounce__default.default(() => {
-        const item = this.getSelectedItem();
-        if (!item) {
-          return;
-        }
-        const elem = this.getItemElementById(item.id);
-        if (elem) {
-          removeClass(elem, "selected");
-        }
-      }, 200));
+      __publicField(this, "debounceClearSelectedItem", debounce__default.default(this.clearSelectedItem, 200));
       __publicField(this, "lastEnterPauseTime", 0);
       __publicField(this, "startPauseMouseEnter", () => {
         this.lastEnterPauseTime = Date.now();
@@ -39182,7 +39174,7 @@ ${codeText}
         }
         if (clientType.isMobile) {
           this.selectItem(id);
-          this.clearSelectedItem();
+          this.debounceClearSelectedItem();
         }
         if (item.children && item.children.length > 0 && item.manualShowChildren) {
           this.showSubCommandBar(item.childrenMenuId);
@@ -39353,6 +39345,16 @@ ${codeText}
         }
       }
     }
+    clearSelectedItem() {
+      const item = this.getSelectedItem();
+      if (!item) {
+        return;
+      }
+      const elem = this.getItemElementById(item.id);
+      if (elem) {
+        removeClass(elem, "selected");
+      }
+    }
     selectItem(id, from = "event") {
       const exists = this.getSelectedItem();
       if (exists) {
@@ -50738,6 +50740,7 @@ ${codeText}
       }
       const block = this.hoveringBlock;
       const child = this.hoveringTextChild;
+      const isBoxChild = child && isTextBlockContentBoxChild(child);
       const { commands, element } = getObjectCommands(this.editor, block, child);
       if (!commands.length || !element) {
         this.toolbar.close("fromHover");
@@ -50762,7 +50765,7 @@ ${codeText}
           lineRects.push(y);
         });
         if (lineRects.length > 1) {
-          rect = child ? clientRects[clientRects.length - 1] : clientRects[0];
+          rect = isBoxChild ? clientRects[clientRects.length - 1] : clientRects[0];
           if (event) {
             for (let i = 0; i < clientRects.length; i++) {
               const clientRect = clientRects[i];
@@ -50775,7 +50778,7 @@ ${codeText}
           }
         } else {
           rect = element.getBoundingClientRect();
-          if (child) {
+          if (isBoxChild) {
             const childRect = child.getBoundingClientRect();
             return new DOMRect(childRect.x, childRect.y, childRect.width, childRect.height);
           }
@@ -61533,6 +61536,10 @@ $$${mathData.mathjaxText}$$
       return false;
     }
     filterCommands(editor, block, range, commands) {
+      const { start, end } = editor.selection.range;
+      if (start.blockId === end.blockId && isCodeBlock(block)) {
+        return [];
+      }
       if (isCodeTextBlock(editor, block)) {
         return [];
       }
@@ -65020,9 +65027,12 @@ ${codeText}
         });
       }
       const { enableComments = true } = this.editor.options;
-      if (!enableComments) {
+      if (!enableComments || this.editor.readonly) {
         standardCommands = standardCommands.filter((command) => command.id !== "add-comment");
       }
+      if (this.editor.readonly) {
+        standardCommands = standardCommands.filter((command) => command.id !== "edit");
+      }
       standardCommands.forEach((item) => {
         if (item.id === "add-comment" || item.id === "edit") {
           item.states = this.editor.isBlockWritable(this.block) ? [] : ["disabled"];
@@ -79804,15 +79814,15 @@ ${content}
         const commands = this.getCommands();
         this.toolbar.updateItems(commands);
         const focusBlock = this.editor.selection.focusedBlock;
-        const rect = getBlockCaretRect(this.editor, focusBlock, this.editor.selection.range.start);
-        const anchor2 = createBlockAnchor(this.editor, focusBlock, "editor-quick-menu", rect);
+        const rect = getBlockCaretRect(this.editor, focusBlock, this.editor.selection.range.focus);
+        const anchor2 = createBlockAnchor(this.editor, focusBlock, "editor-cursor-toolbar", rect);
         this.toolbar.manualShow(anchor2, {
           placement: "top",
           offset: [0, 14]
         });
       });
       __publicField(this, "close", () => {
-        this.toolbar.close("clickItem");
+        this.toolbar.close("cancelBar");
       });
       this.editor = editor;
       this.toolbar = new ManualToolbar([], void 0, {
@@ -80123,6 +80133,14 @@ ${content}
       this.mobileToolbar.addListener("subBarShown", this.handleSubBarShow);
       this.mobileToolbar.addListener("click", this.handleClick);
       this.editor.addListener("selectionChanged", this.handleSelectionChange);
+      setTimeout(() => {
+        const container = this.bar.firstChild;
+        if (container.scrollWidth > container.clientWidth) {
+          container.classList.add("overflowing");
+        } else {
+          container.classList.remove("overflowing");
+        }
+      }, 500);
     }
     destroy() {
       this.editor.removeListener("selectionChanged", this.handleSelectionChange);
@@ -80154,9 +80172,8 @@ ${content}
     constructor(editor) {
       __publicField(this, "commandBar");
       __publicField(this, "observer");
-      __publicField(this, "showKeyboard", false);
       __publicField(this, "toggleDelay", clientType.isSafari ? 800 : 100);
-      __publicField(this, "toggle", debounce__default.default(() => {
+      __publicField(this, "layoutBar", debounce__default.default(() => {
         const offsetHeight = Math.max(this.clientHeight - this.virtualViewportHeight, 0);
         this.commandBar.bar.style.bottom = `${offsetHeight}px`;
       }, this.toggleDelay));
@@ -80170,33 +80187,18 @@ ${content}
         }
       }, 100));
       __publicField(this, "handleFocusIn", () => {
-        if (!this.showKeyboard) {
-          this.showKeyboard = true;
-        }
-        this.toggle();
+        this.layoutBar();
       });
       __publicField(this, "handleFocusOut", () => {
-        if (this.showKeyboard) {
-          this.showKeyboard = false;
-        }
-        this.toggle();
+        this.layoutBar();
       });
       this.editor = editor;
-      createMobileBottomMenu();
       this.commandBar = new MobileToolbarHandler(editor, document.body);
       this.observer = new ActiveElementObserver({
         onFocused: this.handleFocusIn,
         onBlurred: this.handleFocusOut
       });
-      this.toggle();
-      setTimeout(() => {
-        const container = this.commandBar.bar.firstChild;
-        if (container.scrollWidth > container.clientWidth) {
-          container.classList.add("overflowing");
-        } else {
-          container.classList.remove("overflowing");
-        }
-      }, 500);
+      this.layoutBar();
       this.editor.scrollContainer.addEventListener("scroll", this.handScroll);
     }
     get window() {
@@ -80366,6 +80368,7 @@ ${content}
       this.gripper = new SelectionGripper(this.editor);
       this.cursorToolbar = createCursorToolbar(this.editor);
       this.mobileEmbedMask = new MobileEmbedMask(this.editor);
+      createMobileBottomMenu();
     }
     destroy() {
       this.editor.removeListener("selectionChanged", this.handleSelectionChange);
@@ -82228,8 +82231,8 @@ ${content}
   }
   function getBlockProperties$5(editor, block) {
     const properties = getStandardEmbedBlockProperties(editor, block, {
-      presetIds: editor.readonly ? [] : ["add-comment"],
-      extCommands: [{
+      presetIds: ["add-comment"],
+      extCommands: editor.readonly ? [] : [{
         id: "refresh",
         name: i18n$1.t("webpage.command.refresh"),
         icon: RefreshIcon
@@ -83043,8 +83046,8 @@ ${content}
           states: !drawioImg ? ["disabled"] : []
         }];
       },
-      presetIds: editor.readonly ? [] : ["edit"],
-      extIds: editor.readonly ? [] : ["separator", "add-comment"]
+      presetIds: ["edit"],
+      extIds: ["separator", "add-comment"]
     });
     return { ...properties, abstract: i18n$1.t("drawio.abstract") };
   }
@@ -83278,19 +83281,14 @@ ${content}
     plantuml: "https://plantuml.com/"
   };
   class GraphBlockCommands {
-    constructor(editor, graphType, properties) {
-      this.editor = editor;
+    constructor(graphType, properties) {
+      __publicField(this, "presetIds", ["edit"]);
+      __publicField(this, "extIds", ["separator", "add-comment"]);
       this.graphType = graphType;
       this.properties = properties;
     }
-    get presetIds() {
-      return this.editor.readonly ? [] : ["edit"];
-    }
-    get extIds() {
-      return this.editor.readonly ? [] : ["separator", "add-comment"];
-    }
     extCommands(editor, block) {
-      const commands = [
+      let commands = [
         {
           id: "help",
           name: i18n$1.t("graph.help"),
@@ -83306,6 +83304,9 @@ ${content}
         icon: DownloadIcon$1,
         states: !graphImgSrc ? ["disabled"] : []
       });
+      if (editor.readonly) {
+        commands = commands.filter((c) => c.id !== "help");
+      }
       return commands;
     }
     handleExecuteCommand(editor, block, item) {
@@ -83328,7 +83329,7 @@ ${content}
     }
   }
   function getGraphEmbedBlockProperties(editor, block, type, properties) {
-    const standardProperties = getStandardEmbedBlockProperties(editor, block, new GraphBlockCommands(editor, type, properties));
+    const standardProperties = getStandardEmbedBlockProperties(editor, block, new GraphBlockCommands(type, properties));
     return { ...standardProperties, abstract: lodash.exports.capitalize(type) };
   }
   class GraphBase {
@@ -86801,7 +86802,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.70";
+    editor.version = "2.1.1-beta.72";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -86902,7 +86903,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.70";
+    editor.version = "2.1.1-beta.72";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.1.1-beta.70",
+  "version": "2.1.1-beta.72",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",