@ones-editor/editor 2.1.1-beta.75 → 2.1.1-beta.77

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

@@ -4,6 +4,7 @@ import CommandBar from './command-bar';
 import { AbstractManualCommandBar, ManualShowCommandBarOptions } from './types';
 export default abstract class ManualCommandBar extends CommandBar implements AbstractManualCommandBar {
     tippyInstance: Instance | null;
+    setProps: (props: ManualShowCommandBarOptions) => void;
     manualShow(target: HTMLElement, options?: ManualShowCommandBarOptions): void;
     close(reason: CloseReason): void;
     destroy(): void;

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

@@ -31,6 +31,7 @@ export interface AbstractCommandBar extends TypedEmitter<CommandBarEvents> {
     handleDocumentKeydown: (event: KeyboardEvent) => boolean;
     getSubBarOptions: (item: CommandItem) => ManualShowCommandBarOptions;
     updateItems: (items: CommandItem[]) => void;
+    setProps?: (props: ManualShowCommandBarOptions) => void;
 }
 export interface ShowCommandBarOptions {
     placement?: Placement;

package/dist/index.js

@@ -6436,21 +6436,27 @@ div[data-command-bar-id=mobile-bottom-menu] .mobile-menu-wrap.editor-mention .co
 .command-m-bar > .editor-command-bar-root::-webkit-scrollbar {
   display: none;
 }
-.command-m-bar > .editor-command-bar-root .overflowing-float, .command-m-bar > .editor-command-bar-root .command-m-bar > .editor-command-bar-root.overflowing::before, .command-m-bar > .editor-command-bar-root .command-m-bar > .editor-command-bar-root.overflowing::after {
+.command-m-bar > .editor-command-bar-root.overflowing::after {
   content: "";
   position: absolute;
   top: 0;
-  left: 0;
+  right: 0;
   bottom: 0;
-  width: 10px;
+  width: 18px;
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0, rgb(255, 255, 255));
   z-index: 1;
   pointer-events: none;
 }
-.command-m-bar > .editor-command-bar-root.overflowing::after {
-  background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0, rgb(255, 255, 255));
-}
 .command-m-bar > .editor-command-bar-root.overflowing::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 18px;
   background: linear-gradient(90deg, rgb(255, 255, 255) 0, rgba(255, 255, 255, 0));
+  z-index: 1;
+  pointer-events: none;
 }
 .command-m-bar > .editor-command-bar-root > .editor-command-bar {
   width: max-content;
@@ -8928,11 +8934,12 @@ var __publicField = (obj, key, value) => {
     return mouseEvent;
   }
   function ensureIsMobileEvent(events2) {
-    return events2 instanceof TouchEvent;
+    return events2.type.startsWith("touch");
   }
-  function bindDbClick(elem, handler) {
+  function bindDbClick(editor, elem, handler) {
     let clickCount = 0;
     function simulateDoubleClick(event) {
+      editor.focus();
       clickCount++;
       if (clickCount === 1) {
         setTimeout(() => {
@@ -8958,7 +8965,7 @@ var __publicField = (obj, key, value) => {
       topWindow = window.top;
     }
     const visualViewportHeight = (_b = (_a = topWindow.visualViewport) == null ? void 0 : _a.height) != null ? _b : topWindow.innerHeight || topWindow.document.documentElement.clientHeight;
-    return Math.max(topWindow.innerHeight - visualViewportHeight, 40);
+    return Math.max(topWindow.innerHeight - visualViewportHeight + 40, 40);
   };
   class ScrollDomElement {
     constructor(element) {
@@ -11186,6 +11193,13 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "mouseDownEvent", null);
       __publicField(this, "dbClickRef", null);
       __publicField(this, "handleContextMenu", (event) => {
+        if (clientType.isMobile) {
+          event.preventDefault();
+          if (clientType.isAndroid) {
+            this.editor.focus();
+          }
+          return;
+        }
         if (clientType.isSafari) {
           const sel = document.getSelection();
           if (sel && !sel.isCollapsed) {
@@ -11329,13 +11343,13 @@ var __publicField = (obj, key, value) => {
         container.ontouchend = this.handleMouseDown;
       } else {
         container.onmousedown = this.handleMouseDown;
-        container.oncontextmenu = this.handleContextMenu;
       }
       if (clientType.isIOS) {
-        this.dbClickRef = bindDbClick(container, this.handleDblClick);
+        this.dbClickRef = bindDbClick(this.editor, container, this.handleDblClick);
       } else {
         container.ondblclick = this.handleDblClick;
       }
+      container.oncontextmenu = this.handleContextMenu;
       container.onclick = this.handleClick;
     }
     unbindEvents() {
@@ -39582,6 +39596,10 @@ ${codeText}
     constructor() {
       super(...arguments);
       __publicField(this, "tippyInstance", null);
+      __publicField(this, "setProps", (props) => {
+        var _a;
+        (_a = this.tippyInstance) == null ? void 0 : _a.setProps(props);
+      });
     }
     manualShow(target, options) {
       var _a, _b, _c;
@@ -49765,7 +49783,7 @@ ${codeText}
       __publicField(this, "onShow", () => {
         setTimeout(() => {
           var _a;
-          (_a = this.form.linkText) == null ? void 0 : _a.getField().focus();
+          (_a = this.form.linkUrl) == null ? void 0 : _a.getField().focus();
         }, 400);
       });
       __publicField(this, "showPopup", (options) => {
@@ -50318,7 +50336,6 @@ ${codeText}
       commands.push(...this.provider.getAvailableCommands(editor, block, this.editor.selection.range, { child }));
       if (clientType.isMobile) {
         this.clipboardProvider.getAvailableCommands(editor, block).forEach((c) => commands.push(c));
-        commands.push({ id: "separator", name: "", type: "separator" });
       }
       return {
         element: child,
@@ -78451,6 +78468,8 @@ ${content}
       __publicField(this, "createMobileCommandItem", (items) => {
         const mobileWrap = this.getMobileCommandElement();
         const content = mobileWrap.querySelector(".mobile-item-content");
+        const input2 = mobileWrap.querySelector("input");
+        input2.value = "";
         this.createMobileItems(content, items, "");
         setTimeout(() => {
           const clientHeight = this.editor.scrollContainer.clientHeight;
@@ -79984,8 +80003,10 @@ ${content}
       __publicField(this, "mobileToolbar");
       __publicField(this, "fixedProviders");
       __publicField(this, "bar");
+      __publicField(this, "subBar", null);
       __publicField(this, "handleSubBarShown", (_2, subBar) => {
         scrollBarIntoView(this.editor, subBar);
+        this.subBar = subBar;
       });
       __publicField(this, "handleSelectionChange", debounce__default.default(() => {
         const commands = this.fixedProviders.getCommands(this.editor.selection.range);
@@ -80017,6 +80038,12 @@ ${content}
         }
       }, 500);
     }
+    layoutSubBar() {
+      var _a, _b, _c;
+      if (((_a = this.subBar) == null ? void 0 : _a.isVisible) && this.subBar.parentItem) {
+        (_c = (_b = this.subBar).setProps) == null ? void 0 : _c.call(_b, this.mobileToolbar.getSubBarOptions(this.subBar.parentItem));
+      }
+    }
     destroy() {
       this.editor.removeListener("selectionChanged", this.handleSelectionChange);
       this.mobileToolbar.destroy();
@@ -80056,8 +80083,11 @@ ${content}
             editorScrollIntoView(this.editor);
           }
         }
-        this.preHeight = this.virtualViewportHeight;
         this.commandBar.bar.style.bottom = `${offsetHeight}px`;
+        if (this.preHeight !== this.virtualViewportHeight) {
+          this.commandBar.layoutSubBar();
+        }
+        this.preHeight = this.virtualViewportHeight;
       }, this.toggleDelay));
       __publicField(this, "handScroll", debounce__default.default(() => {
         const input2 = this.editor.input.getInput();
@@ -86689,7 +86719,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.75";
+    editor.version = "2.1.1-beta.77";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -86790,7 +86820,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.75";
+    editor.version = "2.1.1-beta.77";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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