@ones-editor/editor 2.1.1-beta.33 → 2.1.1-beta.35

package/dist/index.js

@@ -29685,7 +29685,7 @@ ${codeText}
     });
     return allCommands;
   }
-  const SEP$1 = {
+  const SEP$2 = {
     id: "",
     name: "",
     type: "separator"
@@ -29710,7 +29710,7 @@ ${codeText}
     if (commandsChunk.length === 0) {
       return [];
     }
-    const commands = commandsChunk.reduce((prev, curr) => prev.concat([SEP$1, ...curr]), []);
+    const commands = commandsChunk.reduce((prev, curr) => prev.concat([SEP$2, ...curr]), []);
     commands.shift();
     return commands;
   };
@@ -45762,6 +45762,48 @@ ${codeText}
     return rects[0];
   }
   const logger$22 = getLogger("object-commands");
+  const SEP$1 = {
+    id: "",
+    name: "",
+    type: "separator"
+  };
+  const 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$1, ...curr]), []);
+    commands.shift();
+    let start = 0;
+    return commands.filter((item, index2) => {
+      if (item.type === "separator") {
+        if (index2 === 0 || index2 === commands.length - 1) {
+          return false;
+        }
+        if (index2 - start === 1) {
+          return false;
+        }
+        start = index2;
+      }
+      return true;
+    });
+  };
   function getObjectCommands(editor, block, child) {
     const result = getSpecialBlockCommands(editor, block, child, "hovering-toolbar");
     const { element: targetElement, boxCommands, blockCommands } = result;
@@ -45793,7 +45835,7 @@ ${codeText}
     element = element || block;
     return {
       element,
-      commands
+      commands: groupCommands(commands)
     };
   }
   function executeObjectCommand(editor, block, child, item) {
@@ -64396,7 +64438,9 @@ ${codeText}
       }, {
         id: "add-comment",
         name: i18n$1.t("embedProperties.addComment"),
-        icon: CommentIcon$1
+        icon: CommentIcon$1,
+        groupOrder: 1e3,
+        order: 100
       }, {
         id: "separator",
         name: "",
@@ -73718,7 +73762,9 @@ ${codeText}
         {
           id: "add-comment",
           name: i18n$1.t("file.commands.comment"),
-          icon: CommentIcon$1
+          icon: CommentIcon$1,
+          groupOrder: 1e3,
+          order: 100
         },
         {
           id: "sep",
@@ -74040,7 +74086,9 @@ ${codeText}
       }, {
         id: "add-comment",
         name: i18n$1.t("file.commands.comment"),
-        icon: CommentIcon$1
+        icon: CommentIcon$1,
+        groupOrder: 1e3,
+        order: 100
       }, {
         id: "sep",
         name: "",
@@ -77753,7 +77801,6 @@ ${codeText}
       });
     }
     filter(editor, range, items, source) {
-      var _a;
       if (!range.isCollapsed())
         return items;
       const { anchor: anchor2 } = range;
@@ -77763,25 +77810,32 @@ ${codeText}
         return items;
       if (getBlockType(parentBlock) !== "callout")
         return items;
-      const filterItems = [];
-      items.forEach((item) => {
-        var _a2, _b;
-        const lastItem = filterItems[filterItems.length - 1];
-        if ((lastItem == null ? void 0 : lastItem.type) === "section" && item.type === "section")
-          return;
-        if (item.blockOptions)
-          return;
-        const ret = (_b = (_a2 = item.commandProvider) == null ? void 0 : _a2.filterCommands) == null ? void 0 : _b.call(_a2, editor, items, range);
-        if (ret) {
-          filterItems.push(...ret);
-          return;
+      const deep = (items2) => {
+        var _a;
+        const filterItems = [];
+        items2.forEach((item) => {
+          var _a2, _b;
+          const lastItem = filterItems[filterItems.length - 1];
+          if ((lastItem == null ? void 0 : lastItem.type) === "section" && item.type === "section")
+            return;
+          if (item.blockOptions)
+            return;
+          const ret = (_b = (_a2 = item.commandProvider) == null ? void 0 : _a2.filterCommands) == null ? void 0 : _b.call(_a2, editor, items2, range);
+          if (ret) {
+            filterItems.push(...ret);
+            return;
+          }
+          filterItems.push(item);
+          if (item.children) {
+            item.children = deep(item.children);
+          }
+        });
+        if (((_a = filterItems[filterItems.length - 1]) == null ? void 0 : _a.type) === "section") {
+          filterItems.pop();
         }
-        filterItems.push(item);
-      });
-      if (((_a = filterItems[filterItems.length - 1]) == null ? void 0 : _a.type) === "section") {
-        filterItems.pop();
-      }
-      return filterItems;
+        return filterItems;
+      };
+      return deep(items);
     }
     destroy() {
     }
@@ -84974,7 +85028,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.33";
+    editor.version = "2.1.1-beta.35";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -85073,7 +85127,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.33";
+    editor.version = "2.1.1-beta.35";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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