@ones-editor/editor 2.1.1-beta.1 → 2.1.1-beta.3

package/dist/index.js

@@ -11326,6 +11326,7 @@ var __publicField = (obj, key, value) => {
     }
     toDocRange() {
       return {
+        reverse: this.reverse,
         anchor: this.anchor,
         focus: this.focus
       };
@@ -11818,6 +11819,24 @@ var __publicField = (obj, key, value) => {
       focus
     };
   }
+  function isFullSelectedOneComplexBlock(editor, complexRange) {
+    const range = complexRange || editor.selection.range;
+    const { start, end } = range;
+    const startBlock = editor.getBlockById(start.blockId);
+    const endBlock = editor.getBlockById(end.blockId);
+    if (startBlock !== endBlock) {
+      return false;
+    }
+    if (!isComplexKindBlock(editor, startBlock)) {
+      return false;
+    }
+    if (isSimpleBlockPosition(start)) {
+      return true;
+    }
+    const containers = complexBlockGetSelectedContainers(editor, startBlock, start, end);
+    const allContainers = complexBlockGetAllChildContainers(editor, startBlock);
+    return containers.length === allContainers.length;
+  }
   class EditorComplexSelectionRange {
     constructor(editor, pos) {
       __publicField(this, "editor");
@@ -11886,6 +11905,7 @@ var __publicField = (obj, key, value) => {
     }
     toDocRange() {
       return {
+        reverse: this.reverse,
         anchor: this._anchor,
         focus: this._focus
       };
@@ -27037,24 +27057,6 @@ var __publicField = (obj, key, value) => {
       editor.deleteBlock(block);
     }
   }
-  function isFullSelectedOneComplexBlock(editor) {
-    const { range } = editor.selection;
-    const { start, end } = range;
-    const startBlock = editor.getBlockById(start.blockId);
-    const endBlock = editor.getBlockById(end.blockId);
-    if (startBlock !== endBlock) {
-      return false;
-    }
-    if (!isComplexKindBlock(editor, startBlock)) {
-      return false;
-    }
-    if (isSimpleBlockPosition(start)) {
-      return true;
-    }
-    const containers = complexBlockGetSelectedContainers(editor, startBlock, start, end);
-    const allContainers = complexBlockGetAllChildContainers(editor, startBlock);
-    return containers.length === allContainers.length;
-  }
   function handleEditorEnterEvent$1(editor, event) {
     if (isFullSelectedOneComplexBlock(editor)) {
       const focusedBlock2 = editor.getFocusedBlock();
@@ -45030,7 +45032,7 @@ ${codeText}
   const logger$1$ = getLogger("object-commands");
   function getObjectCommands(editor, block, child) {
     const result = getSpecialBlockCommands(editor, block, child, "hovering-toolbar");
-    const { boxCommands, blockCommands } = result;
+    const { element: targetElement, boxCommands, blockCommands } = result;
     let element = null;
     const commands = [];
     if (boxCommands.length > 0) {
@@ -45046,7 +45048,7 @@ ${codeText}
     if (blockCommands.length > 0) {
       for (let i = 0; i < blockCommands.length; i++) {
         const blockCommand = blockCommands[i];
-        element = element || blockCommand.element || null;
+        element = element || targetElement || null;
         if (blockCommand.startGroup) {
           commands.push({ id: "separator", name: "", type: "separator" });
         }
@@ -65218,9 +65220,26 @@ ${codeText}
       abstract
     });
     editor.undoManager.runInGroup(() => {
-      const selectedBlocks2 = getAllSelectedBlocks(editor, { simpleBlockOnly: true, range });
+      let selectedBlocks2 = [];
+      if (range.isSimple()) {
+        selectedBlocks2 = range.getSelectedBlocks();
+      } else {
+        range.getSelectedContainers().forEach((container) => {
+          const blocks = getChildBlocks(container);
+          selectedBlocks2.push(...blocks.map((block) => {
+            const range2 = createBlockSimpleRange(editor, block, 0, getBlockTextLength$6(editor, block));
+            const selectedBlock = {
+              block,
+              start: range2.start,
+              end: range2.end
+            };
+            return selectedBlock;
+          }));
+        });
+      }
       selectedBlocks2.forEach((selectedBlock) => {
         if (!isTextKindBlock(editor, selectedBlock.block)) {
+          updateCommentToBlock(editor, selectedBlock.block, comment);
           return;
         }
         addCommentToSelectedTextBlock(editor, selectedBlock, comment);
@@ -65568,17 +65587,18 @@ ${codeText}
     var _a, _b;
     const user = editor.doc.getUser();
     const startBlock = editor.getBlockById(range.start.blockId);
-    const endBlock = editor.getBlockById(range.end.blockId);
-    const startOffset = range.start.offset;
-    const endOffset = range.end.offset;
     const containerId = docObjectContainerId2EditorDocContainerId(getContainerId(getParentContainer(startBlock)));
+    let selectedContainers = [];
+    if (!range.isSimple()) {
+      const complexRange = range;
+      selectedContainers = complexBlockGetSelectedContainers(editor, startBlock, complexRange.start, complexRange.end).map((c) => getContainerId(c));
+    }
     const body = {
       avatarUrl: user.avatarUrl,
       containerId,
-      startBlockId: getBlockId(startBlock),
-      startOffset,
-      endBlockId: getBlockId(endBlock),
-      endOffset,
+      rangeType: range.isSimple() ? "simple" : "complex",
+      range: range.toDocRange(),
+      selectedContainers,
       commentId: comment.id,
       commentGroupId: comment.groupId,
       comment: commentDoc
@@ -65674,9 +65694,6 @@ ${codeText}
       const range = this.localCreatedComments.get(commentId);
       if (range) {
         this.localCreatedComments.delete(commentId);
-        if (!range.isSimple()) {
-          return;
-        }
         const comments = this.editor.getCustom("editor-comments");
         const provider = comments.commentProvider;
         const comment = provider.getComment(commentId);
@@ -65735,8 +65752,9 @@ ${codeText}
           };
         }
       }
+      const types2 = ["embed", "code", "callout"];
       const type = getBlockType(blockElement);
-      if (type !== "embed" && type !== "code") {
+      if (!types2.includes(type)) {
         return void 0;
       }
       return {
@@ -65763,11 +65781,25 @@ ${codeText}
       };
     }
     getTextCommands(editor, range) {
-      return [{
-        id: "add-comment-to-old-doc/text",
-        name: i18n$1.t("comment.quickMenuCommand"),
-        icon: CommentIcon$1
-      }];
+      if (range.isCollapsed()) {
+        return [];
+      }
+      if (range.isSimple()) {
+        return [{
+          id: "add-comment-to-old-doc/text",
+          name: i18n$1.t("comment.quickMenuCommand"),
+          icon: CommentIcon$1
+        }];
+      }
+      const selectedBlock = range.getSelectedBlocks()[0];
+      if (selectedBlock && getBlockType(selectedBlock.block) === "table") {
+        return [{
+          id: "add-comment-to-old-doc/text",
+          name: i18n$1.t("comment.quickMenuCommand"),
+          icon: CommentIcon$1
+        }];
+      }
+      return [];
     }
     executeCommand(editor, command, options) {
       if (command.id === "add-comment-to-old-doc/text") {
@@ -65775,11 +65807,21 @@ ${codeText}
         if (!comments) {
           return;
         }
+        comments.showCommentList();
         const range = editor.selection.range;
         if (!range.isSimple()) {
-          return;
+          if (isFullSelectedOneComplexBlock(editor, range)) {
+            const selectedBlock = range.getSelectedBlocks()[0];
+            if (selectedBlock) {
+              editor.readonly = false;
+              addCommentToBlock(editor, selectedBlock.block);
+              setTimeout(() => {
+                editor.readonly = true;
+              }, 100);
+            }
+            return;
+          }
         }
-        comments.showCommentList();
         editor.readonly = false;
         addCommentToTextBlocks(editor, range, comments.commentProvider);
         setTimeout(() => {
@@ -67925,7 +67967,9 @@ ${codeText}
       const { fromCol: startCol, toCol: endCol } = getTableSelectionRange(complexBlock, editor.selection.range.start, editor.selection.range.end);
       const grid = TableGrid.fromBlock(complexBlock);
       if (startCol !== 0 || endCol !== grid.colCount - 1) {
-        offset = 60;
+        if (!editor.readonly) {
+          offset = 60;
+        }
       }
     }
     const clientRect = getClientRects(editor, complexBlock, editor.selection.range)[0];
@@ -83086,7 +83130,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.1-beta.1";
+    editor.version = "2.1.1-beta.3";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -83181,7 +83225,7 @@ ${data2.flowchartText}
     if (!clientType.isMobile) {
       OnesEditorToolbar.register(editor);
     }
-    editor.version = "2.1.1-beta.1";
+    editor.version = "2.1.1-beta.3";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -129364,6 +129408,7 @@ ${data2.flowchartText}
   exports2.isExpandedHeadingBlock = isExpandedHeadingBlock;
   exports2.isFirefox = isFirefox;
   exports2.isFirstChildBlockInComplexBlock = isFirstChildBlockInComplexBlock;
+  exports2.isFullSelectedOneComplexBlock = isFullSelectedOneComplexBlock;
   exports2.isHeadingBlock = isHeadingBlock$1;
   exports2.isHighSurrogate = t$7;
   exports2.isInBlock = isInBlock;

package/package.json

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