@ones-editor/editor 2.9.8-beta.46 → 2.9.8-beta.48

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

@@ -1,13 +1,13 @@
-import { OnesEditor, CommandItem, CommandItemWithSource, CommandFilterId, CommandFilter } from '../../../../@ones-editor/core';
+import { OnesEditor, CommandItem, OnesEditorCommandProviders, CommandItemWithSource, CommandFilterId, CommandFilter } from '../../../../@ones-editor/core';
 import { OnesEditorAutoSuggest } from '../../../../@ones-editor/ui-base';
 import { QuickMenuOptions } from './types';
 export default class OnesEditorQuickMenu {
     protected editor: OnesEditor;
     private options;
     protected suggest: OnesEditorAutoSuggest;
-    private items;
+    protected items: CommandItem[];
     private firstEmptyOffset;
-    private quickCommandProviders;
+    quickCommandProviders: OnesEditorCommandProviders;
     constructor(editor: OnesEditor, options?: QuickMenuOptions);
     get menu(): import("@ones-editor/ui-base").ManualMenu | import("@ones-editor/ui-base/src/mobile-command-bar/mobile-bottom-menu").MobileBottomMenu;
     addFilter(id: CommandFilterId, filter: CommandFilter): void;

package/dist/index.d.ts

@@ -54,6 +54,7 @@ export declare function getDefaultOnesEditorOptions(options: CreateOnesEditorOpt
     enableComments: boolean | undefined;
     enableResolveComments: boolean | undefined;
     enableContextMenu: boolean | undefined;
+    dateTimeFormatter: ((v: Date, source?: string | undefined) => string) | undefined;
     components: {
         blocks: import("@ones-editor/core").Block[];
         embeds: import("@ones-editor/core").Embed[];

package/dist/index.js

@@ -31977,7 +31977,7 @@ ${codeText}
   const logger$38 = getLogger("editor");
   class Editor extends tinyTypedEmitter.TypedEmitter {
     constructor(parent, doc2, optionalOptions) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
       super();
       __publicField(this, "parent");
       __publicField(this, "rootElement");
@@ -32026,12 +32026,13 @@ ${codeText}
         scrollContainer: optionalOptions == null ? void 0 : optionalOptions.scrollContainer,
         enableComments: (_d = optionalOptions == null ? void 0 : optionalOptions.enableComments) != null ? _d : true,
         enableResolveComments: (_e = optionalOptions == null ? void 0 : optionalOptions.enableResolveComments) != null ? _e : true,
-        enableContextMenu: (_f = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _f : true
+        enableContextMenu: (_f = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _f : true,
+        dateTimeFormatter: (_g = optionalOptions == null ? void 0 : optionalOptions.dateTimeFormatter) != null ? _g : (v) => v.toLocaleString()
       };
-      this.settingsProvider = (_g = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _g : new DefaultSettingsProvider(this);
+      this.settingsProvider = (_h = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _h : new DefaultSettingsProvider(this);
       registerComponents(this, optionalOptions == null ? void 0 : optionalOptions.components);
-      this.blockHooks.push(...(_i = (_h = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _h.blockHooks) != null ? _i : []);
-      this.id = (_j = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _j : genId();
+      this.blockHooks.push(...(_j = (_i = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _i.blockHooks) != null ? _j : []);
+      this.id = (_k = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _k : genId();
       this.clientId = genId();
       this.undoManager = new UndoManager(this);
       this.doc = new EditorDoc(this, doc2, this.undoManager);
@@ -42072,6 +42073,9 @@ ${codeText}
           if (parentEditor) {
             const input2 = parentEditor.querySelector(".editor-input");
             if (input2) {
+              if (parentEditor.contains(document.activeElement)) {
+                return;
+              }
               input2.focus();
             }
           }
@@ -67309,6 +67313,17 @@ ${codeText}
         id: "empty-block-menu"
       });
       __publicField(this, "currentBlock", null);
+      setTimeout(() => {
+        const quickMenu = editor.findCustom("editor-quick-menu");
+        if (quickMenu) {
+          const filters = quickMenu.quickCommandProviders.commandFilters;
+          if (filters) {
+            filters.forEach((v, k) => {
+              this.addFilter(k, v);
+            });
+          }
+        }
+      }, 100);
     }
     get isVisible() {
       return this.suggest.menu.isVisible;
@@ -79946,6 +79961,7 @@ ${docStr}
       });
       __publicField(this, "isSecureContext", window.isSecureContext);
       __publicField(this, "externalActionHandleMap", /* @__PURE__ */ new Map());
+      __publicField(this, "target", null);
       __publicField(this, "handleActionByExternal", (item) => {
         const { data: data2 } = item;
         if (data2 && data2.externalType) {
@@ -79980,7 +79996,8 @@ ${docStr}
           disableReason
         };
       });
-      __publicField(this, "getCommandItems", async () => {
+      __publicField(this, "getCommandItems", async (target) => {
+        this.target = target || null;
         const pasteCommandItem = await this.getPasteCommandItem();
         const basicCommandItems = this.editor.readonly ? [] : [this.cutCommandItem, pasteCommandItem];
         const commandItems = [...this.copyTypeCommandItems, ...basicCommandItems];
@@ -80018,6 +80035,15 @@ ${docStr}
         const isFocusedImage = isEmbedBlock(focusedBlock) && getEmbedType(focusedBlock) === "image";
         return isFocusedImage && selection.range.getSelectedBlocks().length === 1;
       });
+      __publicField(this, "getFocusImageBlock", () => {
+        const selection = this.editor.selection;
+        const focusedBlock = selection.focusedBlock;
+        const isFocusedImage = isEmbedBlock(focusedBlock) && getEmbedType(focusedBlock) === "image";
+        if (!isFocusedImage) {
+          return null;
+        }
+        return focusedBlock;
+      });
       __publicField(this, "isFocusImageTypeEmbed", () => {
         const selection = this.editor.selection;
         const focusedBlock = selection.focusedBlock;
@@ -80094,6 +80120,15 @@ ${docStr}
       return this.editor.selection.range.isCollapsed();
     }
     get imageTypeCommandItems() {
+      const image = this.getFocusImageBlock();
+      if (image) {
+        if (hasClass(image, "load-error")) {
+          return [];
+        }
+        if (image.querySelector(".load-error")) {
+          return [];
+        }
+      }
       const canCopy = this.isSecureContext && this.hasClipboardWritePermission;
       return [{
         id: "copy-image",
@@ -80218,6 +80253,7 @@ ${docStr}
     constructor(editor) {
       __publicField(this, "contextMenu");
       __publicField(this, "contextMenuCommandItems");
+      __publicField(this, "target", null);
       __publicField(this, "destroy", () => {
         this.contextMenuCommandItems.destroy();
         this.contextMenu.off("show", this.handleContextMenuShown);
@@ -80261,6 +80297,7 @@ ${docStr}
           return;
         }
         const target = event.target;
+        this.target = target;
         if (this.editor.findCustom("toolbar-handler")) {
           const editorToolbar = this.editor.getCustom("toolbar-handler");
           if (editorToolbar.isInToolbar(event)) {
@@ -80308,12 +80345,12 @@ ${docStr}
         const isInInput = event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement;
         return isInCurEditor && !isInInput;
       });
-      __publicField(this, "handleContextMenuShown", async () => {
+      __publicField(this, "handleContextMenuShown", async (bar2) => {
         if (this.editor.findCustom("toolbar-handler")) {
           const editorToolBar = this.editor.getCustom("toolbar-handler");
           editorToolBar.hide();
         }
-        const items = await this.contextMenuCommandItems.getCommandItems();
+        const items = await this.contextMenuCommandItems.getCommandItems(this.target);
         this.contextMenu.updateItems(items);
       });
       __publicField(this, "handleContextMenuClick", (_2, item) => {
@@ -80750,7 +80787,7 @@ ${docStr}
     return UnknownFileIcon;
   }
   async function renderFileCard(editor, content, data2) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { fileName, fileType, fileSize, created, creator, src } = data2;
     const card = createElement("div", ["card-root"], content);
     const icon = createElement("div", ["file-icon"], card);
@@ -80777,14 +80814,14 @@ ${docStr}
     }
     nameElement.title = fileName;
     const infos = createElement("div", ["file-info"], detail);
-    const timeText = i18n$1.t("file.uploadedTime", { time: formatDate(new Date(created), "YYYY-MM-DD hh:mm") });
+    const timeText = i18n$1.t("file.uploadedTime", { time: ((_c = (_b = editor.options) == null ? void 0 : _b.dateTimeFormatter) == null ? void 0 : _c.call(_b, new Date(created), "file-embed")) || formatDate(new Date(created), "YYYY-MM-DD hh:mm") });
     const sizeText = formatBytes(fileSize);
     const infoText = `${creator} ${timeText} ${sizeText}`;
     createElement("div", ["info"], infos, infoText);
     const actions2 = createElement("div", ["file-actions"], card);
     const options = editor.getComponentOptions("file");
     let copilotButton;
-    const checkCopilotMethod = (_b = editor.getComponentOptions("custom")) == null ? void 0 : _b.checkCopilotReadyItem;
+    const checkCopilotMethod = (_d = editor.getComponentOptions("custom")) == null ? void 0 : _d.checkCopilotReadyItem;
     if (checkCopilotMethod) {
       const copilotEnabled = checkCopilotMethod(src);
       if (copilotEnabled) {
@@ -95387,6 +95424,7 @@ ${JSON.stringify(error2, null, 2)}`);
       enableComments: options == null ? void 0 : options.enableComments,
       enableResolveComments: options == null ? void 0 : options.enableResolveComments,
       enableContextMenu: options == null ? void 0 : options.enableContextMenu,
+      dateTimeFormatter: options.dateTimeFormatter,
       components: {
         blocks: [...StandardBlocks, ...((_d = options == null ? void 0 : options.components) == null ? void 0 : _d.blocks) || []],
         embeds: [...StandardEmbeds, ...((_e = options.components) == null ? void 0 : _e.embeds) || []],
@@ -95619,7 +95657,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.9.8-beta.46";
+    editor.version = "2.9.8-beta.48";
     return editor;
   }
   function isDoc(doc2) {
@@ -95643,6 +95681,7 @@ ${JSON.stringify(error2, null, 2)}`);
       scrollContainer: options == null ? void 0 : options.scrollContainer,
       enableResolveComments: options == null ? void 0 : options.enableResolveComments,
       enableComments,
+      dateTimeFormatter: options.dateTimeFormatter,
       components: {
         blocks: [...StandardBlocks, ...(_f = (_e = options.components) == null ? void 0 : _e.blocks) != null ? _f : []],
         commandProviders: [new TableBlockCommandProvider()],
@@ -95751,7 +95790,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "2.9.8-beta.46";
+    editor.version = "2.9.8-beta.48";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/dist/types.d.ts

@@ -75,6 +75,7 @@ export interface CreateOnesEditorOptions {
         applyContentPlaceholder?: (editor: OnesEditor) => boolean;
     };
     onReauth?: (userId: string, docId: string, permission: OnesEditorUserPermission) => Promise<string>;
+    dateTimeFormatter?: (v: Date, source?: string) => string;
     user: {
         userId: string;
         displayName: string;
@@ -135,4 +136,5 @@ export interface CreateLocalEditorOptions {
     componentsOptions?: EditorComponentOptions;
     hideTitle?: boolean;
     autoNewLine?: boolean;
+    dateTimeFormatter?: (v: Date, source?: string) => string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.9.8-beta.46",
+  "version": "2.9.8-beta.48",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {