@ones-editor/editor 2.2.10-beta.3 → 2.2.10-beta.5

package/dist/index.js

@@ -2139,7 +2139,6 @@ div.tippy-box[data-theme=editor-tooltip] > .tippy-content {
 }
 .editor-root [data-type=editor-container].root div[data-type=editor-block].list-block [data-type=block-content] {
   margin-right: 24px;
-  transition: background-color 0.25s linear;
 }
 .editor-root [data-type=editor-container].root div[data-type=editor-block].list-block [data-type=block-tools] .editor-mindmap-svg {
   position: absolute;
@@ -2513,6 +2512,7 @@ div.editor-root div.editor-content div[data-block-type=list][data-style-heading=
 .editor-root:not(.readonly) div[data-type=editor-block].list-block.hover[data-list-type=unchecked] > div[data-type=block-content], .editor-root:not(.readonly) div[data-type=editor-block].list-block.hover[data-list-type=checked] > div.list-container,
 .editor-root:not(.readonly) div[data-type=editor-block].list-block.hover[data-list-type=checked] > div[data-type=block-content] {
   background-color: #f8f8f8;
+  transition: background-color 0.25s linear;
 }
 .editor-root:not(.readonly) div[data-type=editor-block].list-block .list-container:hover .list-marker {
   cursor: pointer;
@@ -5179,6 +5179,7 @@ div.editor-root:not(.mobile) div.editor-content div[data-type=editor-container]
   background-color: var(--op-selected-color);
   border-radius: 3px;
   pointer-events: none;
+  z-index: 1;
 }
 .editor-root.history .table-block.history-inserted-block table .child {
   pointer-events: none;
@@ -13088,7 +13089,7 @@ var __publicField = (obj, key, value) => {
     return createEditorSelectionRange(editor, { anchor: anchor2, focus });
   }
   const logger$49 = getLogger("range-from-point");
-  function getBlockRangeFromPoint(editor, pointX, pointY) {
+  function getBlockRangeFromPoint(editor, pointX, pointY, dragging) {
     const yOffsets = [0, -12, 12];
     let x = pointX;
     const y = pointY;
@@ -13136,7 +13137,7 @@ var __publicField = (obj, key, value) => {
       if (!editor.contains(block)) {
         continue;
       }
-      const range = getBlockClass(editor, block).getRangeFromPoint(editor, block, x, y + yOffsets[i]);
+      const range = getBlockClass(editor, block).getRangeFromPoint(editor, block, x, y + yOffsets[i], dragging);
       if (range) {
         return range;
       }
@@ -23732,7 +23733,7 @@ var __publicField = (obj, key, value) => {
     });
     return ret;
   }
-  function getTextBlockRangeFromPoint(editor, block, xOrign, yOrign) {
+  function getTextBlockRangeFromPoint(editor, block, xOrign, yOrign, dragging) {
     const elem = getElementFromPoint(xOrign, yOrign);
     if (!elem)
       return null;
@@ -23787,7 +23788,12 @@ var __publicField = (obj, key, value) => {
       offset = start;
       length = 0;
     } else if (isTextBlockContentBoxChild(child)) {
-      offset = start;
+      const blockRect2 = child.getBoundingClientRect();
+      if (!dragging) {
+        offset = start + (blockRect2.x + 10 > x ? 0 : 1);
+      } else {
+        offset = start + (blockRect2.x + blockRect2.width / 2 > x ? 0 : 1);
+      }
       length = 0;
     } else {
       assert(logger$3W, child.firstChild instanceof Text, "child is not text");
@@ -27432,7 +27438,7 @@ var __publicField = (obj, key, value) => {
   }
   const logger$3g = getLogger("table-scroll");
   class DomEventHandler {
-    constructor(editor, dom, name, handler, data2) {
+    constructor(editor, dom, name, handler, data2, options) {
       __publicField(this, "handleEvent", (event) => {
         this.handler(this.editor, event, this.data);
       });
@@ -27441,7 +27447,7 @@ var __publicField = (obj, key, value) => {
       this.name = name;
       this.handler = handler;
       this.data = data2;
-      dom.addEventListener(name, this.handleEvent);
+      dom.addEventListener(name, this.handleEvent, options);
     }
     destroy() {
       this.dom.removeEventListener(this.name, this.handleEvent);
@@ -27458,16 +27464,16 @@ var __publicField = (obj, key, value) => {
         this.handlers.delete(element);
       });
     }
-    addEventListener(element, eventName, eventHandler, data2) {
+    addEventListener(element, eventName, eventHandler, data2, options) {
       const existsHandlers = this.handlers.get(element);
       if (existsHandlers) {
         if (existsHandlers.find((handler) => handler.handler === eventHandler && handler.name === eventName)) {
           logger$3g.warn(`event has already registered: ${eventName}`);
           return;
         }
-        existsHandlers.push(new DomEventHandler(this.editor, element, eventName, eventHandler, data2));
+        existsHandlers.push(new DomEventHandler(this.editor, element, eventName, eventHandler, data2, options));
       } else {
-        const handler = new DomEventHandler(this.editor, element, eventName, eventHandler, data2);
+        const handler = new DomEventHandler(this.editor, element, eventName, eventHandler, data2, options);
         this.handlers.set(element, [handler]);
       }
     }
@@ -28136,7 +28142,7 @@ var __publicField = (obj, key, value) => {
         if (Math.abs(this.mouseDownEvent.x - event.x) < 3 && Math.abs(this.mouseDownEvent.y - event.y) < 3) {
           return;
         }
-        const range = getBlockRangeFromPoint(this.editor, event.x, event.y);
+        const range = getBlockRangeFromPoint(this.editor, event.x, event.y, true);
         if (!range) {
           return;
         }
@@ -58425,9 +58431,9 @@ $$${mathData.mathjaxText}$$
         if (target.hasAttribute("data-editor-overflow-tooltip")) {
           if (this.check(target)) {
             const title = target.getAttribute("data-editor-overflow-tooltip");
-            target.setAttribute(`data-editor-tooltip-${this.editor.clientId}`, title);
+            target.setAttribute(`data-editor-tooltip-${this.editor.clientId}-dynamic`, title);
           } else {
-            target.removeAttribute(`data-editor-tooltip-${this.editor.clientId}`);
+            target.removeAttribute(`data-editor-tooltip-${this.editor.clientId}-dynamic`);
           }
         }
       });
@@ -63408,14 +63414,14 @@ ${codeText}
       }
       const code = toPlainText(text2);
       const codeData = editor.doc.getBlockData(parentBlockPath.containerId, parentBlockPath.blockIndex);
-      const getProsmGrammar = (language) => {
+      const getPrismGrammar = (language) => {
         if (!language) {
           return Prism__default.default.languages.plain;
         }
         const lang = language.replace(/\s/g, "").toLocaleLowerCase();
         return Prism__default.default.languages[lang] || Prism__default.default.languages.plain;
       };
-      const grammar = getProsmGrammar(codeData.language);
+      const grammar = getPrismGrammar(codeData.language);
       const tokens = Prism__default.default.tokenize(code, grammar);
       const tokenToText = (token, attributes) => {
         assert(logger$1m, token, "no token");
@@ -67739,7 +67745,7 @@ ${codeText}
       this.editor.addListener("selectionChanged", this.handleSelectionChanged);
       this.editor.addListener("resize", this.handleEditorResize);
       this.editor.addListener("docChanged", this.handleDocChanged);
-      this.editor.scrollContainer.addEventListener("wheel", this.handleScroll, { passive: false });
+      this.editor.domEvents.addEventListener(this.editor.scrollContainer, "wheel", (ed, e2) => this.handleScroll(e2), { passive: false });
       this.items.forEach((item) => item.addListener("resize", this.handleItemResize));
       this.groupItemHandlers = new CommentGroupItemHandlers(this, commentsProvider);
       document.addEventListener("click", this.handleDocumentClick);
@@ -67748,7 +67754,6 @@ ${codeText}
       this.editor.removeListener("selectionChanged", this.handleSelectionChanged);
       this.editor.removeListener("resize", this.handleEditorResize);
       this.editor.removeListener("docChanged", this.handleDocChanged);
-      this.editor.scrollContainer.removeEventListener("wheel", this.handleScroll);
       super.destroy();
       this.unbindEvents();
       this.removeAllListeners();
@@ -79566,6 +79571,7 @@ ${content}
     }
     destroy() {
       this.editor.doc.unregisterCallback(this);
+      this.removeAllListeners();
     }
     isHeadingBlock(blockData) {
       return !!blockData.heading;
@@ -80327,22 +80333,22 @@ ${content}
     const image = createElement("img", ["editor-template-thumb"], imageContaniner);
     image.src = imageSrc;
     image.style.display = "none";
-    image.onerror = () => {
+    editor.domEvents.addEventListener(image, "error", () => {
       var _a2;
       const placeholder2 = (_a2 = options == null ? void 0 : options.placeHolderImageSrc) != null ? _a2 : TEMPLATE_PLACEHOLDER;
       if (image.src !== placeholder2) {
         image.src = placeholder2;
       }
-    };
-    image.onload = () => {
+    });
+    editor.domEvents.addEventListener(image, "load", () => {
       image.style.display = "";
-    };
+    });
     const nameDiv = createElement("div", ["editor-template-name"], card);
     const span = createElement("span", [], nameDiv, name);
     if (options == null ? void 0 : options.showTemplateTitleAttr) {
       span.setAttribute("title", name);
     }
-    card.onclick = () => clickHandler(card);
+    editor.domEvents.addEventListener(card, "click", () => clickHandler(card));
     return card;
   }
   function getDocThumbImage(editor, template) {
@@ -86446,6 +86452,7 @@ ${data2.flowchartText}
         embeds: [...StandardEmbeds, ...((_c = options.components) == null ? void 0 : _c.embeds) || []],
         boxes: [...StandardBoxes, ...((_d = options.components) == null ? void 0 : _d.boxes) || []],
         textRenders: [new BlockPaddingRender()],
+        decorators: [new CodeTextDecorator()],
         options: { ...options.componentsOptions }
       }
     });
@@ -88343,13 +88350,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.2.10-beta.3";
-    if (Logger$2.level === LogLevel.DEBUG) {
-      window.setReauthFail = (fail) => {
-        window.isReauthError = fail;
-      };
-      window.reConnect = (token) => editor.doc.externalDoc.client.connection.reConnect(token);
-    }
+    editor.version = "2.2.10-beta.5";
     return editor;
   }
   function isDoc(doc2) {
@@ -88444,7 +88445,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.10-beta.3";
+    editor.version = "2.2.10-beta.5";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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