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

package/@ones-editor/ui/src/quick-menu/types.d.ts

@@ -1,4 +1,4 @@
-import { CommandItem, BlockOptions, OnesEditor, BlockElement } from '../../../../@ones-editor/core';
+import { CommandItem, BlockOptions, OnesEditor, BlockElement, SelectionRange } from '../../../../@ones-editor/core';
 export interface QuickMenuItem extends CommandItem {
     itemType: 'insert-block';
     blockType?: string;
@@ -26,6 +26,7 @@ export interface QuickMenuCommandBetween extends QuickMenuCommandParams {
 export interface QuickMenuCommandProvider {
     getCommands: (editor: OnesEditor, params: QuickMenuCommandParams) => CommandItem[];
     executeCommand: (editor: OnesEditor, item: CommandItem, params: QuickMenuCommandInline | QuickMenuCommandBetween | AddMenuCommand) => Promise<BlockElement | null>;
+    filterCommands?: (editor: OnesEditor, items: CommandItem[], range: SelectionRange) => CommandItem[];
 }
 export interface QuickMenuOptions {
     id?: string;

package/@ones-editor/ui-base/src/input/create-input.d.ts

@@ -16,7 +16,7 @@ declare class EditorInput {
     private options;
     private unbindKeyDownEvent;
     constructor(parent: HTMLElement, options: EditorInputOptions);
-    private get container();
+    private container;
     private get errorContent();
     private get input();
     private get suffix();
@@ -30,7 +30,7 @@ declare class EditorInput {
     hideSuffix: () => void;
     handleInput: (e: Event) => void;
     handleClose: (e: Event) => void;
-    init(): HTMLInputElement;
+    init(): HTMLDivElement;
     destroy(): void;
 }
 export declare function createInput(parent: HTMLElement, options: EditorInputOptions): EditorInput;

package/dist/index.js

@@ -40818,6 +40818,7 @@ ${codeText}
   class EditorInput {
     constructor(parent, options) {
       __publicField(this, "unbindKeyDownEvent");
+      __publicField(this, "container");
       __publicField(this, "getField", () => this.input);
       __publicField(this, "getInputValue", () => this.input.value);
       __publicField(this, "setFieldError", (error2) => {
@@ -40872,24 +40873,21 @@ ${codeText}
       });
       this.parent = parent;
       this.options = options;
-      this.init();
+      this.container = this.init();
       this.input.addEventListener("input", this.handleInput);
       this.unbindKeyDownEvent = bindKeyDownEvent(this.input, this.handleKeyDown);
     }
-    get container() {
-      return this.parent.querySelector(".editor-input-wrap");
-    }
     get errorContent() {
-      return this.parent.querySelector(".editor-input-error");
+      return this.container.querySelector(".editor-input-error");
     }
     get input() {
-      return this.parent.querySelector(".editor-input");
+      return this.container.querySelector(".editor-input");
     }
     get suffix() {
-      return this.parent.querySelector(".editor-input-suffix");
+      return this.container.querySelector(".editor-input-suffix");
     }
     get prefix() {
-      return this.parent.querySelector(".editor-input-prefix");
+      return this.container.querySelector(".editor-input-prefix");
     }
     init() {
       const options = this.options;
@@ -40936,7 +40934,7 @@ ${codeText}
       }
       inputContainer.appendChild(input2);
       createElement("div", ["editor-input-error"], container);
-      return input2;
+      return container;
     }
     destroy() {
       this.input.removeEventListener("input", this.handleInput);
@@ -49035,8 +49033,8 @@ ${codeText}
             } else {
               blockIndex = getBlockIndex(nextBlock);
             }
+            editor.insertTextBlock("", containerId, blockIndex);
           }
-          editor.insertTextBlock("", containerId, blockIndex);
           insertLink(editor, containerId, blockIndex);
           return true;
         }
@@ -56724,8 +56722,8 @@ $$${mathData.mathjaxText}$$
             } else {
               blockIndex = getBlockIndex(nextBlock);
             }
+            editor.insertTextBlock("", containerId, blockIndex);
           }
-          editor.insertTextBlock("", containerId, blockIndex);
           switch (item.id) {
             case "insert-math":
               insertMath(editor, containerId, blockIndex);
@@ -77755,6 +77753,7 @@ ${codeText}
       });
     }
     filter(editor, range, items, source) {
+      var _a;
       if (!range.isCollapsed())
         return items;
       const { anchor: anchor2 } = range;
@@ -77764,17 +77763,25 @@ ${codeText}
         return items;
       if (getBlockType(parentBlock) !== "callout")
         return items;
-      function checkIsAllowMenuItems(item) {
-        if (item.group === "basics")
-          return true;
-        if (item.group === "system")
-          return true;
-        if (item.group === "common") {
-          return item.type === "section" || ["insert-link", "insert-status", "insert-math"].includes(item.id);
+      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;
         }
-        return false;
+        filterItems.push(item);
+      });
+      if (((_a = filterItems[filterItems.length - 1]) == null ? void 0 : _a.type) === "section") {
+        filterItems.pop();
       }
-      return items.filter(checkIsAllowMenuItems);
+      return filterItems;
     }
     destroy() {
     }
@@ -84967,7 +84974,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.31";
+    editor.version = "2.1.1-beta.33";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -85066,7 +85073,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.31";
+    editor.version = "2.1.1-beta.33";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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