@ones-editor/editor 2.1.5 → 2.1.7

package/@ones-editor/ui-base/src/auto-suggest/auto-suggest-menu.d.ts

@@ -40,6 +40,6 @@ export default class AutoSuggestMenu {
     handleClick: import("lodash").DebouncedFuncLeading<(menu: AbstractCommandBar, item: CommandItem) => void>;
     handleShow: (menu: AbstractCommandBar) => void;
     handleClose: () => void;
-    handleKeydown: (event: KeyboardEvent) => void;
+    handleKeydown: (event: KeyboardEvent) => boolean;
     protected highlightText(search: string, items?: CommandItem[]): void;
 }

package/@ones-editor/ui-base/src/command-bar/command-bar.d.ts

@@ -21,7 +21,7 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     abstract readonly isVisible: boolean;
     get isSubCommandBar(): boolean;
     updateItems(items: CommandItem[]): void;
-    handleDocumentKeydown: (event: KeyboardEvent) => void;
+    handleDocumentKeydown: (event: KeyboardEvent) => boolean;
     protected handleDocumentMouseDown: (event: MouseEvent) => void;
     protected handleHidden: () => void;
     protected handleShow: () => void;

package/@ones-editor/ui-base/src/command-bar/types.d.ts

@@ -26,7 +26,7 @@ export interface AbstractCommandBar extends TypedEmitter<CommandBarEvents> {
     close: (reason: CloseReason) => void;
     destroy: () => void;
     isInCommandBar: (target: EventTarget | null) => boolean;
-    handleDocumentKeydown: (event: KeyboardEvent) => void;
+    handleDocumentKeydown: (event: KeyboardEvent) => boolean;
     getSubBarOptions: (item: CommandItem) => ManualShowCommandBarOptions;
 }
 export interface ShowCommandBarOptions {

package/dist/index.js

@@ -36726,6 +36726,7 @@ ${codeText}
       __publicField(this, "status", "clean");
       __publicField(this, "disableLogout");
       __publicField(this, "destroyed", false);
+      __publicField(this, "options", null);
       __publicField(this, "handleNothingPending", () => {
         this.setStatus("clean");
       });
@@ -36936,6 +36937,7 @@ ${codeText}
         });
         const doc2 = await client.getDoc();
         const shareDBDoc = new ShareDBDoc(client, doc2, options.disableLogout);
+        shareDBDoc.options = options;
         if (doc2.type === null) {
           if (options.autoCreateDoc === false) {
             const error2 = new Error("doc not exists");
@@ -37215,14 +37217,28 @@ ${codeText}
       return ret;
     }
     async uploadResource(file2, options) {
-      var _a;
-      const ret = await this.client.uploadResource(file2, (_a = options == null ? void 0 : options.onProgress) != null ? _a : () => {
+      var _a, _b;
+      if ((_a = this.options) == null ? void 0 : _a.uploadResource) {
+        try {
+          const ret2 = await this.options.uploadResource(file2, options);
+          return ret2;
+        } catch (err) {
+        }
+      }
+      const ret = await this.client.uploadResource(file2, (_b = options == null ? void 0 : options.onProgress) != null ? _b : () => {
       });
       return {
         resourceId: ret
       };
     }
     buildResourceUrl(resourceId, options) {
+      var _a;
+      if ((_a = this.options) == null ? void 0 : _a.buildResourceUrl) {
+        const ret = this.options.buildResourceUrl(resourceId, options);
+        if (ret) {
+          return ret;
+        }
+      }
       return this.client.buildResourceUrl(resourceId, options);
     }
     request(url, options) {
@@ -38120,27 +38136,26 @@ ${codeText}
       __publicField(this, "handleDocumentKeydown", (event) => {
         var _a, _b;
         if (!this.isVisible) {
-          return;
+          return true;
         }
         if (event.isComposing) {
-          return;
+          return true;
         }
         if (isInBlockTools(event.target)) {
-          return;
+          return true;
         }
         if (this.subBar) {
-          this.subBar.handleDocumentKeydown(event);
-          return;
+          return this.subBar.handleDocumentKeydown(event);
         }
         if (this.items.length === 0) {
-          return;
+          return true;
         }
         if (event.key === "Escape") {
           if ((_b = (_a = this.options).beforeClose) == null ? void 0 : _b.call(_a)) {
-            return;
+            return true;
           }
           this.close("cancelBar");
-          return;
+          return true;
         }
         if (event.key === "ArrowUp") {
           const prev = this.getPrevItemIndex(this.getSelectedItemIndex());
@@ -38166,7 +38181,7 @@ ${codeText}
         } else if (event.key === "Enter") {
           const index2 = this.getSelectedItemIndex();
           if (index2 === -1) {
-            return;
+            return false;
           }
           const item = this.items[index2];
           const elem = this.getItemElementById(item.id);
@@ -38174,6 +38189,7 @@ ${codeText}
             this.emit("click", this, item, elem);
           }
         }
+        return true;
       });
       __publicField(this, "handleDocumentMouseDown", (event) => {
         var _a, _b;
@@ -38229,6 +38245,9 @@ ${codeText}
         }
         const itemId = this.getItemElementId(elem);
         const item = this.getItemById(itemId);
+        if (item.states && item.states.indexOf("disabled") !== -1) {
+          return;
+        }
         this.selectItem(itemId);
         if (item.manualShowChildren) {
           return;
@@ -39317,9 +39336,7 @@ ${codeText}
         var _a, _b;
         (_b = (_a = this.options).onClose) == null ? void 0 : _b.call(_a);
       });
-      __publicField(this, "handleKeydown", (event) => {
-        this.menu.handleDocumentKeydown(event);
-      });
+      __publicField(this, "handleKeydown", (event) => this.menu.handleDocumentKeydown(event));
       this.options = options;
       this.menu = new ManualMenu([], void 0, {
         id: options.id,
@@ -39341,7 +39358,13 @@ ${codeText}
     setItems(items) {
       this.menu.updateItems(items);
       if (items.length > 0) {
-        const firstItem = items.find((item) => item.type !== "section" && item.type !== "separator");
+        const selectable = (item) => {
+          if (item.states && item.states.indexOf("disabled") !== -1) {
+            return false;
+          }
+          return item.type !== "section" && item.type !== "separator";
+        };
+        const firstItem = items.find(selectable);
         if (firstItem) {
           this.menu.selectItem(firstItem.id, "manual");
         }
@@ -40109,8 +40132,7 @@ ${codeText}
         this.menu.close();
         return true;
       }
-      this.menu.handleKeydown(event);
-      return true;
+      return this.menu.handleKeydown(event);
     }
     popup(block, offset, leftText, trigger) {
       this.anchor = {
@@ -82932,7 +82954,9 @@ ${data2.flowchartText}
       serverUrl: options.serverUrl,
       reauthFunc,
       disableLogout: options.disableLogout,
-      onMaxUsersError: options.onMaxUsersError
+      onMaxUsersError: options.onMaxUsersError,
+      uploadResource: options.uploadResource,
+      buildResourceUrl: options.buildResourceUrl
     };
     const doc2 = await ShareDBDoc.load(docOptions);
     const enableComments = options == null ? void 0 : options.enableComments;
@@ -83080,7 +83104,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.5";
+    editor.version = "2.1.7";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -83175,7 +83199,7 @@ ${data2.flowchartText}
     if (!clientType.isMobile) {
       OnesEditorToolbar.register(editor);
     }
-    editor.version = "2.1.5";
+    editor.version = "2.1.7";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -129449,6 +129473,7 @@ ${data2.flowchartText}
   exports2.toPlainText = toPlainText;
   exports2.toPlainTextKeepLength = toPlainTextKeepLength;
   exports2.trimChar = trimChar;
+  exports2.turndownService = turndownService;
   exports2.unexclusiveBlock = unexclusiveBlock;
   exports2.unicodeLength = unicodeLength;
   exports2.unicodeSubstr = unicodeSubstr;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Embed, Box, i18n, OnesEditor, OnesEditorUser, OnesEditorUserPermission, OnesEditorBlockHook, OnesEditorCommandProvider, LogLevel, Block, ShortcutRecords, OnesEditorBlockRenderer } from '../@ones-editor/core';
+import { Embed, Box, i18n, OnesEditor, OnesEditorUser, OnesEditorUserPermission, OnesEditorBlockHook, OnesEditorCommandProvider, LogLevel, Block, ShortcutRecords, OnesEditorBlockRenderer, BuildResourceUrlOptions, UploadResourceOptions, UploadResourceResult } from '../@ones-editor/core';
 import { DrawIoOptions } from '../@ones-editor/drawio-embed';
 import { FlowCharEmbedOptions, MermaidEmbedOptions, PlantumlEmbedOptions } from '../@ones-editor/graph-embed';
 import { ImageOptions } from '../@ones-editor/image-embed';
@@ -82,6 +82,8 @@ export interface CreateOnesEditorOptions {
     events?: EditorEvents;
     shortcuts?: ShortcutRecords[];
     componentsOptions?: EditorComponentOptions;
+    buildResourceUrl?: (resourceId: string, options?: BuildResourceUrlOptions) => string;
+    uploadResource?: (file: File, options?: UploadResourceOptions) => Promise<UploadResourceResult>;
 }
 export interface CreateLocalEditorOptions {
     id?: string;

package/package.json

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