@ones-editor/editor 2.1.0-beta.3 → 2.1.0-beta.5

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

@@ -24,6 +24,7 @@ export declare class ReadonlyToolbar implements OnesEditorCustom {
     handleDocumentMouseUp: () => void;
     handleSelectionChange: import("lodash").DebouncedFunc<(editor: OnesEditor) => void>;
     private handleHoveringBlockChildChange;
+    groupCommands: (allCommands: CommandItem[]) => CommandItem[];
     showTextToolbar(reason: string): void;
     showObjectToolbar(event: MouseEvent | null): void;
 }

package/dist/index.js

@@ -48004,7 +48004,7 @@ ${codeText}
     }
   }
   const logger$1S = getLogger("toolbar-handler");
-  const SEP = {
+  const SEP$1 = {
     id: "",
     name: "",
     type: "separator"
@@ -48279,7 +48279,7 @@ ${codeText}
         });
         toolbarCommands.push(...sortCommands);
         if (index2 !== toolbarCommandsChunk.length - 1) {
-          toolbarCommands.push(SEP);
+          toolbarCommands.push(SEP$1);
         }
       });
       if (toolbarCommands.length === 0) {
@@ -55931,6 +55931,11 @@ $$${mathData.mathjaxText}$$
     "ja-JP": jaJP$s
   });
   const logger$1K = getLogger("readonly-toolbar");
+  const SEP = {
+    id: "",
+    name: "",
+    type: "separator"
+  };
   class ReadonlyToolbar {
     constructor(editor) {
       __publicField(this, "toolbar");
@@ -56028,6 +56033,31 @@ $$${mathData.mathjaxText}$$
         }
         this.showObjectToolbar(event);
       });
+      __publicField(this, "groupCommands", (allCommands) => {
+        var _a, _b;
+        const allCommandsMap = /* @__PURE__ */ new Map();
+        for (let i = 0; i < allCommands.length; i++) {
+          const groupOrder = (_a = allCommands[i].groupOrder) != null ? _a : 0;
+          if (allCommandsMap.has(groupOrder)) {
+            (_b = allCommandsMap.get(groupOrder)) == null ? void 0 : _b.push(allCommands[i]);
+          } else {
+            allCommandsMap.set(groupOrder, [allCommands[i]]);
+          }
+        }
+        const commandsChunk = [];
+        allCommandsMap.forEach((value) => {
+          commandsChunk.push(value.sort((item1, item2) => {
+            var _a2, _b2;
+            return ((_a2 = item1.order) != null ? _a2 : 0) - ((_b2 = item2.order) != null ? _b2 : 0);
+          }));
+        });
+        if (commandsChunk.length === 0) {
+          return [];
+        }
+        const commands = commandsChunk.reduce((prev, curr) => prev.concat([SEP, ...curr]), []);
+        commands.shift();
+        return commands;
+      });
       this.editor = editor;
       const popover = editor.options.componentsOptions.popover;
       this.toolbar = new ManualToolbar([], void 0, {
@@ -56076,7 +56106,7 @@ $$${mathData.mathjaxText}$$
     }
     showTextToolbar(reason) {
       var _a, _b;
-      const commands = [];
+      let commands = [];
       const range = this.editor.selection.range;
       this.providers.forEach((provider) => {
         if (provider.getTextCommands) {
@@ -56090,6 +56120,7 @@ $$${mathData.mathjaxText}$$
           commands.push(...textCommands);
         }
       });
+      commands = this.groupCommands(commands);
       if (commands.length === 0) {
         this.toolbar.close("cancelBar");
         return;
@@ -82865,7 +82896,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.0-beta.3";
+    editor.version = "2.1.0-beta.5";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -82960,7 +82991,7 @@ ${data2.flowchartText}
     if (!clientType.isMobile) {
       OnesEditorToolbar.register(editor);
     }
-    editor.version = "2.1.0-beta.3";
+    editor.version = "2.1.0-beta.5";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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