@ones-editor/editor 2.1.1-beta.53 → 2.1.1-beta.55

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

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { CloseReason, CommandItem, Closeable } from '../../../../@ones-editor/core';
 import { AbstractManualCommandBar, AbstractCommandBar, CommandBarEvents, CommandBarOptions, CommandItemElement, CreateManualCommandBarFunction, ManualShowCommandBarOptions, SelectItemFrom } from './types';
@@ -29,7 +30,7 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     private getSelectedItemIndex;
     private getPrevItemIndex;
     private getNextItemIndex;
-    protected clearSelectedItem(): void;
+    protected clearSelectedItem: import("lodash").DebouncedFunc<() => void>;
     selectItem(id: string, from?: SelectItemFrom): void;
     private lastEnterPauseTime;
     private startPauseMouseEnter;

package/dist/index.js

@@ -5829,7 +5829,6 @@ div[data-command-bar-id=mobile-bottom-menu] .mobile-menu-wrap.editor-mention .co
   line-height: 2.4;
 }
 div[data-command-bar-id=mobile-bottom-menu] .mobile-menu-wrap.editor-mention .command-item .mobile-item-wrap .mobile-item-content {
-  max-height: calc(100vh - 180px);
   height: 400px;
   overflow-x: auto;
   overscroll-behavior: contain;
@@ -11211,25 +11210,19 @@ var __publicField = (obj, key, value) => {
         }
       });
       __publicField(this, "handleClick", (event) => {
-        if (!this.mouseDownEvent)
-          return;
-        const mouseEvent = ensureIsMobileEvent(event) ? createMouseEventFromTouchEvent(event) : event;
-        this.editor.emit("click", this.editor, mouseEvent);
-        const target = ensureIsMobileEvent(this.mouseDownEvent) ? this.mouseDownEvent.changedTouches[0].target : this.mouseDownEvent.target;
+        this.editor.emit("click", this.editor, event);
+        const target = event.target;
         if (isInBlockTools(target)) {
-          this.mouseDownEvent = null;
           return;
         }
-        if (event.detail === 1 || clientType.isMobile) {
+        if (event.detail === 1) {
           this.editor.input.focus();
         }
-        if (!ensureIsMobileEvent(event) && event.detail === 3) {
+        if (event.detail === 3) {
           this.editor.selectionHandler.handleTripleClick(event);
         }
-        if (event.detail === 1 || (ensureIsMobileEvent(event) || event.button === 0)) {
-          const clientX = ensureIsMobileEvent(event) ? event.changedTouches[0].clientX : event.clientX;
-          const clientY = ensureIsMobileEvent(event) ? event.changedTouches[0].clientY : event.clientY;
-          const elem = getElementFromPoint(clientX, clientY);
+        if (event.detail === 1 && event.button === 0) {
+          const elem = getElementFromPoint(event.clientX, event.clientY);
           if (elem && isChildNode(this.rootContainer, elem)) {
             const block = getParentBlock(elem);
             if (block && isChildNode(block, elem)) {
@@ -11237,19 +11230,17 @@ var __publicField = (obj, key, value) => {
             }
           }
         }
-        this.mouseDownEvent = null;
       });
       __publicField(this, "handleBlockClick", (event, block, elem) => {
         var _a, _b;
         if (!isTextKindBlock(this.editor, block)) {
           return;
         }
-        const mouseEvent = ensureIsMobileEvent(event) ? createMouseEventFromTouchEvent(event) : event;
         const box = getParentBox(elem);
         if (box) {
           const block2 = getParentBlock(box);
           assert(logger$4n, block2, "no parent block");
-          (_b = (_a = this.editor.editorBoxes.getBoxClass(getBoxTypeFromElement(box))) == null ? void 0 : _a.handleClickBox) == null ? void 0 : _b.call(_a, this.editor, box, mouseEvent);
+          (_b = (_a = this.editor.editorBoxes.getBoxClass(getBoxTypeFromElement(box))) == null ? void 0 : _a.handleClickBox) == null ? void 0 : _b.call(_a, this.editor, box, event);
           return;
         }
         const link2 = elem.closest("span.text.link");
@@ -11257,7 +11248,7 @@ var __publicField = (obj, key, value) => {
           const children = getTextBlockContentChildren(block);
           const index2 = children.indexOf(link2);
           if (index2 !== -1) {
-            this.editor.emit("clickLink", this.editor, mouseEvent, link2);
+            this.editor.emit("clickLink", this.editor, event, link2);
           }
         }
       });
@@ -39073,6 +39064,16 @@ ${codeText}
           disablePageScroll(this.id);
         }
       });
+      __publicField(this, "clearSelectedItem", debounce__default.default(() => {
+        const item = this.getSelectedItem();
+        if (!item) {
+          return;
+        }
+        const elem = this.getItemElementById(item.id);
+        if (elem) {
+          removeClass(elem, "selected");
+        }
+      }, 200));
       __publicField(this, "lastEnterPauseTime", 0);
       __publicField(this, "startPauseMouseEnter", () => {
         this.lastEnterPauseTime = Date.now();
@@ -39133,9 +39134,7 @@ ${codeText}
         }
         if (clientType.isMobile) {
           this.selectItem(id);
-          setTimeout(() => {
-            this.clearSelectedItem();
-          }, 1e3);
+          this.clearSelectedItem();
         }
         if (item.children && item.children.length > 0 && item.manualShowChildren) {
           this.showSubCommandBar(item.childrenMenuId);
@@ -39306,16 +39305,6 @@ ${codeText}
         }
       }
     }
-    clearSelectedItem() {
-      const item = this.getSelectedItem();
-      if (!item) {
-        return;
-      }
-      const elem = this.getItemElementById(item.id);
-      if (elem) {
-        removeClass(elem, "selected");
-      }
-    }
     selectItem(id, from = "event") {
       const exists = this.getSelectedItem();
       if (exists) {
@@ -50558,8 +50547,12 @@ ${codeText}
       }
       this.toolbar.updateItems(allCommands);
       const lastBlock2 = selectedBlocks[selectedBlocks.length - 1];
-      const reverseToolbar = !this.editor.selection.range.isReverse() && lastBlock2 !== firstBlock;
-      const selectedBlock = reverseToolbar ? lastBlock2 : firstBlock;
+      let reverseToolbar = !this.editor.selection.range.isReverse() && lastBlock2 !== firstBlock;
+      let selectedBlock = reverseToolbar ? lastBlock2 : firstBlock;
+      if (clientType.isMobile) {
+        reverseToolbar = false;
+        selectedBlock = firstBlock;
+      }
       const rect = getReferenceClientRect(this.editor, selectedBlock);
       if (!this.toolbar.isVisible) {
         const anchor2 = createBlockAnchor(this.editor, selectedBlock.block, "editor-quick-menu", rect);
@@ -78318,6 +78311,8 @@ ${content}
       __publicField(this, "createMobileCommandItem", (items) => {
         this.mobileWrap = createElement("div", ["mobile-item-wrap"], null);
         const content = createElement("div", ["mobile-item-content"], null);
+        const clientHeight = this.editor.rootContainer.clientHeight;
+        content.style.maxHeight = `${clientHeight - 180}px`;
         const icon = createElement("div", ["editor-input-icon"], null);
         icon.innerHTML = SearchIcon;
         const input2 = createInput(this.mobileWrap, {
@@ -79995,6 +79990,7 @@ ${content}
         this.toggle();
       });
       this.editor = editor;
+      createMobileBottomMenu();
       this.commandBar = new MobileToolbarHandler(editor, document.body);
       this.observer = new ActiveElementObserver({
         onFocused: this.handleFocusIn,
@@ -80076,6 +80072,7 @@ ${content}
       __publicField(this, "longPressTriggered", false);
       __publicField(this, "gripper");
       __publicField(this, "cursorToolbar");
+      __publicField(this, "isMoving", false);
       __publicField(this, "handleSelectionChange", () => {
         this.gripper.update();
       });
@@ -80083,25 +80080,23 @@ ${content}
         const touch = event.touches[0];
         const range = getBlockRangeFromPoint(this.editor, touch.clientX, touch.clientY);
         if (!range || this.isMoving) {
-          return;
+          return false;
         }
         if (!range.isSimple()) {
           this.editor.selection.setRange(range);
-          return;
+          return true;
         }
         const block = this.editor.getBlockById(range.start.blockId);
         if (!isTextKindBlock(this.editor, block)) {
           this.editor.selection.selectBlock(block, 0);
+          return true;
         }
         if (isTextKindBlock(this.editor, block)) {
           const offset = range.start.offset;
           const childInfo = getTextBlockChild(block, offset);
           if (childInfo.next && isBox(childInfo.next)) {
             this.editor.selection.selectBlock(block, offset, offset + 1);
-            this.editor.focus();
-            event.preventDefault();
-            event.stopPropagation();
-            return;
+            return true;
           }
           if (this.editor.selection.range.isCollapsed()) {
             const rangeRect = getBlockClientRects(this.editor, block, this.editor.selection.range);
@@ -80111,14 +80106,12 @@ ${content}
             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();
-              event.preventDefault();
-              event.stopPropagation();
-              this.editor.focus();
+              return true;
             }
           }
         }
+        return false;
       });
-      __publicField(this, "isMoving", false);
       __publicField(this, "handleTouchMove", (event) => {
         this.isMoving = true;
       });
@@ -80127,7 +80120,9 @@ ${content}
         if (event.touches.length === 1) {
           this.longPressTimeout = window.setTimeout(() => {
             this.longPressTriggered = true;
-            this.handleLongPress(event);
+            if (this.handleLongPress(event)) {
+              this.editor.focus();
+            }
           }, LONG_PRESS_DELAY);
         }
       });
@@ -80145,17 +80140,19 @@ ${content}
       });
       this.editor = editor;
       this.editor.addListener("selectionChanged", this.handleSelectionChange);
+      this.editor.addListener("docChanged", this.handleSelectionChange);
       document.addEventListener("touchstart", this.handleTouchStart);
       document.addEventListener("touchend", this.handleTouchEnd, { capture: true });
       document.addEventListener("touchmove", this.handleTouchMove);
       this.gripper = new SelectionGripper(this.editor);
-      createMobileBottomMenu();
       this.cursorToolbar = createCursorToolbar(this.editor);
     }
     destroy() {
       this.editor.removeListener("selectionChanged", this.handleSelectionChange);
+      this.editor.removeListener("docChanged", this.handleSelectionChange);
       document.removeEventListener("touchstart", this.handleTouchStart);
       document.removeEventListener("touchend", this.handleTouchEnd);
+      document.removeEventListener("touchmove", this.handleTouchMove);
     }
   }
   function getChildContainers(editor, block, from, to) {
@@ -86541,7 +86538,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.53";
+    editor.version = "2.1.1-beta.55";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -86639,7 +86636,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.1-beta.53";
+    editor.version = "2.1.1-beta.55";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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