@ones-editor/editor 2.1.1-beta.25 → 2.1.1-beta.28

package/@ones-editor/ui/src/readonly-toolbar/index.d.ts

@@ -26,5 +26,4 @@ export declare class ReadonlyToolbar implements OnesEditorCustom {
     private handleHoveringBlockChildChange;
     groupCommands: (allCommands: CommandItem[]) => CommandItem[];
     showTextToolbar(reason: string): void;
-    showObjectToolbar(event: MouseEvent | null): void;
 }

package/@ones-editor/ui/src/toolbar/toolbar-handler.d.ts

@@ -28,6 +28,7 @@ export default class OnesEditorToolbar implements OnesEditorHoveringBlockFilter,
     unbindEvents(): void;
     handleDocumentMouseDown: (event: MouseEvent) => void;
     handleDocumentMouseUp: () => void;
+    isHoveringBlockContent(block: BlockElement): boolean;
     private handleHoveringBlockChildChange;
     handleSelectionChange: import("lodash").DebouncedFunc<(editor: OnesEditor) => void>;
     updateItems(updater: (items: CommandItem[]) => CommandItem[]): void;

package/dist/index.js

@@ -439,7 +439,10 @@ div.comment-editor-root div.root.select-all > .container-blocks > div[data-type=
   position: absolute;
   pointer-events: none;
   z-index: -1;
-}.editor-command-bar.toolbar .color-button {
+}.editor-command-bar.toolbar .command-item.disabled .color-button {
+  color: #c7c7c7;
+}
+.editor-command-bar.toolbar .color-button {
   width: 24px;
   height: 24px;
   display: flex;
@@ -1978,6 +1981,9 @@ div.tippy-box[data-theme=editor-tooltip] > .tippy-content {
 }
 :root div.tippy-box[data-theme=editor-tooltip] > .tippy-content > div > span:nth-of-type(2) {
   font-weight: 400;
+}
+[data-command-bar-id] .command-item.disabled > .color-button svg {
+  color: #b2bccd;
 }:root {
   --mindmap-bg-color: #f0f2f4;
 }
@@ -49896,7 +49902,7 @@ ${codeText}
         if (this.toolbarType === "text" && this.toolbar.isVisible) {
           return;
         }
-        if (!block) {
+        if (!block || !this.isHoveringBlockContent(block)) {
           this.toolbar.close("fromHover");
           return;
         }
@@ -49998,6 +50004,16 @@ ${codeText}
     unbindEvents() {
       document.removeEventListener("mousedown", this.handleDocumentMouseDown);
     }
+    isHoveringBlockContent(block) {
+      const ele = OnesEditorHoveringBlock.get(this.editor).hoveringElem;
+      if (!ele)
+        return false;
+      if (!(ele instanceof Node))
+        return false;
+      if (ele === block)
+        return false;
+      return isChildNode(block, ele);
+    }
     updateItems(updater) {
       const updatedItems = updater(this.toolbar.items);
       this.toolbar.updateItems(updatedItems);
@@ -56875,15 +56891,15 @@ $$${mathData.mathjaxText}$$
             return true;
           }
         }
-        for (const provider of this.quickProviders) {
-          const params2 = { from: "block-menu", containerId, blockIndex };
-          (_d = provider.executeCommand) == null ? void 0 : _d.call(provider, editor, item, params2);
-        }
         for (const [id, provider] of this.providersMap) {
-          if ((_e = provider.executeInsertCommand) == null ? void 0 : _e.call(provider, editor, containerId, blockIndex, item, params)) {
+          if ((_d = provider.executeInsertCommand) == null ? void 0 : _d.call(provider, editor, containerId, blockIndex, item, params)) {
             return true;
           }
         }
+        for (const provider of this.quickProviders) {
+          const params2 = { from: "block-menu", containerId, blockIndex };
+          (_e = provider.executeCommand) == null ? void 0 : _e.call(provider, editor, item, params2);
+        }
         return false;
       });
       __publicField(this, "executeCommand", (editor, block, range, item, params) => {
@@ -58577,9 +58593,7 @@ $$${mathData.mathjaxText}$$
         }
         if (!block) {
           this.toolbar.close("fromHover");
-          return;
         }
-        this.showObjectToolbar(event);
       });
       __publicField(this, "groupCommands", (allCommands) => {
         var _a, _b;
@@ -58683,9 +58697,6 @@ $$${mathData.mathjaxText}$$
       }
       if (selectedBlocks.length === 1) {
         if (isEmbedBlock(firstBlock.block)) {
-          if (reason === "click") {
-            this.showObjectToolbar(null);
-          }
           return;
         }
         if (isComplexKindBlock(this.editor, firstBlock.block) && range.isSimple()) {
@@ -58708,8 +58719,6 @@ $$${mathData.mathjaxText}$$
       });
       (_b = (_a = this.toolbar.tippyInstance) == null ? void 0 : _a.popperInstance) == null ? void 0 : _b.update();
     }
-    showObjectToolbar(event) {
-    }
   }
   function getCommentAbstract(editor, blocks) {
     return blocks.map((block) => {
@@ -84909,7 +84918,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.25";
+    editor.version = "2.1.1-beta.28";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -85006,7 +85015,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.25";
+    editor.version = "2.1.1-beta.28";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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