@ones-editor/editor 2.1.1-beta.74 → 2.1.1-beta.76

package/@ones-editor/ui/src/locale/en-us.d.ts

@@ -51,6 +51,7 @@ declare const _default: {
         subscript: string;
         superscript: string;
         more: string;
+        selectBlock: string;
     };
 };
 export default _default;

package/@ones-editor/ui/src/locale/ja-jp.d.ts

@@ -51,6 +51,7 @@ declare const _default: {
         subscript: string;
         superscript: string;
         more: string;
+        selectBlock: string;
     };
 };
 export default _default;

package/@ones-editor/ui/src/locale/zh-cn.d.ts

@@ -51,6 +51,7 @@ declare const _default: {
         subscript: string;
         superscript: string;
         more: string;
+        selectBlock: string;
     };
 };
 export default _default;

package/@ones-editor/ui/src/providers/mobile-link-provider.d.ts

@@ -1,9 +1,12 @@
 import { BlockElement, CommandItem, CommandItemWithSource, CommandParams, CommandResult, OnesEditor, OnesEditorCommandProvider, SelectionRange } from '../../../../@ones-editor/core';
 export declare class MobileLinkProvider implements OnesEditorCommandProvider {
+    private options?;
     id: string;
     insertProvider: OnesEditorCommandProvider;
     editProvider: OnesEditorCommandProvider;
-    constructor(editor: OnesEditor);
+    constructor(editor: OnesEditor, options?: {
+        linkMode: 'insert' | 'edit';
+    } | undefined);
     getSelectedLinkChild: (editor: OnesEditor, range: SelectionRange) => import("@ones-editor/core").TextBlockContentChild | null;
     getAvailableCommands: (editor: OnesEditor, block: BlockElement, range: SelectionRange, params?: CommandParams) => CommandItem[];
     executeCommand: (editor: OnesEditor, block: BlockElement, range: SelectionRange, item: CommandItemWithSource, params: CommandParams, result?: CommandResult) => boolean;

package/@ones-editor/ui/src/providers/selection-provider.d.ts

@@ -0,0 +1,9 @@
+import { BlockElement, CommandItem, CommandParams, OnesEditor, OnesEditorCommandProvider, SelectionRange } from '../../../../@ones-editor/core';
+export default class SelectionProvider implements OnesEditorCommandProvider {
+    private editor;
+    id: string;
+    constructor(editor: OnesEditor);
+    getAvailableCommands(editor: OnesEditor, block: BlockElement, range: SelectionRange, params?: CommandParams): CommandItem[];
+    getInsertCommands: () => never[];
+    executeCommand(editor: OnesEditor, block: BlockElement, range: SelectionRange, command: CommandItem): boolean;
+}

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;
@@ -8931,29 +8937,42 @@ var __publicField = (obj, key, value) => {
     return events2 instanceof TouchEvent;
   }
   function bindDbClick(elem, handler) {
-    let touchTime = 0;
-    const callback = (event) => {
-      if (touchTime === 0) {
-        touchTime = new Date().getTime();
-      } else {
-        if (new Date().getTime() - touchTime < 800) {
-          handler(event);
-        }
-        touchTime = 0;
+    let clickCount = 0;
+    function simulateDoubleClick(event) {
+      clickCount++;
+      if (clickCount === 1) {
+        setTimeout(() => {
+          if (clickCount === 2) {
+            handler(event);
+          }
+          clickCount = 0;
+        }, 300);
       }
-    };
-    elem.addEventListener("click", callback);
+    }
+    elem.addEventListener("click", simulateDoubleClick);
     return () => {
-      elem.removeEventListener("click", callback);
+      elem.removeEventListener("click", simulateDoubleClick);
     };
   }
+  const getVisualViewportHeightOffset = () => {
+    var _a, _b;
+    if (!clientType.isMobile) {
+      return 0;
+    }
+    let topWindow = window;
+    if (window.top) {
+      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);
+  };
   class ScrollDomElement {
     constructor(element) {
       __publicField(this, "element");
       this.element = element;
     }
     getClientHeight() {
-      return this.element.clientHeight;
+      return this.element.clientHeight - getVisualViewportHeightOffset();
     }
     getHorizontalScroll() {
       return this.element.scrollLeft;
@@ -9862,6 +9881,11 @@ var __publicField = (obj, key, value) => {
     });
   }
   function select(element) {
+    const preventDefault = (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    document.addEventListener("selectionchange", preventDefault, { capture: true, passive: false });
     if (element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement) {
       element.select();
     } else {
@@ -9871,6 +9895,9 @@ var __publicField = (obj, key, value) => {
       selection == null ? void 0 : selection.removeAllRanges();
       selection == null ? void 0 : selection.addRange(range);
     }
+    setTimeout(() => {
+      document.removeEventListener("selectionchange", preventDefault, { capture: true });
+    });
   }
   async function copyTextToClipboard(text2) {
     const textarea2 = document.createElement("textarea");
@@ -11165,6 +11192,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) {
@@ -11189,7 +11223,7 @@ var __publicField = (obj, key, value) => {
         if (event.detail === 1) {
           this.editor.input.focus();
         }
-        if (event.detail === 3) {
+        if (event.detail === 3 && !clientType.isMobile) {
           this.editor.selectionHandler.handleTripleClick(event);
         }
         if (event.detail === 1 && event.button === 0) {
@@ -11308,13 +11342,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);
       } else {
         container.ondblclick = this.handleDblClick;
       }
+      container.oncontextmenu = this.handleContextMenu;
       container.onclick = this.handleClick;
     }
     unbindEvents() {
@@ -25009,7 +25043,10 @@ var __publicField = (obj, key, value) => {
     const x1 = rect.x < 0 ? 0 : rect.x;
     const y1 = rect.y < 0 ? 0 : rect.y;
     const x2 = rect.right > window.innerWidth ? window.innerWidth : rect.right;
-    const y2 = rect.bottom > window.innerHeight ? window.innerHeight : rect.bottom;
+    let y2 = rect.bottom > window.innerHeight ? window.innerHeight : rect.bottom;
+    if (clientType.isIOS) {
+      y2 -= getVisualViewportHeightOffset();
+    }
     return new DOMRect(x1, y1, x2 - x1, y2 - y1);
   }
   function isBlockPositionVisible(editor, pos) {
@@ -30466,7 +30503,7 @@ ${codeText}
         Array.from(this.activeBlockAttributes).forEach(([key, value]) => {
           const op = { attributes, insert: "" };
           if (key === "color" || key === "backgroundColor") {
-            if (!value) {
+            if (value === null || value === void 0) {
               deleteColor(op, key);
             } else {
               addColor(op, key, value);
@@ -39558,6 +39595,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;
@@ -46397,10 +46438,11 @@ ${codeText}
           element: this.createPasteElement(editor),
           states: []
         };
-        const items = [cutItem, copyItem];
+        const items = [copyItem];
         if (this.options.withPaste) {
           items.push(pasteItem);
         }
+        items.push(cutItem);
         return items;
       });
       __publicField(this, "getInsertCommands", () => []);
@@ -50280,7 +50322,7 @@ ${codeText}
         this.clipboardProvider.executeRangeCommand(editor, range, item);
       });
       this.editor = editor;
-      this.clipboardProvider = new ClipboardProvider(this.editor, { withPaste: true });
+      this.clipboardProvider = new ClipboardProvider(this.editor, { withPaste: false });
     }
     commands(editor, block, child) {
       if (!editor.isWritable()) {
@@ -50290,11 +50332,10 @@ ${codeText}
         return void 0;
       }
       const commands = [];
+      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" });
       }
-      commands.push(...this.provider.getAvailableCommands(editor, block, this.editor.selection.range, { child }));
       return {
         element: child,
         group: "hovering-toolbar",
@@ -50348,6 +50389,33 @@ ${codeText}
       return false;
     }
   }
+  class SelectionProvider {
+    constructor(editor) {
+      __publicField(this, "id", "SelectionProvider");
+      __publicField(this, "getInsertCommands", () => []);
+      this.editor = editor;
+    }
+    getAvailableCommands(editor, block, range, params) {
+      const disabled = !isTextKindBlock(editor, block) || isSelectBoxOnly(editor);
+      if (disabled && (params == null ? void 0 : params.isFilter)) {
+        return [];
+      }
+      return [
+        {
+          name: i18n$1.t("commands.selectBlock"),
+          id: "select-block",
+          states: disabled ? ["disabled"] : []
+        }
+      ];
+    }
+    executeCommand(editor, block, range, command) {
+      if (command.id === "select-block") {
+        editor.selection.selectBlock(block, 0, getBlockTextLength$6(editor, block));
+        return true;
+      }
+      return false;
+    }
+  }
   const logger$1S = getLogger("toolbar-handler");
   class OnesEditorToolbar {
     constructor(editor) {
@@ -50487,9 +50555,11 @@ ${codeText}
       OnesEditorHoveringBlock.get(editor).addFilter(this);
       editor.blockHooks.push(new LinkCommands(editor));
       if (clientType.isMobile) {
-        editor.editorCommandProviders.registerCommandProvider(new MobileLinkProvider(editor));
+        editor.editorCommandProviders.registerCommandProvider(new MobileLinkProvider(editor, { linkMode: "edit" }));
         editor.editorCommandProviders.registerCommandProvider(new StandardBoxProvider(editor));
         editor.editorCommandProviders.registerCommandProvider(new ClipboardProvider(editor, { withPaste: true }));
+        editor.editorCommandProviders.registerCommandProvider(new SelectionProvider(editor));
+        editor.editorCommandProviders.registerCommandProvider(new MobileLinkProvider(editor, { linkMode: "insert" }));
       } else {
         editor.editorCommandProviders.registerCommandProvider(new BlockTurnIntoCommandProvider(editor));
         editor.editorCommandProviders.registerCommandProvider(new ParagraphProvider$1(editor));
@@ -57992,7 +58062,8 @@ $$${mathData.mathjaxText}$$
       code: "\u884C\u5185\u4EE3\u7801",
       subscript: "\u4E0B\u6807",
       superscript: "\u4E0A\u6807",
-      more: "\u66F4\u591A"
+      more: "\u66F4\u591A",
+      selectBlock: "\u9009\u62E9\u533A\u5757"
     }
   };
   const enUS$q = {
@@ -58047,7 +58118,8 @@ $$${mathData.mathjaxText}$$
       code: "Inline code",
       subscript: "Subscript",
       superscript: "Superscript",
-      more: "More"
+      more: "More",
+      selectBlock: "Select Block"
     }
   };
   const jaJP$q = {
@@ -58102,7 +58174,8 @@ $$${mathData.mathjaxText}$$
       code: "\u30A4\u30F3\u30E9\u30A4\u30F3\u30B3\u30FC\u30C9",
       subscript: "\u4E0B\u4ED8\u304D\u6587\u5B57",
       superscript: "\u4E0A\u4ED8\u304D\u6587\u5B57",
-      more: "\u305D\u306E\u4ED6"
+      more: "\u305D\u306E\u4ED6",
+      selectBlock: "\u30D6\u30ED\u30C3\u30AF\u3092\u9078\u629E"
     }
   };
   i18n$1.mergeLang({
@@ -59016,7 +59089,7 @@ $$${mathData.mathjaxText}$$
     }
   }
   class MobileLinkProvider {
-    constructor(editor) {
+    constructor(editor, options) {
       __publicField(this, "id", "MobileLinkProvider");
       __publicField(this, "insertProvider");
       __publicField(this, "editProvider");
@@ -59040,12 +59113,16 @@ $$${mathData.mathjaxText}$$
         return null;
       });
       __publicField(this, "getAvailableCommands", (editor, block, range, params) => {
+        var _a, _b;
         const editorRange = editor.selection.range;
         const child = this.getSelectedLinkChild(editor, editorRange);
-        if (child) {
+        if (child && ((_a = this.options) == null ? void 0 : _a.linkMode) === "edit") {
           return this.editProvider.getAvailableCommands(editor, block, range, { child });
         }
-        return this.insertProvider.getAvailableCommands(editor, block, range, { ...params, isFilter: true });
+        if (((_b = this.options) == null ? void 0 : _b.linkMode) === "insert" && !child) {
+          return this.insertProvider.getAvailableCommands(editor, block, range, { ...params, isFilter: true });
+        }
+        return [];
       });
       __publicField(this, "executeCommand", (editor, block, range, item, params, result) => {
         var _a, _b, _c, _d, _e, _f;
@@ -59056,6 +59133,7 @@ $$${mathData.mathjaxText}$$
         }
         return (_f = (_e = (_d = this.insertProvider) == null ? void 0 : _d.executeCommand) == null ? void 0 : _e.call(_d, editor, block, range, item, params, result)) != null ? _f : false;
       });
+      this.options = options;
       this.insertProvider = new LinkProvider(editor);
       this.editProvider = new EditLinkProvider();
     }
@@ -79627,7 +79705,7 @@ ${content}
         return groupEachCommand(commands);
       });
       __publicField(this, "showToolbar", () => {
-        hideToolbar$1(this.editor);
+        tippy$1.hideAll();
         const commands = this.getCommands();
         this.toolbar.updateItems(commands);
         const focusBlock = this.editor.selection.focusedBlock;
@@ -79922,8 +80000,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);
@@ -79955,6 +80035,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();
@@ -79986,9 +80072,19 @@ ${content}
       __publicField(this, "commandBar");
       __publicField(this, "observer");
       __publicField(this, "toggleDelay", clientType.isSafari ? 800 : 100);
+      __publicField(this, "preHeight", this.virtualViewportHeight);
       __publicField(this, "layoutBar", debounce__default.default(() => {
         const offsetHeight = Math.max(this.clientHeight - this.virtualViewportHeight, 0);
+        if (clientType.isIOS) {
+          if (this.preHeight > this.virtualViewportHeight) {
+            editorScrollIntoView(this.editor);
+          }
+        }
         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();
@@ -80132,17 +80228,6 @@ ${content}
             this.editor.selection.selectBlock(block, offset, offset + 1);
             return true;
           }
-          if (this.editor.selection.range.isCollapsed()) {
-            const rangeRect = getBlockClientRects(this.editor, block, this.editor.selection.range);
-            const clientX = event.touches[0].clientX;
-            const clientY = event.touches[0].clientY;
-            const step = 10;
-            const inRect = rangeRect.some((rect) => clientX > rect.left - step && clientX < rect.right + step && clientY > rect.top - step && clientY < rect.bottom + step);
-            if (inRect) {
-              this.cursorToolbar.showToolbar();
-              return true;
-            }
-          }
         }
         return false;
       });
@@ -80160,6 +80245,11 @@ ${content}
           }, LONG_PRESS_DELAY);
         }
       });
+      __publicField(this, "debounceShowCursorToolbar", debounce__default.default(() => {
+        if (this.editor.selection.range.isCollapsed()) {
+          this.cursorToolbar.showToolbar();
+        }
+      }, 400));
       __publicField(this, "handleTouchEnd", (event) => {
         if (this.longPressTimeout) {
           window.clearTimeout(this.longPressTimeout);
@@ -80171,6 +80261,17 @@ ${content}
         }
         this.longPressTriggered = false;
         this.isMoving = false;
+        if (this.editor.selection.range.isCollapsed()) {
+          const block = this.editor.selection.focusedBlock;
+          const rangeRect = getBlockClientRects(this.editor, block, this.editor.selection.range);
+          const clientX = event.changedTouches[0].clientX;
+          const clientY = event.changedTouches[0].clientY;
+          const step = 18;
+          const inRect = rangeRect.some((rect) => clientX > rect.left - step && clientX < rect.right + step && clientY > rect.top - step && clientY < rect.bottom + step);
+          if (inRect) {
+            this.debounceShowCursorToolbar();
+          }
+        }
       });
       this.editor = editor;
       this.editor.addListener("selectionChanged", this.handleSelectionChange);
@@ -86615,7 +86716,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.74";
+    editor.version = "2.1.1-beta.76";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -86716,7 +86817,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.74";
+    editor.version = "2.1.1-beta.76";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -132723,6 +132824,7 @@ ${data2.flowchartText}
   exports2.editorReplaceBlockText = editorReplaceBlockText;
   exports2.editorReplaceContainer = editorReplaceContainer;
   exports2.editorRunOnce = editorRunOnce;
+  exports2.editorScrollIntoView = editorScrollIntoView;
   exports2.editorSelectAll = editorSelectAll;
   exports2.editorSelectContainer = editorSelectContainer;
   exports2.editorSelectDown = editorSelectDown;
@@ -132881,6 +132983,7 @@ ${data2.flowchartText}
   exports2.getTextOpLength = getTextOpLength;
   exports2.getTextWidth = getTextWidth;
   exports2.getToolbar = getToolbar;
+  exports2.getVisualViewportHeightOffset = getVisualViewportHeightOffset;
   exports2.groupEachCommand = groupEachCommand;
   exports2.handleBlockElementUpdated = handleBlockElementUpdated$1;
   exports2.hasAltOnly = hasAltOnly;

package/package.json

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