@ones-editor/editor 2.2.11 → 2.2.12-beta.2

package/dist/index.js

@@ -5836,6 +5836,7 @@ div.editor-root:not(.mobile) div.editor-content div[data-type=editor-container]
   flex: 1;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
 }
 .version-dialog .version-loading svg {
   width: 28px;
@@ -9885,7 +9886,7 @@ var __publicField = (obj, key, value) => {
       removeStyle(CURSOR_TYPE_ID);
     }
   }
-  const MIN_DISTANCE_THRESHOLD$1 = 3;
+  const MIN_DISTANCE_THRESHOLD$3 = 3;
   const logger$4C = getLogger("drag-drop");
   class DragDrop {
     constructor(options) {
@@ -9916,7 +9917,7 @@ var __publicField = (obj, key, value) => {
           this.onDragging(event, deltaX, deltaY);
           return;
         }
-        const threshold = (_a = this.options.minThreshold) != null ? _a : MIN_DISTANCE_THRESHOLD$1;
+        const threshold = (_a = this.options.minThreshold) != null ? _a : MIN_DISTANCE_THRESHOLD$3;
         if (Math.abs(deltaX) >= threshold || Math.abs(deltaY) >= threshold) {
           this.onDragStart(this.mouseDownEvent);
         }
@@ -11448,7 +11449,7 @@ var __publicField = (obj, key, value) => {
     return block;
   }
   const logger$4p = getLogger("root-container");
-  const MIN_DISTANCE_THRESHOLD = 3;
+  const MIN_DISTANCE_THRESHOLD$2 = 3;
   class RootContainer {
     constructor(editor, rootContainer) {
       __publicField(this, "resizeObserver");
@@ -11546,7 +11547,7 @@ var __publicField = (obj, key, value) => {
           return;
         }
         if (target instanceof HTMLElement && target.draggable) {
-          this.editor.selectionHandler.handleMouseDown(event, { autoScroll: false });
+          this.editor.selectionHandler.handleMouseDown(event);
           this.editor.selectionHandler.stopSelection();
           this.editor.input.focus();
           return;
@@ -11558,7 +11559,7 @@ var __publicField = (obj, key, value) => {
           } else {
             document.addEventListener("touchend", this.handleMouseUp);
           }
-          this.editor.selectionHandler.handleMouseDown(event, { autoScroll: true });
+          this.editor.selectionHandler.handleMouseDown(event);
         }
         this.editor.input.focus({ preventScroll: true });
       });
@@ -11568,7 +11569,7 @@ var __publicField = (obj, key, value) => {
           return;
         const deltaX = event.x - this.mouseDownEvent.x;
         const deltaY = event.y - this.mouseDownEvent.y;
-        if (Math.abs(deltaX) >= MIN_DISTANCE_THRESHOLD || Math.abs(deltaY) >= MIN_DISTANCE_THRESHOLD) {
+        if (Math.abs(deltaX) >= MIN_DISTANCE_THRESHOLD$2 || Math.abs(deltaY) >= MIN_DISTANCE_THRESHOLD$2) {
           this.editor.selectionHandler.handleMouseMove(event);
           this.isMoved = true;
         }
@@ -11807,7 +11808,7 @@ var __publicField = (obj, key, value) => {
   function isRootBlock(block) {
     return isRootContainer(getParentContainer(block));
   }
-  function getBlockProperties$e(editor, block) {
+  function getBlockProperties$d(editor, block) {
     var _a;
     const blockClass = getBlockClass(editor, block);
     const properties = (_a = blockClass.getBlockProperties) == null ? void 0 : _a.call(blockClass, editor, block);
@@ -12422,7 +12423,7 @@ var __publicField = (obj, key, value) => {
     }
     return embed.convertTo(editor, blockData, doc2, type);
   }
-  function getBlockProperties$d(editor, block) {
+  function getBlockProperties$c(editor, block) {
     const embedClass = getEmbedClassFromBlock(editor, block);
     if (embedClass.getBlockProperties) {
       return embedClass.getBlockProperties(editor, block);
@@ -12521,7 +12522,7 @@ var __publicField = (obj, key, value) => {
     clearSelection: clearSelection$5,
     convertFrom: convertFrom$9,
     convertTo: convertTo$l,
-    getBlockProperties: getBlockProperties$d,
+    getBlockProperties: getBlockProperties$c,
     getOptions: getOptions$9,
     handleDeleteBlock: handleDeleteBlock$5,
     handleUpdateBlock: handleUpdateBlock$6,
@@ -24409,49 +24410,6 @@ var __publicField = (obj, key, value) => {
   function getClientRects$1(editor, block, range) {
     return getRangeClientRects(editor, block, range);
   }
-  function getAbstractByBlockText(editor, blockText) {
-    let res = "";
-    blockText.forEach((op) => {
-      var _a, _b, _c;
-      if (!op.insert) {
-        return;
-      }
-      if (op.attributes && op.attributes.box === true) {
-        const box = editor.getBoxById(op.attributes.id);
-        const properties = (_b = (_a = editor.editorBoxes.getBoxClass(op.attributes.type)).getBoxProperties) == null ? void 0 : _b.call(_a, editor, box);
-        res += (_c = properties == null ? void 0 : properties.abstract) != null ? _c : " ";
-        return;
-      }
-      res += op.insert;
-    });
-    return res.trim();
-  }
-  function getBlockProperties$c(editor, block) {
-    assert(logger$3L, isTextKindBlock(editor, block), "block in not textBlock");
-    const range = editor.selection.range;
-    let abstract = "";
-    if (range.isCollapsed()) {
-      const blockText = editor.getBlockText(block);
-      abstract = getAbstractByBlockText(editor, blockText);
-    } else {
-      const blockId = getBlockId(block);
-      const selectedBlock = getAllSelectedBlocks(editor, { simpleBlockOnly: true }).find((b) => getBlockId(b.block) === blockId);
-      if (selectedBlock && !isEmptyTextBlock(editor, selectedBlock.block)) {
-        assert(logger$3L, selectedBlock.block === block, "block not match");
-        const blockOps = editor.getBlockText(block);
-        const { start, end } = selectedBlock;
-        const offset = start.offset;
-        const length = end.offset - offset;
-        if (length > 0) {
-          const { middle } = splitToThree(blockOps, offset, length);
-          abstract = getAbstractByBlockText(editor, middle);
-        }
-      }
-    }
-    return {
-      abstract: abstract.trim()
-    };
-  }
   function convertTo$k(editor, blockData, doc2, type) {
     assert(logger$3L, blockData.text, "no text for text block");
     if (type === "text") {
@@ -24495,7 +24453,6 @@ var __publicField = (obj, key, value) => {
     getCaretRect: getTextCaretRect,
     getClientRects: getClientRects$1,
     setBlockText: updateBlockText$1,
-    getBlockProperties: getBlockProperties$c,
     convertTo: convertTo$k,
     blockToDoc: blockToDoc$1
   };
@@ -28090,9 +28047,8 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "startPos", null);
       __publicField(this, "lastCaretRect");
       __publicField(this, "mouseDownEvent", null);
-      __publicField(this, "autoScroll", null);
-      __publicField(this, "handleMouseDown", (event, options) => {
-        var _a;
+      __publicField(this, "autoScroll");
+      __publicField(this, "handleMouseDown", (event) => {
         this.mouseDownEvent = event;
         const x = ensureIsMobileEvent(event) ? event.changedTouches[0].clientX : event.x;
         const y = ensureIsMobileEvent(event) ? event.changedTouches[0].clientY : event.y;
@@ -28101,30 +28057,16 @@ var __publicField = (obj, key, value) => {
           if (range instanceof EditorComplexSelectionRange) {
             return;
           }
-          if (!this.autoScroll && options.autoScroll) {
-            const selectedBlocks = range.getSelectedBlocks();
-            const scrollElement = getScrollContainer$1(selectedBlocks[0].block);
-            this.autoScroll = new AutoScroll({
-              scrollElement,
-              edge: {
-                top: 50,
-                bottom: 50
-              }
-            });
-          }
           const oldRange = this.editor.selection.range;
           if (event.shiftKey && oldRange.isSimple()) {
             const oldAnchor = oldRange.anchor;
-            this.editor.selection.setSelection(oldAnchor, range.focus);
+            this.editor.selection.setSelection(oldAnchor, range.focus, { noScroll: true });
             this.startPos = range.start;
           } else {
-            this.editor.selection.setSelection(range.anchor, range.focus);
+            this.editor.selection.setSelection(range.anchor, range.focus, { noScroll: true });
             this.startPos = range.start;
           }
           this.editor.selection.updateLastCaretRect();
-          if (options.autoScroll) {
-            (_a = this.autoScroll) == null ? void 0 : _a.active();
-          }
         }
       });
       __publicField(this, "handleMouseMove", (event) => {
@@ -28141,21 +28083,28 @@ var __publicField = (obj, key, value) => {
         if (!range) {
           return;
         }
+        this.autoScroll.active();
         const adjusted = adjustSelectionPos$1(this.editor, this.startPos, range.end);
         if (!adjusted) {
           return;
         }
         const { anchor: anchor2, focus } = adjusted;
-        this.editor.selection.setSelection(anchor2, focus);
+        this.editor.selection.setSelection(anchor2, focus, { noScroll: true });
       });
       __publicField(this, "handleMouseUp", (event) => {
-        var _a;
-        (_a = this.autoScroll) == null ? void 0 : _a.inactive();
+        this.autoScroll.inactive();
         this.startPos = null;
       });
       this.editor = editor;
       this.startPos = null;
       this.lastCaretRect = new DOMRect();
+      this.autoScroll = new AutoScroll({
+        scrollElement: editor.scrollContainer,
+        edge: {
+          top: 50,
+          bottom: 50
+        }
+      });
     }
     isSelecting() {
       return this.startPos !== null;
@@ -51759,10 +51708,6 @@ ${codeText}
           return;
         }
       }
-      if (isTitleBlock$2(firstBlock.block)) {
-        this.toolbar.close("selectionChange");
-        return;
-      }
       this.toolbar.updateItems(commands);
       const lastBlock2 = selectedBlocks[selectedBlocks.length - 1];
       const reverseToolbar = !this.editor.selection.range.isReverse() && lastBlock2 !== firstBlock;
@@ -60495,17 +60440,6 @@ $$${mathData.mathjaxText}$$
       return true;
     }
   }
-  function getCommentAbstract(editor, blocks) {
-    return blocks.map((block) => {
-      var _a, _b;
-      const blockClass = getBlockClass(editor, block);
-      const blockProperties = (_a = blockClass.getBlockProperties) == null ? void 0 : _a.call(blockClass, editor, block);
-      if (isEmbedBlock(block) || isComplexKindBlock(editor, block)) {
-        return (blockProperties == null ? void 0 : blockProperties.abstract) ? `[${blockProperties.abstract}]` : "";
-      }
-      return (_b = blockProperties == null ? void 0 : blockProperties.abstract) != null ? _b : "";
-    }).join(" ");
-  }
   function getCommentAbstractFromSelectedBlocks(editor, blocks) {
     return blocks.map((selectedBlock) => {
       var _a, _b;
@@ -60560,7 +60494,9 @@ $$${mathData.mathjaxText}$$
     editor.updateBlockData(block, newData);
   }
   function addCommentToBlock$1(editor, block, provider) {
-    const abstract = getCommentAbstract(editor, [block]);
+    const { start, end } = createBlockSimpleRange(editor, block, 0, getBlockTextLength$6(editor, block));
+    const selectedBlock = { block, start, end };
+    const abstract = getCommentAbstractFromSelectedBlocks(editor, [selectedBlock]);
     const comment = createComment({
       editor,
       abstract
@@ -64351,6 +64287,7 @@ ${codeText}
     return block;
   }
   const logger$1i = getLogger("block-menu-drag-handler");
+  const MIN_DISTANCE_THRESHOLD$1 = 3;
   function createDragEventFromMouseEvent$2(event, type) {
     const dragEvent = new DragEvent(type, {
       bubbles: true,
@@ -64368,7 +64305,7 @@ ${codeText}
     constructor(editor, button2) {
       __publicField(this, "dragPreview");
       __publicField(this, "autoScroll");
-      __publicField(this, "oldPos", { x: 0, y: 0 });
+      __publicField(this, "startPos", { x: 0, y: 0 });
       __publicField(this, "handleMouseDown", (event) => {
         const block = this.button.blockMenu.currentBlock;
         assert(logger$1i, block, "no dragged block");
@@ -64381,7 +64318,7 @@ ${codeText}
           return;
         }
         const { x, y } = event;
-        this.oldPos = { x, y };
+        this.startPos = { x, y };
         document.addEventListener("mouseup", this.handleDragEnd);
         this.editor.contentElement.addEventListener("mousemove", this.handleDrag);
       });
@@ -64412,13 +64349,14 @@ ${codeText}
       });
       __publicField(this, "handleDrag", (event) => {
         const { target, x, y } = event;
-        if (this.oldPos.x === x && this.oldPos.y === y) {
+        const deltaX = x - this.startPos.x;
+        const deltaY = y - this.startPos.y;
+        if (Math.abs(deltaX) < MIN_DISTANCE_THRESHOLD$1 && Math.abs(deltaY) < MIN_DISTANCE_THRESHOLD$1) {
           return;
         }
         if (!window.isDragging) {
           this.handleDragStart(event);
         }
-        this.oldPos = { x, y };
         assert(logger$1i, target instanceof Element, "target is invalid");
         this.dragPreview.handleDrag(event);
         const dragEvent = createDragEventFromMouseEvent$2(event, "dragover");
@@ -65457,6 +65395,7 @@ ${codeText}
     }
     return true;
   }
+  const MIN_DISTANCE_THRESHOLD = 3;
   async function elementToDataUrl$1(element) {
     const orgDataUrl = await domToImage__default.default.toSvg(element);
     return orgDataUrl;
@@ -65565,25 +65504,27 @@ ${codeText}
         }
       });
       __publicField(this, "handleDrag", (event) => {
-        var _a;
         const { x, y } = event;
-        if (((_a = this.startPosition) == null ? void 0 : _a.x) === x && this.startPosition.y === y) {
+        if (!this.startPosition) {
+          return;
+        }
+        const { x: startX, y: startY } = this.startPosition;
+        const deltaX = x - startX;
+        const deltaY = y - startY;
+        if (Math.abs(deltaX) < MIN_DISTANCE_THRESHOLD && Math.abs(deltaY) < MIN_DISTANCE_THRESHOLD) {
           return;
         }
         if (!window.isDragging) {
           window.isDragging = true;
           this.handleDragStart(event);
         }
-        if (this.startPosition && this.dragContainer) {
+        if (this.dragContainer) {
           const { x: x2, y: y2 } = event;
           if (x2 === 0 && y2 === 0) {
             this.dragContainer.style.transform = "";
             this.dragContainer.style.opacity = "0";
             return;
           }
-          const { x: startX, y: startY } = this.startPosition;
-          const deltaX = x2 - startX;
-          const deltaY = y2 - startY;
           this.dragContainer.style.transform = `translate(${deltaX}px, ${deltaY}px)`;
           this.dragContainer.style.opacity = "0.5";
         }
@@ -68987,8 +68928,7 @@ ${codeText}
       return;
     }
     const selectedBlocks = getAllSelectedBlocks(editor, { simpleBlockOnly: true });
-    const blocks = selectedBlocks.map((s) => s.block);
-    const abstract = getCommentAbstract(editor, blocks);
+    const abstract = getCommentAbstractFromSelectedBlocks(editor, selectedBlocks);
     const comment = createComment({
       editor,
       abstract
@@ -74044,14 +73984,11 @@ ${content}
     }
     const list2 = elem;
     const blocks = [];
-    let firstLevel;
+    let firstLevel = 1;
     Array.from(list2.children).forEach((child) => {
       if (child instanceof HTMLLIElement) {
-        const listData = getListData(child);
+        getListData(child);
         const textBlocks = options.textElementToBlocks(child, options);
-        if (!firstLevel) {
-          firstLevel = listData.level;
-        }
         const firstBlock = textBlocks[0];
         blocks.push({
           ...firstBlock,
@@ -76154,7 +76091,7 @@ ${content}
           rangeInSelected = containers.some((selectContainer) => selectContainer.contains(nextBlock));
         }
         if (!rangeInSelected) {
-          this.editor.selectionHandler.handleMouseDown(event, { autoScroll: false });
+          this.editor.selectionHandler.handleMouseDown(event);
         }
       });
       __publicField(this, "handleContextMenu", (event) => {
@@ -86438,16 +86375,18 @@ ${data2.flowchartText}
     StatusBox
   ];
   function createHistoryEditor(root2, doc2, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     Logger$2.level = (_a = options.logLevel) != null ? _a : LogLevel.DEBUG;
+    const tableOptions = { ...(_b = options.componentsOptions) == null ? void 0 : _b.table, locatingContainer: void 0 };
+    const componentsOptions = { ...options.componentsOptions, table: tableOptions };
     const editor = createEditor(root2, doc2, {
       components: {
-        blocks: [...StandardBlocks, ...((_b = options == null ? void 0 : options.components) == null ? void 0 : _b.blocks) || []],
-        embeds: [...StandardEmbeds, ...((_c = options.components) == null ? void 0 : _c.embeds) || []],
-        boxes: [...StandardBoxes, ...((_d = options.components) == null ? void 0 : _d.boxes) || []],
+        blocks: [...StandardBlocks, ...((_c = options == null ? void 0 : options.components) == null ? void 0 : _c.blocks) || []],
+        embeds: [...StandardEmbeds, ...((_d = options.components) == null ? void 0 : _d.embeds) || []],
+        boxes: [...StandardBoxes, ...((_e = options.components) == null ? void 0 : _e.boxes) || []],
         textRenders: [new BlockPaddingRender()],
         decorators: [new CodeTextDecorator()],
-        options: { ...options.componentsOptions }
+        options: componentsOptions
       }
     });
     editor.readonly = true;
@@ -88344,7 +88283,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.2.11";
+    editor.version = "2.2.12-beta.2";
     return editor;
   }
   function isDoc(doc2) {
@@ -88439,7 +88378,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.11";
+    editor.version = "2.2.12-beta.2";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -134239,7 +134178,7 @@ ${data2.flowchartText}
   exports2.LocalDoc = LocalDoc;
   exports2.LogLevel = LogLevel;
   exports2.Logger = Logger$2;
-  exports2.MIN_DISTANCE_THRESHOLD = MIN_DISTANCE_THRESHOLD$1;
+  exports2.MIN_DISTANCE_THRESHOLD = MIN_DISTANCE_THRESHOLD$3;
   exports2.ManualCloseDialog = ManualCloseDialog;
   exports2.ManualMenu = ManualMenu;
   exports2.ManualToolbar = ManualToolbar;
@@ -134529,7 +134468,7 @@ ${data2.flowchartText}
   exports2.getBlockNearestRangeFromPoint = getBlockNearestRangeFromPoint;
   exports2.getBlockOptions = getBlockOptions;
   exports2.getBlockPath = getBlockPath;
-  exports2.getBlockProperties = getBlockProperties$e;
+  exports2.getBlockProperties = getBlockProperties$d;
   exports2.getBlockRangeFromPoint = getBlockRangeFromPoint;
   exports2.getBlockStyles = getBlockStyles;
   exports2.getBlockTextLength = getBlockTextLength$6;

package/package.json

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