@underverse-ui/underverse 2.0.0 → 2.0.2

package/dist/{menu-bar-SPAAI5X6.js → menu-bar-AAD3LQTN.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   Modal_default
-} from "./chunk-MNZVW2QX.js";
+} from "./chunk-UNDGI6ZI.js";
 import {
   DEFAULT_TABLE_ROW_HEIGHT,
   DEFAULT_UEDITOR_IMAGE_MAX_FILE_SIZE,
@@ -21,7 +21,7 @@ import {
   sanitizeUEditorUrl,
   useDropdownMenuClose,
   useSharedEditorUiRenderState
-} from "./chunk-LTIU5FQY.js";
+} from "./chunk-Z6WE65J2.js";
 import {
   cn,
   useSmartTranslations
@@ -944,4 +944,4 @@ var MenuBar = ({
 export {
   MenuBar
 };
-//# sourceMappingURL=menu-bar-SPAAI5X6.js.map
+//# sourceMappingURL=menu-bar-AAD3LQTN.js.map

package/dist/ueditor.cjs

@@ -4152,6 +4152,9 @@ function getClipboardData(dataTransfer, type) {
     return "";
   }
 }
+function hasClipboardHtmlTable(dataTransfer) {
+  return /<table(?:\s|>)/i.test(getClipboardData(dataTransfer, "text/html"));
+}
 function extractClipboardHtmlFragment(html) {
   const startMarker = "<!--StartFragment-->";
   const endMarker = "<!--EndFragment-->";
@@ -4162,6 +4165,13 @@ function extractClipboardHtmlFragment(html) {
   }
   return html;
 }
+function hasMeaningfulContentOutsideTable(container) {
+  const clone = container.cloneNode(true);
+  clone.querySelectorAll("table, style, script, meta, link").forEach((element) => element.remove());
+  const remainingText = (clone.textContent ?? "").replace(/\u00a0/g, " ").replace(/\u200b/g, "").trim();
+  if (remainingText) return true;
+  return !!clone.querySelector("img, video, audio, iframe, object, embed, svg, canvas, hr, input, textarea, select, button");
+}
 function normalizeClipboardCellText(value) {
   return value.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\u00a0/g, " ").replace(/[ \t]+\n/g, "\n").replace(/\n[ \t]+/g, "\n").replace(/\n+$/g, "").replace(/^\n+/g, "").trim();
 }
@@ -4772,7 +4782,10 @@ function getClipboardTableContent(dataTransfer) {
   const fragment = extractClipboardHtmlFragment(html);
   const fragmentDoc = new DOMParser().parseFromString(fragment, "text/html");
   const styleMap = parseClipboardCssClassStyles(doc);
-  const table = fragmentDoc.querySelector("table") ?? doc.querySelector("table");
+  const sourceBody = fragmentDoc.querySelector("table") ? fragmentDoc.body : doc.body;
+  const tables = sourceBody.querySelectorAll("table");
+  if (tables.length !== 1 || hasMeaningfulContentOutsideTable(sourceBody)) return null;
+  const table = tables[0];
   if (!(table instanceof HTMLTableElement)) return null;
   return createTableContent(getHtmlTableRows(table, styleMap), 1, {
     backgroundColor: DEFAULT_HTML_TABLE_CELL_BACKGROUND_COLOR
@@ -4951,6 +4964,7 @@ var init_clipboard_images = __esm({
                   editor.chain().focus().insertContent(tableContent).run();
                   return true;
                 }
+                if (hasClipboardHtmlTable(event.clipboardData)) return false;
                 const tsvTableContent = getClipboardTsvTableContent(event.clipboardData);
                 if (tsvTableContent) {
                   event.preventDefault();
@@ -6009,7 +6023,7 @@ var init_colors = __esm({
   "src/components/UEditor/colors.tsx"() {
     "use strict";
     "use client";
-    import_react31 = require("react");
+    import_react31 = __toESM(require("react"), 1);
     init_useSmartTranslations();
     import_lucide_react11 = require("lucide-react");
     init_cn();
@@ -6177,12 +6191,25 @@ var init_colors = __esm({
       colors,
       currentColor,
       onSelect,
+      onCustomColorSelect,
       label
     }) => {
       const t = useSmartTranslations("UEditor");
       const colorInputRef = (0, import_react31.useRef)(null);
       const automaticColor = colors[0]?.color ?? "";
       const paletteColors = colors.slice(1);
+      const customColorSelect = onCustomColorSelect ?? onSelect;
+      import_react31.default.useEffect(() => {
+        const input = colorInputRef.current;
+        if (!input) return;
+        const commitColor = () => customColorSelect(input.value);
+        input.addEventListener("change", commitColor);
+        return () => input.removeEventListener("change", commitColor);
+      }, [customColorSelect]);
+      import_react31.default.useEffect(() => {
+        const input = colorInputRef.current;
+        if (input) input.value = currentColor.startsWith("#") ? currentColor : "#000000";
+      }, [currentColor]);
       return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "w-56 p-2", children: [
         /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "px-1 text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: label }),
         /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
@@ -6236,20 +6263,19 @@ var init_colors = __esm({
                 }
               ),
               /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("span", { className: "flex-1 text-center", children: t("colors.moreColors") }),
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_lucide_react11.Palette, { className: "h-4 w-4 text-muted-foreground" }),
-              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                "input",
-                {
-                  ref: colorInputRef,
-                  type: "color",
-                  value: currentColor.startsWith("#") ? currentColor : "#000000",
-                  onChange: (event) => onSelect(event.target.value),
-                  className: "sr-only",
-                  tabIndex: -1
-                }
-              )
+              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_lucide_react11.Palette, { className: "h-4 w-4 text-muted-foreground" })
             ]
           }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+          "input",
+          {
+            ref: colorInputRef,
+            type: "color",
+            defaultValue: currentColor.startsWith("#") ? currentColor : "#000000",
+            className: "sr-only",
+            tabIndex: -1
+          }
         )
       ] });
     };
@@ -14543,15 +14569,18 @@ var FloatingMenuContent = ({ editor }) => {
     }
   );
 };
-function applyTableCellBackground(editor, color) {
+function applyTableCellBackground(editor, color, options = {}) {
+  const shouldFocus = options.focus ?? true;
   const value = color || null;
   const { state, view } = editor;
   const applied = (0, import_tables8.setCellAttr)("backgroundColor", value)(state, view.dispatch.bind(view));
   if (applied) {
-    view.focus();
+    if (shouldFocus) view.focus();
     return;
   }
-  editor.chain().focus().setCellAttribute("backgroundColor", value).run();
+  const chain = editor.chain();
+  if (shouldFocus) chain.focus();
+  chain.setCellAttribute("backgroundColor", value).run();
 }
 function applyTableCellAttribute2(editor, name, value, options = {}) {
   const shouldFocus = options.focus ?? true;
@@ -14609,6 +14638,30 @@ function BorderPositionPreviewIcon({ position }) {
     showVertical && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("path", { d: "M10 2V18", strokeWidth: "2" })
   ] });
 }
+function getBubbleMenuPosition({
+  start,
+  end,
+  menuSize,
+  viewport,
+  offset = 16,
+  padding = 8
+}) {
+  const selectionTop = Math.min(start.top, end.top);
+  const selectionBottom = Math.max(start.bottom, end.bottom);
+  const spaceAbove = selectionTop - offset - padding;
+  const spaceBelow = viewport.height - padding - selectionBottom - offset;
+  const placement = menuSize.height <= spaceAbove || spaceAbove >= spaceBelow ? "top" : "bottom";
+  const halfWidth = menuSize.width / 2;
+  const minLeft = padding + halfWidth;
+  const maxLeft = viewport.width - padding - halfWidth;
+  const selectionCenter = (start.left + end.left) / 2;
+  const left = maxLeft >= minLeft ? Math.min(maxLeft, Math.max(minLeft, selectionCenter)) : viewport.width / 2;
+  const requestedTop = placement === "top" ? selectionTop - offset : selectionBottom + offset;
+  const minTop = placement === "top" ? padding + menuSize.height : padding;
+  const maxTop = placement === "top" ? viewport.height - padding : viewport.height - padding - menuSize.height;
+  const top = maxTop >= minTop ? Math.min(maxTop, Math.max(minTop, requestedTop)) : Math.max(padding, requestedTop);
+  return { top, left, placement };
+}
 function getBubbleMenuContext(editor) {
   const { selection } = editor.state;
   if (editor.isActive("image")) return "image";
@@ -14774,24 +14827,34 @@ var BubbleMenuContent = ({
     setActiveColorPalette(null);
     onKeepOpenChange?.(false);
   }, [onKeepOpenChange]);
-  const applyInlineColorAndClose = (0, import_react35.useCallback)((color) => {
+  const applyInlineColor = (0, import_react35.useCallback)((color, focus) => {
     if (activeColorPalette === "text") {
+      const chain = editor.chain();
+      if (focus) chain.focus();
       if (color === "inherit") {
-        editor.chain().focus().unsetColor().run();
+        chain.unsetColor().run();
       } else {
-        editor.chain().focus().setColor(color).run();
+        chain.setColor(color).run();
       }
     } else if (activeColorPalette === "highlight") {
+      const chain = editor.chain();
+      if (focus) chain.focus();
       if (color === "") {
-        editor.chain().focus().unsetHighlight().run();
+        chain.unsetHighlight().run();
       } else {
-        editor.chain().focus().toggleHighlight({ color }).run();
+        chain.toggleHighlight({ color }).run();
       }
     } else {
-      applyTableCellBackground(editor, color);
+      applyTableCellBackground(editor, color, { focus });
     }
+  }, [activeColorPalette, editor]);
+  const applyInlineColorAndClose = (0, import_react35.useCallback)((color) => {
+    applyInlineColor(color, true);
     closeColorPalette();
-  }, [activeColorPalette, closeColorPalette, editor]);
+  }, [applyInlineColor, closeColorPalette]);
+  const applyCustomColor = (0, import_react35.useCallback)((color) => {
+    applyInlineColor(color, false);
+  }, [applyInlineColor]);
   (0, import_react35.useEffect)(() => {
     if (!showLinkInput) return;
     const close2 = () => setShowLinkInput(false);
@@ -14986,6 +15049,7 @@ var BubbleMenuContent = ({
         colors: isTextPalette ? textColors : highlightColors,
         currentColor: isTextPalette ? currentTextColor : isHighlightPalette ? currentHighlightColor : currentCellBgColor,
         onSelect: applyInlineColorAndClose,
+        onCustomColorSelect: applyCustomColor,
         label: isTextPalette ? t("colors.textColor") : isHighlightPalette ? t("colors.highlight") : t("tableMenu.cellBackground") || "Cell background"
       }
     ) });
@@ -15272,6 +15336,7 @@ var BubbleMenuContent = ({
       /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
         ToolbarButton,
         {
+          onMouseDown: () => onKeepOpenChange?.(true),
           onClick: () => setActiveColorPalette("cell-bg"),
           active: Boolean(currentCellBgColor),
           title: t("tableMenu.cellBackground") || "Cell background",
@@ -15503,6 +15568,8 @@ var CustomBubbleMenu = ({
     placement: "top"
   });
   const menuRef = (0, import_react35.useRef)(null);
+  const updatePositionRef = (0, import_react35.useRef)(() => {
+  });
   const keepOpenRef = (0, import_react35.useRef)(false);
   const [keepOpen, setKeepOpenState] = (0, import_react35.useState)(false);
   const showTimeoutRef = (0, import_react35.useRef)(null);
@@ -15560,19 +15627,15 @@ var CustomBubbleMenu = ({
         setIsVisible(false);
         return;
       }
-      const viewportPadding = 8;
       const menuHeight = menuRef.current?.getBoundingClientRect().height || BUBBLE_MENU_ESTIMATED_HEIGHT;
-      const editorTop = view.dom.getBoundingClientRect().top;
-      const selectionTop = Math.min(start.top, end.top);
-      const selectionBottom = Math.max(start.bottom, end.bottom);
-      const hasRoomAboveEditor = selectionTop - BUBBLE_MENU_OFFSET - menuHeight >= editorTop + viewportPadding;
-      const placement = hasRoomAboveEditor ? "top" : "bottom";
-      const left = Math.min(
-        window.innerWidth - viewportPadding,
-        Math.max(viewportPadding, (start.left + end.left) / 2)
-      );
-      const top = placement === "top" ? Math.max(viewportPadding, selectionTop - BUBBLE_MENU_OFFSET) : Math.min(window.innerHeight - viewportPadding, selectionBottom + BUBBLE_MENU_OFFSET);
-      setPosition2({ top, left, placement });
+      const menuWidth = menuRef.current?.getBoundingClientRect().width || 0;
+      setPosition2(getBubbleMenuPosition({
+        start,
+        end,
+        menuSize: { width: menuWidth, height: menuHeight },
+        viewport: { width: window.innerWidth, height: window.innerHeight },
+        offset: BUBBLE_MENU_OFFSET
+      }));
       if (keepOpenRef.current) {
         clearShowTimeout();
         setIsVisible(true);
@@ -15601,8 +15664,11 @@ var CustomBubbleMenu = ({
     editor.on("transaction", schedulePositionUpdate);
     editor.on("focus", schedulePositionUpdate);
     editor.on("blur", handleBlur);
+    updatePositionRef.current = updatePosition;
     schedulePositionUpdate();
     return () => {
+      updatePositionRef.current = () => {
+      };
       if (animationFrameId !== null) cancelAnimationFrame(animationFrameId);
       clearShowTimeout();
       editor.off("transaction", schedulePositionUpdate);
@@ -15610,6 +15676,24 @@ var CustomBubbleMenu = ({
       editor.off("blur", handleBlur);
     };
   }, [editor]);
+  (0, import_react35.useEffect)(() => {
+    if (!isVisible || typeof ResizeObserver === "undefined") return;
+    const menu = menuRef.current;
+    if (!menu) return;
+    let animationFrameId = null;
+    const observer = new ResizeObserver(() => {
+      if (animationFrameId !== null) cancelAnimationFrame(animationFrameId);
+      animationFrameId = requestAnimationFrame(() => {
+        animationFrameId = null;
+        updatePositionRef.current();
+      });
+    });
+    observer.observe(menu);
+    return () => {
+      if (animationFrameId !== null) cancelAnimationFrame(animationFrameId);
+      observer.disconnect();
+    };
+  }, [isVisible]);
   (0, import_react35.useEffect)(() => {
     if (!isVisible) return;
     const handlePointerDown = (event) => {