@trafica/editor 1.0.51 → 1.0.53

package/dist/index.js

@@ -8655,8 +8655,10 @@ function EditorCore({
       const figH = (fig == null ? void 0 : fig.offsetHeight) || drag.ghostH;
       const rawX = e.clientX - cr.left - drag.offsetX + container.scrollLeft;
       const rawY = e.clientY - cr.top - drag.offsetY + container.scrollTop;
+      const editorH = editorRootRef.current ? editorRootRef.current.offsetHeight - (cr.top - editorRootRef.current.getBoundingClientRect().top) : container.offsetHeight;
+      const maxH = Math.max(container.offsetHeight, editorH);
       const x = Math.max(0, Math.min(rawX, container.clientWidth - figW));
-      const y = Math.max(0, Math.min(rawY, container.offsetHeight - figH));
+      const y = Math.max(0, Math.min(rawY, maxH - figH));
       if (fig) {
         fig.style.position = "absolute";
         fig.style.left = `${x}px`;
@@ -8682,8 +8684,10 @@ function EditorCore({
       const figH = (fig == null ? void 0 : fig.offsetHeight) || drag.ghostH;
       const rawX = e.clientX - cr.left - drag.offsetX + container.scrollLeft;
       const rawY = e.clientY - cr.top - drag.offsetY + container.scrollTop;
+      const editorH = editorRootRef.current ? editorRootRef.current.offsetHeight - (cr.top - editorRootRef.current.getBoundingClientRect().top) : container.offsetHeight;
+      const maxH = Math.max(container.offsetHeight, editorH);
       const x = Math.max(0, Math.min(rawX, container.clientWidth - figW));
-      const y = Math.max(0, Math.min(rawY, container.offsetHeight - figH));
+      const y = Math.max(0, Math.min(rawY, maxH - figH));
       setImageAttr(drag.imagePath, { x: Math.round(x), y: Math.round(y) })(engine);
     };
     document.addEventListener("mousemove", onMouseMove);
@@ -8935,6 +8939,9 @@ function prettyPrintHTML(html) {
 function getCellDOMElement(cellPathJson) {
   return document.querySelector(`[data-block-path='${cellPathJson}']`);
 }
+function isNonEditable(node) {
+  return node.nodeType === Node.ELEMENT_NODE && node.contentEditable === "false";
+}
 function isCaretAtContainerStart(container) {
   const sel = window.getSelection();
   if (!sel || sel.rangeCount === 0 || !sel.isCollapsed) return false;
@@ -8942,7 +8949,11 @@ function isCaretAtContainerStart(container) {
   if (range.startOffset !== 0) return false;
   let node = range.startContainer;
   while (node && node !== container) {
-    if (node.previousSibling) return false;
+    let sib = node.previousSibling;
+    while (sib) {
+      if (!isNonEditable(sib)) return false;
+      sib = sib.previousSibling;
+    }
     node = node.parentNode;
   }
   return node === container;
@@ -8954,11 +8965,15 @@ function isCaretAtContainerEnd(container) {
   const range = sel.getRangeAt(0);
   const endNode = range.endContainer;
   const endOffset = range.endOffset;
-  const len = endNode.nodeType === Node.TEXT_NODE ? (_b = (_a = endNode.textContent) == null ? void 0 : _a.length) != null ? _b : 0 : endNode.childNodes.length;
+  const len = endNode.nodeType === Node.TEXT_NODE ? (_b = (_a = endNode.textContent) == null ? void 0 : _a.length) != null ? _b : 0 : Array.from(endNode.childNodes).filter((n) => !isNonEditable(n)).length;
   if (endOffset !== len) return false;
   let node = endNode;
   while (node && node !== container) {
-    if (node.nextSibling) return false;
+    let sib = node.nextSibling;
+    while (sib) {
+      if (!isNonEditable(sib)) return false;
+      sib = sib.nextSibling;
+    }
     node = node.parentNode;
   }
   return node === container;