@ones-editor/editor 2.1.1-beta.27 → 2.1.1-beta.29

package/@ones-editor/ui/src/providers/align.d.ts

@@ -1,10 +1,11 @@
-import { BlockElement, CommandItem, DocBlock, OnesEditor, OnesEditorCommandProvider, SelectionRange } from '../../../../@ones-editor/core';
+import { BlockElement, CommandItem, CommandParams, DocBlock, OnesEditor, OnesEditorCommandProvider, SelectionRange } from '../../../../@ones-editor/core';
 export default class AlignProvider implements OnesEditorCommandProvider {
     private editor;
     id: string;
     constructor(editor: OnesEditor);
     isChecked(blockData: DocBlock, id: string): boolean;
-    getAvailableCommands(editor: OnesEditor, block: BlockElement): CommandItem[];
+    isDisable(block: BlockElement): boolean;
+    getAvailableCommands(editor: OnesEditor, block: BlockElement, range: SelectionRange, params?: CommandParams): CommandItem[];
     getInsertCommands: () => never[];
     executeCommand(editor: OnesEditor, block: BlockElement, range: SelectionRange, command: CommandItem): boolean;
 }

package/@ones-editor/ui/src/providers/heading.d.ts

@@ -6,7 +6,7 @@ export default class HeadingProvider implements OnesEditorCommandProvider {
     constructor(editor: OnesEditor, options?: CommandParams | undefined);
     getHeadingIndex(): number;
     createHeadingCommandItem(heading: number): CommandItem[];
-    getAvailableCommands(editor: OnesEditor, block: BlockElement): CommandItem[];
+    getAvailableCommands(editor: OnesEditor, block: BlockElement, range: SelectionRange, params?: CommandParams): CommandItem[];
     getInsertCommands(): CommandItem[];
     executeInsertCommand: (editor: OnesEditor, containerId: string, blockIndex: number, command: CommandItem) => boolean;
     executeCommand(editor: OnesEditor, block: BlockElement, range: SelectionRange, command: CommandItem): boolean;

package/dist/index.js

@@ -45904,7 +45904,7 @@ ${codeText}
             applyHeadingStyle(editor, newBlock, Number.parseInt((_a = command.value) != null ? _a : "1", 10) || 1);
           }
         });
-        return false;
+        return true;
       });
       this.editor = editor;
       this.options = options;
@@ -45946,13 +45946,20 @@ ${codeText}
       }
       return children;
     }
-    getAvailableCommands(editor, block) {
-      if (!isTextKindBlock(editor, block)) {
+    getAvailableCommands(editor, block, range, params) {
+      const disable = !isTextKindBlock(editor, block);
+      if (disable && (params == null ? void 0 : params.isFilter)) {
         return [];
       }
       const blockData = editor.getBlockData(block);
       const heading = blockData.heading;
       const headingItems = this.createHeadingCommandItem(heading || 0);
+      if (disable) {
+        headingItems.forEach((command) => {
+          var _a;
+          return (_a = command.states) == null ? void 0 : _a.push("disabled");
+        });
+      }
       return headingItems;
     }
     getInsertCommands() {
@@ -46048,7 +46055,7 @@ ${codeText}
             childrenPlacement: "bottom-start",
             defaultCheckedChildren: ["text"],
             children: commands,
-            childrenType: "toolbar"
+            childrenType: "menu"
           }
         ];
       });
@@ -49075,17 +49082,24 @@ ${codeText}
       }
       return false;
     }
-    getAvailableCommands(editor, block) {
+    isDisable(block) {
       const isMedia = isEmbedBlock(block) && ALLOW_ALIGN_EMBED.includes(getEmbedType(block));
       const isSingleBlock = isMedia;
-      if (!isTextKindBlock(editor, block) && !isMedia && !isSingleBlock) {
-        return [];
+      if (!isTextKindBlock(this.editor, block) && !isMedia && !isSingleBlock) {
+        return true;
       }
-      if (isSelectBoxOnly(editor)) {
+      if (isSelectBoxOnly(this.editor)) {
+        return true;
+      }
+      return false;
+    }
+    getAvailableCommands(editor, block, range, params) {
+      const disable = this.isDisable(block);
+      if (disable && (params == null ? void 0 : params.isFilter)) {
         return [];
       }
       const blockData = editor.getBlockData(block);
-      return [{
+      const commands = [{
         id: "align-left",
         name: i18n$1.t("commands.alignLeft"),
         icon: AlignLeftIcon,
@@ -49101,12 +49115,16 @@ ${codeText}
         icon: AlignRightIcon,
         states: this.isChecked(blockData, "right") ? ["checked"] : []
       }];
+      if (disable) {
+        commands.forEach((command) => {
+          var _a;
+          return (_a = command.states) == null ? void 0 : _a.push("disabled");
+        });
+      }
+      return commands;
     }
     executeCommand(editor, block, range, command) {
-      if (!isTextKindBlock(editor, block)) {
-        return false;
-      }
-      if (isSelectBoxOnly(editor)) {
+      if (this.isDisable(block)) {
         return false;
       }
       if (command.id.startsWith("align")) {
@@ -56891,15 +56909,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) => {
@@ -56936,15 +56954,15 @@ $$${mathData.mathjaxText}$$
         const blockId = getBlockId(block);
         assert(logger$1M, range.isSimple(), "invalid range");
         const offset = range.start.offset;
-        for (const provider of this.quickProviders) {
-          const params2 = { from: "quick-menu", blockId, offset };
-          (_d = provider.executeCommand) == null ? void 0 : _d.call(provider, editor, item, params2);
-        }
         for (const [id, provider] of this.providersMap) {
-          if ((_e = provider.executeCommand) == null ? void 0 : _e.call(provider, editor, block, range, item, params)) {
+          if ((_d = provider.executeCommand) == null ? void 0 : _d.call(provider, editor, block, range, item, params)) {
             return true;
           }
         }
+        for (const provider of this.quickProviders) {
+          const params2 = { from: "quick-menu", blockId, offset };
+          (_e = provider.executeCommand) == null ? void 0 : _e.call(provider, editor, item, params2);
+        }
         return false;
       });
       this.editor = editor;
@@ -57546,7 +57564,7 @@ $$${mathData.mathjaxText}$$
         this.block = block;
         this.range = range;
         for (const provider of this.providers) {
-          this.commands.push(...((_a = provider.getAvailableCommands) == null ? void 0 : _a.call(provider, editor, block, range)) || []);
+          this.commands.push(...((_a = provider.getAvailableCommands) == null ? void 0 : _a.call(provider, editor, block, range, { isFilter: true })) || []);
         }
         const createCommandElement = () => {
           const wrap = createElement("div", ["text-styles"], null);
@@ -84918,7 +84936,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.27";
+    editor.version = "2.1.1-beta.29";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -85015,7 +85033,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.27";
+    editor.version = "2.1.1-beta.29";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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