@ones-editor/editor 2.9.8-beta.32 → 2.9.8-beta.34

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

@@ -14,7 +14,7 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     private header;
     private footer;
     constructor(items: CommandItem[], closeable?: Closeable, options?: CommandBarOptions);
-    close(reason: CloseReason): void;
+    close(reason: CloseReason, e?: MouseEvent | null): void;
     click(item: CommandItem, target: HTMLElement): void;
     createPopperOptions(flip?: boolean): Partial<import("@popperjs/core").Options>;
     destroy(): void;

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

@@ -1,12 +1,16 @@
-import { CloseReason } from '../../../../@ones-editor/core';
+import { CloseReason, CommandItem, Closeable } from '../../../../@ones-editor/core';
 import { Instance } from 'tippy.js';
 import CommandBar from './command-bar';
-import { AbstractManualCommandBar, ManualShowCommandBarOptions } from './types';
+import { AbstractManualCommandBar, CommandBarOptions, ManualShowCommandBarOptions } from './types';
 export default abstract class ManualCommandBar extends CommandBar implements AbstractManualCommandBar {
+    private manualCommandBarOptions?;
     tippyInstance: Instance | null;
+    _target: HTMLElement | null;
+    constructor(items: CommandItem[], closeable?: Closeable, manualCommandBarOptions?: CommandBarOptions | undefined);
+    handleBeforeClose: (event?: MouseEvent | TouchEvent) => boolean;
     setProps: (props: ManualShowCommandBarOptions) => void;
     manualShow(target: HTMLElement, options?: ManualShowCommandBarOptions): void;
-    close(reason: CloseReason): void;
+    close(reason: CloseReason, e?: MouseEvent | null): void;
     destroy(): void;
     protected getCommandBarRoot(): HTMLElement | null;
     get isVisible(): boolean;

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

@@ -25,7 +25,7 @@ export interface ManualShowCommandBarOptions {
 export interface AbstractCommandBar extends TypedEmitter<CommandBarEvents> {
     readonly isVisible: boolean;
     readonly parentItem: CommandItem | null;
-    close: (reason: CloseReason) => void;
+    close: (reason: CloseReason, e?: MouseEvent | null) => void;
     destroy: () => void;
     isInCommandBar: (target: EventTarget | null) => boolean;
     handleDocumentKeydown: (event: KeyboardEvent) => boolean;

package/dist/index.js

@@ -41615,7 +41615,7 @@ ${codeText}
       this.closeable = closeable != null ? closeable : null;
       this.content = this.createCommandBarContent(items);
     }
-    close(reason) {
+    close(reason, e2) {
       this.closeReason = reason;
       if (this.subBar) {
         this.subBar.close(reason);
@@ -42045,16 +42045,48 @@ ${codeText}
   __publicField(CommandBar, "commandBarCreators", /* @__PURE__ */ new Map());
   getLogger("ui-command-bar");
   class ManualCommandBar extends CommandBar {
-    constructor() {
-      super(...arguments);
+    constructor(items, closeable, manualCommandBarOptions) {
+      super(items, closeable, {
+        ...manualCommandBarOptions,
+        beforeClose: (e2) => {
+          return this.handleBeforeClose(e2);
+        }
+      });
       __publicField(this, "tippyInstance", null);
+      __publicField(this, "_target", null);
+      __publicField(this, "handleBeforeClose", (event) => {
+        var _a;
+        let ret = false;
+        if ((_a = this.manualCommandBarOptions) == null ? void 0 : _a.beforeClose) {
+          ret = this.manualCommandBarOptions.beforeClose(event);
+        }
+        if (ret) {
+          return ret;
+        }
+        if (!this._target) {
+          return ret;
+        }
+        const target = this._target;
+        setTimeout(() => {
+          const parentEditor = target.closest(".editor-root");
+          if (parentEditor) {
+            const input2 = parentEditor.querySelector(".editor-input");
+            if (input2) {
+              input2.focus();
+            }
+          }
+        }, 100);
+        return ret;
+      });
       __publicField(this, "setProps", (props) => {
         var _a;
         (_a = this.tippyInstance) == null ? void 0 : _a.setProps(props);
       });
+      this.manualCommandBarOptions = manualCommandBarOptions;
     }
     manualShow(target, options) {
       var _a, _b, _c, _d;
+      this._target = target;
       if (this.isVisible) {
         return;
       }
@@ -42078,7 +42110,8 @@ ${codeText}
         theme: options == null ? void 0 : options.theme,
         getReferenceClientRect: options == null ? void 0 : options.getReferenceClientRect,
         offset: (_d = options == null ? void 0 : options.offset) != null ? _d : [0, 0],
-        popperOptions: this.createPopperOptions()
+        popperOptions: this.createPopperOptions(),
+        delay: 500
       });
       if (options == null ? void 0 : options.point) {
         const { x, y } = options.point;
@@ -42099,11 +42132,15 @@ ${codeText}
         addClass(this.popper, "mobile");
       }
     }
-    close(reason) {
-      var _a;
+    close(reason, e2) {
+      var _a, _b;
       super.close(reason);
       if (this.isVisible) {
-        (_a = this.tippyInstance) == null ? void 0 : _a.hide();
+        if (e2) {
+          (_a = this.tippyInstance) == null ? void 0 : _a.hideWithInteractivity(e2);
+        } else {
+          (_b = this.tippyInstance) == null ? void 0 : _b.hide();
+        }
       }
     }
     destroy() {
@@ -54932,14 +54969,14 @@ ${codeText}
       const child = this.hoveringTextChild;
       const { commands, element } = getObjectCommands(this.editor, block, child);
       if (!commands.length || !element) {
-        this.toolbar.close("fromHover");
+        this.toolbar.close("fromHover", event);
         return;
       }
       this.toolbarType = "object";
       if (this.toolbar.isVisible) {
         const currentElement = (_b = (_a = this.toolbar) == null ? void 0 : _a.tippyInstance) == null ? void 0 : _b.reference;
         if (currentElement !== element) {
-          this.toolbar.close("fromHover");
+          this.toolbar.close("fromHover", event);
         }
       }
       const getReferenceClientRectByCaret = () => {
@@ -69340,7 +69377,7 @@ ${codeText}
     const data2 = blockData.embedData;
     const images = getImages$1(data2);
     if (type === "html") {
-      return images.map((image) => `<img data-embed-type="image" data-uuid="image:${data2.src}" src="${editor.doc.buildResourceUrl(image.src, { withToken: true })}">`).join("");
+      return images.map((image) => `<img data-embed-type="image" data-uuid="image:${image.src}" src="${editor.doc.buildResourceUrl(image.src, { withToken: true })}">`).join("");
     }
     if (type === "markdown") {
       const markdown = images.map((image) => `![img](${editor.doc.buildResourceUrl(image.src, { withToken: true })})`).join("\n");
@@ -95524,7 +95561,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.9.8-beta.32";
+    editor.version = "2.9.8-beta.34";
     return editor;
   }
   function isDoc(doc2) {
@@ -95656,7 +95693,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "2.9.8-beta.32";
+    editor.version = "2.9.8-beta.34";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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