@underverse-ui/underverse 1.0.141 → 1.0.142

package/dist/index.js

@@ -25261,6 +25261,7 @@ import Typography from "@tiptap/extension-typography";
 import Subscript from "@tiptap/extension-subscript";
 import Superscript from "@tiptap/extension-superscript";
 import HorizontalRule from "@tiptap/extension-horizontal-rule";
+import Gapcursor from "@tiptap/extension-gapcursor";
 import { common, createLowlight } from "lowlight";
 
 // src/components/UEditor/slash-command.tsx
@@ -26051,7 +26052,6 @@ import { mergeAttributes as mergeAttributes4 } from "@tiptap/core";
 import { NodeViewWrapper as NodeViewWrapper4, ReactNodeViewRenderer as ReactNodeViewRenderer4 } from "@tiptap/react";
 import { jsx as jsx81, jsxs as jsxs67 } from "react/jsx-runtime";
 var MIN_IMAGE_SIZE_PX = 40;
-var AXIS_LOCK_THRESHOLD_PX = 4;
 var IMAGE_LAYOUTS = /* @__PURE__ */ new Set(["block", "left", "right"]);
 var IMAGE_WIDTH_PRESETS = /* @__PURE__ */ new Set(["sm", "md", "lg"]);
 function toNullableNumber(value) {
@@ -26092,6 +26092,41 @@ function getImageLayoutStyles(layout) {
   }
   return {};
 }
+function getAspectRatio({
+  img,
+  widthAttr,
+  heightAttr,
+  fallbackWidth,
+  fallbackHeight
+}) {
+  if (widthAttr && heightAttr) return widthAttr / heightAttr;
+  if (img.naturalWidth > 0 && img.naturalHeight > 0) return img.naturalWidth / img.naturalHeight;
+  if (fallbackWidth > 0 && fallbackHeight > 0) return fallbackWidth / fallbackHeight;
+  return 1;
+}
+function sizeFromWidth(width, aspect, maxWidth) {
+  let nextW = clamp8(width, MIN_IMAGE_SIZE_PX, maxWidth);
+  let nextH = nextW / aspect;
+  if (nextH < MIN_IMAGE_SIZE_PX) {
+    nextH = MIN_IMAGE_SIZE_PX;
+    nextW = clamp8(nextH * aspect, MIN_IMAGE_SIZE_PX, maxWidth);
+    nextH = nextW / aspect;
+  }
+  return { width: nextW, height: nextH };
+}
+function sizeFromHeight(height, aspect, maxWidth) {
+  let nextH = Math.max(MIN_IMAGE_SIZE_PX, height);
+  let nextW = nextH * aspect;
+  if (nextW > maxWidth) {
+    nextW = maxWidth;
+    nextH = nextW / aspect;
+  }
+  if (nextW < MIN_IMAGE_SIZE_PX) {
+    nextW = MIN_IMAGE_SIZE_PX;
+    nextH = nextW / aspect;
+  }
+  return { width: nextW, height: nextH };
+}
 function ResizableImageNodeView(props) {
   const { node, selected, updateAttributes, editor, getPos } = props;
   const wrapperRef = useRef29(null);
@@ -26102,7 +26137,6 @@ function ResizableImageNodeView(props) {
   const heightAttr = toNullableNumber(node.attrs["height"]);
   const textAlign = String(node.attrs["textAlign"] ?? "");
   const imageLayout = parseImageLayout(node.attrs["imageLayout"]);
-  const preserveAspectByDefault = imageLayout === "left" || imageLayout === "right";
   const dragStateRef = useRef29(null);
   useEffect34(() => {
     const img = imgRef.current;
@@ -26126,7 +26160,13 @@ function ResizableImageNodeView(props) {
     const maxW = editorEl ? editorEl.getBoundingClientRect().width : Number.POSITIVE_INFINITY;
     const startW = Math.max(MIN_IMAGE_SIZE_PX, rect.width);
     const startH = Math.max(MIN_IMAGE_SIZE_PX, rect.height);
-    const aspect = startH > 0 ? startW / startH : 1;
+    const aspect = getAspectRatio({
+      img,
+      widthAttr,
+      heightAttr,
+      fallbackWidth: startW,
+      fallbackHeight: startH
+    });
     dragStateRef.current = {
       pointerId: event.pointerId,
       startX: event.clientX,
@@ -26135,7 +26175,6 @@ function ResizableImageNodeView(props) {
       startH,
       lastW: startW,
       lastH: startH,
-      axis: null,
       aspect,
       maxW: Math.max(MIN_IMAGE_SIZE_PX, maxW)
     };
@@ -26149,24 +26188,9 @@ function ResizableImageNodeView(props) {
     if (event.pointerId !== drag.pointerId) return;
     const dx = event.clientX - drag.startX;
     const dy = event.clientY - drag.startY;
-    let nextW = drag.startW;
-    let nextH = drag.startH;
-    const shouldPreserveAspect = preserveAspectByDefault ? !event.ctrlKey : event.ctrlKey;
-    if (shouldPreserveAspect) {
-      if (Math.abs(dx) >= Math.abs(dy)) {
-        nextW = clamp8(drag.startW + dx, MIN_IMAGE_SIZE_PX, drag.maxW);
-        nextH = clamp8(nextW / drag.aspect, MIN_IMAGE_SIZE_PX, Number.POSITIVE_INFINITY);
-      } else {
-        nextH = clamp8(drag.startH + dy, MIN_IMAGE_SIZE_PX, Number.POSITIVE_INFINITY);
-        nextW = clamp8(nextH * drag.aspect, MIN_IMAGE_SIZE_PX, drag.maxW);
-      }
-    } else {
-      if (!drag.axis && (Math.abs(dx) > AXIS_LOCK_THRESHOLD_PX || Math.abs(dy) > AXIS_LOCK_THRESHOLD_PX)) {
-        drag.axis = Math.abs(dx) >= Math.abs(dy) ? "x" : "y";
-      }
-      if (drag.axis === "x") nextW = clamp8(drag.startW + dx, MIN_IMAGE_SIZE_PX, drag.maxW);
-      if (drag.axis === "y") nextH = clamp8(drag.startH + dy, MIN_IMAGE_SIZE_PX, Number.POSITIVE_INFINITY);
-    }
+    const nextSize = Math.abs(dx) >= Math.abs(dy) ? sizeFromWidth(drag.startW + dx, drag.aspect, drag.maxW) : sizeFromHeight(drag.startH + dy, drag.aspect, drag.maxW);
+    const nextW = nextSize.width;
+    const nextH = nextSize.height;
     drag.lastW = nextW;
     drag.lastH = nextH;
     img.style.width = `${Math.round(nextW)}px`;
@@ -27089,6 +27113,7 @@ function buildUEditorExtensions({
       }
     }),
     HorizontalRule,
+    Gapcursor,
     Link.configure({
       openOnClick: false,
       protocols: ["http", "https", "mailto", "tel"],
@@ -27475,6 +27500,43 @@ function isSelectedImage(editor) {
   const { selection } = editor.state;
   return selection instanceof NodeSelection && selection.node.type.name === "image";
 }
+function toPositiveNumber(value) {
+  if (typeof value === "number" && Number.isFinite(value) && value > 0) return value;
+  if (typeof value === "string") {
+    const parsed = Number.parseInt(value, 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+  }
+  return null;
+}
+function getImageElementAtSelection(editor, pos) {
+  const nodeDom = editor.view.nodeDOM(pos);
+  if (!(nodeDom instanceof HTMLElement)) return null;
+  if (nodeDom.tagName === "IMG") return nodeDom;
+  return nodeDom.querySelector("img");
+}
+function getImageAspectRatio(editor, attrs, pos) {
+  const widthAttr = toPositiveNumber(attrs.width);
+  const heightAttr = toPositiveNumber(attrs.height);
+  if (widthAttr && heightAttr) return widthAttr / heightAttr;
+  const imageElement = typeof pos === "number" ? getImageElementAtSelection(editor, pos) : null;
+  if (!imageElement) return null;
+  if (imageElement.naturalWidth > 0 && imageElement.naturalHeight > 0) {
+    return imageElement.naturalWidth / imageElement.naturalHeight;
+  }
+  const rect = imageElement.getBoundingClientRect();
+  if (rect.width > 0 && rect.height > 0) return rect.width / rect.height;
+  const width = toPositiveNumber(imageElement.getAttribute("width")) ?? toPositiveNumber(imageElement.style.width);
+  const height = toPositiveNumber(imageElement.getAttribute("height")) ?? toPositiveNumber(imageElement.style.height);
+  return width && height ? width / height : null;
+}
+function getImagePresetAttributes(editor, width, preset, attrs, pos) {
+  const aspect = getImageAspectRatio(editor, attrs, pos);
+  return {
+    width,
+    height: aspect ? Math.round(width / aspect) : toPositiveNumber(attrs.height),
+    imageWidthPreset: preset
+  };
+}
 function applyImageLayout(editor, layout) {
   const { state, view } = editor;
   const { selection, schema } = state;
@@ -27509,15 +27571,15 @@ function applyImageWidthPreset(editor, preset) {
   const mode = attrs.imageLayout === "left" || attrs.imageLayout === "right" ? "wrap" : "block";
   const width = IMAGE_WIDTHS_BY_LAYOUT[mode][preset];
   if (!isSelectedImage(editor)) {
-    editor.chain().focus().updateAttributes("image", { width, imageWidthPreset: preset }).run();
+    editor.chain().focus().updateAttributes("image", getImagePresetAttributes(editor, width, preset, attrs)).run();
     return;
   }
   const { state, view } = editor;
   const selection = state.selection;
+  const nextAttrs = getImagePresetAttributes(editor, width, preset, selection.node.attrs, selection.from);
   const transaction = state.tr.setNodeMarkup(selection.from, void 0, {
     ...selection.node.attrs,
-    width,
-    imageWidthPreset: preset
+    ...nextAttrs
   });
   view.dispatch(transaction.scrollIntoView());
   view.focus();
@@ -29465,10 +29527,22 @@ var CustomBubbleMenu = ({
         setIsVisible(false);
         return;
       }
-      const start = view.coordsAtPos(from);
-      const end = view.coordsAtPos(to);
-      const left = (start.left + end.left) / 2;
-      const top = start.top - BUBBLE_MENU_OFFSET;
+      let start;
+      let end;
+      try {
+        start = view.coordsAtPos(from);
+        end = view.coordsAtPos(to);
+      } catch {
+        clearShowTimeout();
+        setIsVisible(false);
+        return;
+      }
+      const viewportPadding = 8;
+      const left = Math.min(
+        window.innerWidth - viewportPadding,
+        Math.max(viewportPadding, (start.left + end.left) / 2)
+      );
+      const top = Math.max(viewportPadding, start.top - BUBBLE_MENU_OFFSET);
       setPosition({ top, left });
       if (keepOpenRef.current) {
         clearShowTimeout();
@@ -29490,11 +29564,17 @@ var CustomBubbleMenu = ({
     editor.on("selectionUpdate", updatePosition);
     editor.on("focus", updatePosition);
     editor.on("blur", handleBlur);
+    editor.on("transaction", updatePosition);
+    editor.on("update", updatePosition);
+    const animationFrameId = requestAnimationFrame(updatePosition);
     return () => {
+      cancelAnimationFrame(animationFrameId);
       clearShowTimeout();
       editor.off("selectionUpdate", updatePosition);
       editor.off("focus", updatePosition);
       editor.off("blur", handleBlur);
+      editor.off("transaction", updatePosition);
+      editor.off("update", updatePosition);
     };
   }, [editor]);
   if (!isVisible) return null;
@@ -29504,7 +29584,7 @@ var CustomBubbleMenu = ({
       {
         ref: menuRef,
         "data-popover": true,
-        className: "fixed z-99999 flex rounded-xl border border-border/40 bg-card text-card-foreground shadow-lg backdrop-blur-sm overflow-hidden animate-in fade-in-0 zoom-in-95",
+        className: "fixed z-[99999] flex rounded-xl border border-border/40 bg-card text-card-foreground shadow-lg backdrop-blur-sm overflow-hidden animate-in fade-in-0 zoom-in-95",
         style: {
           top: `${position.top}px`,
           left: `${position.left}px`,
@@ -35427,6 +35507,17 @@ var UEDITOR_PROSEMIRROR_CLASS_NAME = cn(
   "[&_.is-editor-empty]:before:float-left",
   "[&_.is-editor-empty]:before:pointer-events-none",
   "[&_.is-editor-empty]:before:h-0",
+  "[&_.ProseMirror-gapcursor]:pointer-events-none",
+  "[&_.ProseMirror-gapcursor]:absolute",
+  "[&_.ProseMirror-gapcursor]:hidden",
+  "[&_.ProseMirror-gapcursor:after]:content-['']",
+  "[&_.ProseMirror-gapcursor:after]:block",
+  "[&_.ProseMirror-gapcursor:after]:absolute",
+  "[&_.ProseMirror-gapcursor:after]:top-[-2px]",
+  "[&_.ProseMirror-gapcursor:after]:w-8",
+  "[&_.ProseMirror-gapcursor:after]:border-t-2",
+  "[&_.ProseMirror-gapcursor:after]:border-primary",
+  "[&.ProseMirror-focused_.ProseMirror-gapcursor]:block",
   "[&_ul[data-type='taskList']]:list-none",
   "[&_ul[data-type='taskList']]:pl-0",
   "[&_ul[data-type='taskList']_li]:flex",