@ones-editor/editor 2.2.8-beta.10 → 2.2.8-beta.12

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

@@ -70,6 +70,6 @@ export interface CommandBarOptions {
 }
 export type CreateManualCommandBarFunction = (parentItem: CommandItem, closeable: Closeable, options?: CommandBarOptions) => AbstractManualCommandBar;
 export type PopoverOptions = {
-    overflowBoundary?: Element | (() => Element);
+    overflowBoundary?: Element;
 };
 export type SelectItemFrom = 'event' | 'manual';

package/dist/index.js

@@ -10079,9 +10079,6 @@ var __publicField = (obj, key, value) => {
       c = "\\\\";
     return s.replace(new RegExp(`^[${c}]+|[${c}]+$`, "g"), "");
   }
-  function isFunction$1(functionToCheck) {
-    return !!functionToCheck && {}.toString.call(functionToCheck) === "[object Function]";
-  }
   function isPrintableKey(key) {
     if (!key)
       return false;
@@ -52112,7 +52109,7 @@ ${codeText}
       this.toolbar = new ManualToolbar([], void 0, {
         tooltipId: editor.clientId,
         id: "editor-readonly-toolbar",
-        overflowBoundary: isFunction$1(popover == null ? void 0 : popover.overflowBoundary) ? popover == null ? void 0 : popover.overflowBoundary() : popover == null ? void 0 : popover.overflowBoundary,
+        overflowBoundary: popover == null ? void 0 : popover.overflowBoundary,
         refuseOverflow: true,
         padding: 20
       });
@@ -52346,7 +52343,7 @@ ${codeText}
       this.toolbar = new ManualToolbar([], void 0, {
         tooltipId: editor.clientId,
         id: "editor-toolbar",
-        overflowBoundary: isFunction$1(popover == null ? void 0 : popover.overflowBoundary) ? popover == null ? void 0 : popover.overflowBoundary() : popover == null ? void 0 : popover.overflowBoundary,
+        overflowBoundary: popover == null ? void 0 : popover.overflowBoundary,
         refuseOverflow: true,
         padding: 20,
         showName: clientType.isMobile,
@@ -52526,8 +52523,15 @@ ${codeText}
         }
       }
       const getReferenceClientRectByCaret = () => {
+        if (!this.hoveringBlock) {
+          return new DOMRect();
+        }
+        const { element: element2 } = getObjectCommands(this.editor, this.hoveringBlock, this.hoveringTextChild);
+        if (!element2) {
+          return new DOMRect();
+        }
         let rect;
-        const clientRects = element.getClientRects();
+        const clientRects = element2.getClientRects();
         const lineRects = [];
         Array.from(clientRects).forEach((clientRect) => {
           const { y } = clientRect;
@@ -52537,7 +52541,7 @@ ${codeText}
           lineRects.push(y);
         });
         if (lineRects.length > 1) {
-          rect = child ? clientRects[clientRects.length - 1] : clientRects[0];
+          rect = isBlock$1(element2) ? clientRects[0] : clientRects[clientRects.length - 1];
           if (event) {
             for (let i = 0; i < clientRects.length; i++) {
               const clientRect = clientRects[i];
@@ -52549,21 +52553,15 @@ ${codeText}
             }
           }
         } else {
-          rect = element.getBoundingClientRect();
-          if (child) {
-            const childRect = child.getBoundingClientRect();
+          rect = element2.getBoundingClientRect();
+          if (!isBlock$1(element2)) {
+            const childRect = element2.getBoundingClientRect();
             return new DOMRect(childRect.x, childRect.y, childRect.width, childRect.height);
           }
           if (clientRects.length === 1) {
             return new DOMRect(clientRects[0].x, clientRects[0].y, clientRects[0].width, clientRects[0].height);
           }
         }
-        if (this.hoveringBlock) {
-          const blockContent = getBlockContent(this.hoveringBlock);
-          if (blockContent !== element) {
-            return blockContent.getBoundingClientRect();
-          }
-        }
         if (event) {
           const y = rect.y;
           const x = event.clientX;
@@ -52573,8 +52571,9 @@ ${codeText}
       };
       this.toolbar.updateItems(commands);
       if (!this.toolbar.isVisible) {
+        const isText = element === child && !isTextBlockContentBoxChild(element);
         this.toolbar.manualShow(element, {
-          placement: child && !isTextBlockContentBoxChild(child) && !clientType.isMobile ? "bottom" : "top",
+          placement: isText && !clientType.isMobile ? "bottom" : "top",
           getReferenceClientRect: getReferenceClientRectByCaret
         });
         if ((_c = this.toolbar.tippyInstance) == null ? void 0 : _c.popper) {
@@ -67710,7 +67709,7 @@ ${codeText}
         });
       });
       __publicField(this, "handleEditorResize", () => {
-        this.updateItemsLayout();
+        this.updateItemsLayout(false);
       });
       __publicField(this, "handleDocChanged", () => {
         this.updateComments();
@@ -67787,9 +67786,11 @@ ${codeText}
       this.removeAllListeners();
       document.removeEventListener("click", this.handleDocumentClick);
     }
-    updateItemsLayout() {
+    updateItemsLayout(dispatchScroll = true) {
       arrangeItems(this.editor, this.items, this.activeItem);
-      this.dispatchScroll();
+      if (dispatchScroll) {
+        this.dispatchScroll();
+      }
     }
     bindEvents() {
       this.container.addEventListener("click", this.handleContainerClick);
@@ -69596,7 +69597,7 @@ ${codeText}
       const popover = editor.options.componentsOptions.popover;
       this.toolbar = new ManualToolbar([], void 0, {
         id: "table-row-column-toolbar",
-        overflowBoundary: isFunction$1(popover == null ? void 0 : popover.overflowBoundary) ? popover == null ? void 0 : popover.overflowBoundary() : popover == null ? void 0 : popover.overflowBoundary,
+        overflowBoundary: popover == null ? void 0 : popover.overflowBoundary,
         refuseOverflow: true,
         tooltipId: this.editor.clientId
       });
@@ -69660,7 +69661,7 @@ ${codeText}
             modifiers: [{
               name: "flip",
               options: {
-                boundary: isFunction$1(popover == null ? void 0 : popover.overflowBoundary) ? popover == null ? void 0 : popover.overflowBoundary() : popover == null ? void 0 : popover.overflowBoundary,
+                boundary: popover == null ? void 0 : popover.overflowBoundary,
                 fallbackPlacements: ["left", "right"]
               }
             }]
@@ -88377,7 +88378,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.2.8-beta.10";
+    editor.version = "2.2.8-beta.12";
     return editor;
   }
   function isDoc(doc2) {
@@ -88472,7 +88473,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.8-beta.10";
+    editor.version = "2.2.8-beta.12";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -134703,7 +134704,6 @@ ${data2.flowchartText}
   exports2.isFirefox = isFirefox;
   exports2.isFirstChildBlockInComplexBlock = isFirstChildBlockInComplexBlock;
   exports2.isFullSelectedOneComplexBlock = isFullSelectedOneComplexBlock;
-  exports2.isFunction = isFunction$1;
   exports2.isHeadingBlock = isHeadingBlock$1;
   exports2.isHighSurrogate = t$7;
   exports2.isInBlock = isInBlock;

package/package.json

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