@ones-editor/editor 2.8.37 → 2.8.39

package/dist/index.js

@@ -26314,6 +26314,9 @@ var __publicField = (obj, key, value) => {
     }
   }
   function editorScrollIntoView(editor) {
+    if (!editor.scrollable()) {
+      return;
+    }
     if (!isElementVisible(editor.rootContainer)) {
       logger$3R.warn("editorScrollIntoView: editor is not visible");
       return;
@@ -31657,6 +31660,7 @@ ${codeText}
       __publicField(this, "inputHandlers", new EditorInputHandlers(this));
       __publicField(this, "settingsProvider");
       __publicField(this, "_readonly", false);
+      __publicField(this, "_scrollable", true);
       __publicField(this, "getColor", (index2) => {
         const colors = this.options.colors;
         if (colors.length === 0) {
@@ -31884,6 +31888,12 @@ ${codeText}
         return false;
       return elem.closest("div.editor-root") === this.rootElement;
     }
+    scrollable() {
+      return this._scrollable;
+    }
+    setScrollable(scrollable2) {
+      this._scrollable = scrollable2;
+    }
     insertBlock(containerId, blockIndex, blockData, newRange, options) {
       const defaultPos = { blockId: blockData.id, offset: 0 };
       const defaultRange = { anchor: defaultPos, focus: defaultPos };
@@ -37991,6 +38001,7 @@ ${codeText}
           }
           try {
             origHandleMessage(msg);
+            this.emit("opReceived");
           } catch (err) {
             if ((err == null ? void 0 : err.type) === "writeConflict") {
               this.emitWriteConflictError(err, msg);
@@ -39077,9 +39088,9 @@ ${codeText}
     }
     setStatus(status) {
       var _a, _b, _c;
-      if (status === "clean") {
+      if (status === "clean" || status === "busy") {
         if (this.dirtyTimeout) {
-          logger$2U.info("on clean");
+          logger$2U.info(`on ${status}`);
           clearTimeout(this.dirtyTimeout);
           this.dirtyTimeout = null;
         }
@@ -39151,6 +39162,9 @@ ${codeText}
       __publicField(this, "handleWriteConflictError", (error2) => {
         this.handleReset(`write conflict: ${error2.message}, ${JSON.stringify(error2.orgMsg)}`);
       });
+      __publicField(this, "handleOpReceived", () => {
+        this.editStatus.setStatus("busy");
+      });
       __publicField(this, "insertObject", async (rootObjectName, index2, obj) => {
         const ops = [rootObjectName, index2, { i: obj }];
         return this.submitOp(ops);
@@ -39244,7 +39258,10 @@ ${codeText}
         if (containers.length === 0) {
           return Promise.resolve();
         }
-        const ops = containers.map(({ containerId, blocks }) => [docObjectContainerId2EditorDocContainerId(containerId), { i: blocks }]);
+        const ops = containers.map(({ containerId, blocks }) => [
+          docObjectContainerId2EditorDocContainerId(containerId),
+          { i: blocks }
+        ]);
         return this.submitOp([ops]);
       });
       __publicField(this, "submitDeleteChildContainer", async (containerId) => {
@@ -39263,7 +39280,10 @@ ${codeText}
         if (delta.delete.length === 0 && Object.keys(delta.insert).length === 0) {
           return Promise.resolve();
         }
-        const ops = [docObjectContainerId2EditorDocContainerId(containerId), index2];
+        const ops = [
+          docObjectContainerId2EditorDocContainerId(containerId),
+          index2
+        ];
         const deletedKeysSet = new Set(delta.delete);
         Object.entries(delta.insert).forEach(([key, value]) => {
           if (deletedKeysSet.has(key)) {
@@ -39314,6 +39334,7 @@ ${codeText}
       this.disableLogout = disableLogout;
       this.registerCallback(this.remoteCaretHandler);
       this.editStatus = new EditStatus(options);
+      this.client.connection.addListener("opReceived", this.handleOpReceived);
     }
     beginBatchUpdate() {
       this.doc.preventCompose = false;
@@ -39498,7 +39519,9 @@ ${codeText}
       this.endBatchUpdate();
     }
     getComments() {
-      const comments = Object.values(this.data().comments).map((comment) => shareDBDocCommentToComment(comment));
+      const comments = Object.values(this.data().comments).map(
+        (comment) => shareDBDocCommentToComment(comment)
+      );
       return comments;
     }
     getComment(commentId) {
@@ -39538,47 +39561,59 @@ ${codeText}
     }
     onDeleteBlock(containerId, blockIndex, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onDeleteBlock) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onDeleteBlock) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, local);
+        }
+      );
     }
     onInsertBlock(containerId, blockIndex, data2, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onInsertBlock) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, data2, local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onInsertBlock) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, data2, local);
+        }
+      );
     }
     onUpdateBlockData(containerId, blockIndex, delta, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onUpdateBlockData) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, delta, local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onUpdateBlockData) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, delta, local);
+        }
+      );
     }
     onUpdateBlockText(containerId, blockIndex, actions2, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onUpdateBlockText) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, actions2, local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onUpdateBlockText) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blockIndex, actions2, local);
+        }
+      );
     }
     onDeleteContainer(containerId, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
       assert(logger$2T, containerId !== "root", "should not delete root container in doc");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onDeleteChildContainer) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onDeleteChildContainer) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), local);
+        }
+      );
     }
     onCreateContainer(containerId, blocks, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
       assert(logger$2T, containerId !== "root", "should not create root container in doc");
-      this.callbacks.forEach((cb) => {
-        var _a;
-        return (_a = cb.onInsertChildContainer) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blocks, local);
-      });
+      this.callbacks.forEach(
+        (cb) => {
+          var _a;
+          return (_a = cb.onInsertChildContainer) == null ? void 0 : _a.call(cb, editorDpcContainerId2DocObjectContainerId(containerId), blocks, local);
+        }
+      );
     }
     onDeleteComment(commentId, local) {
       assert(logger$2T, this.callbacks.length > 0, "no callbacks");
@@ -69978,6 +70013,9 @@ ${codeText}
         }
       });
       __publicField(this, "handleSelectionChanged", () => {
+        if (!this.editor.scrollable()) {
+          return;
+        }
         setTimeout(() => {
           var _a;
           const commentIds = getCommentsFromSelection(this.editor);
@@ -70287,7 +70325,14 @@ ${codeText}
     }
     onCreateComment(commentId, local) {
       const comment = this.commentsProvider.getComment(commentId);
-      this.list.handleCreateComment(comment, local);
+      try {
+        this.editor.setScrollable(false);
+        this.list.handleCreateComment(comment, local);
+      } finally {
+        setTimeout(() => {
+          this.editor.setScrollable(true);
+        }, 1e3);
+      }
       this.updateCommentCount();
     }
     onDeleteComment(commentId, local) {
@@ -70854,7 +70899,14 @@ ${codeText}
     const range = createBlockSimpleRange(editor, block, selectedBlock.start.offset, selectedBlock.end.offset);
     const command = `comment-${comment.id.toLocaleLowerCase()}`;
     const value = comment.id;
-    editorAddTextAttribute(editor, block, range, command, value);
+    try {
+      editor.setScrollable(false);
+      editorAddTextAttribute(editor, block, range, command, value);
+    } finally {
+      setTimeout(() => {
+        editor.setScrollable(true);
+      }, 1e3);
+    }
   }
   function addCommentToTextBlocks(editor, range, provider) {
     const selectedBlocks = getAllSelectedBlocks(editor, { range });
@@ -93245,9 +93297,19 @@ ${JSON.stringify(error2, null, 2)}`);
       __publicField(this, "id", "comment");
       __publicField(this, "name", i18n$1.t("comment.command"));
       __publicField(this, "icon", CommentIcon$1);
+      __publicField(this, "adding", false);
     }
     onClick(editor, item) {
-      editorAddComment(editor);
+      if (this.adding) {
+        return;
+      }
+      this.adding = true;
+      setTimeout(() => {
+        editorAddComment(editor);
+        setTimeout(() => {
+          this.adding = false;
+        }, 300);
+      }, 300);
     }
   }
   class ColorItem extends TextColorItem {
@@ -93857,7 +93919,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.8.37";
+    editor.version = "2.8.39";
     return editor;
   }
   function isDoc(doc2) {
@@ -93970,7 +94032,7 @@ ${JSON.stringify(error2, null, 2)}`);
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.37";
+    editor.version = "2.8.39";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.8.37",
+  "version": "2.8.39",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {