@underverse-ui/underverse 1.0.72 → 1.0.73

package/dist/index.js

@@ -20337,46 +20337,52 @@ function DataTableHeader({
       const titleContent = /* @__PURE__ */ jsxs53("div", { className: "flex items-center gap-1", children: [
         /* @__PURE__ */ jsx63("span", { className: cn("font-medium whitespace-nowrap select-text", headerTitleClass), children: col.title }),
         col.sortable && /* @__PURE__ */ jsx63(
-          "button",
+          Tooltip,
           {
-            className: cn(
-              "p-1 rounded-lg transition-all duration-200 hover:bg-accent",
-              sort?.key === col.key ? "opacity-100 bg-accent" : "opacity-60 hover:opacity-100"
-            ),
-            onClick: () => {
-              setCurPage(1);
-              setSort((current) => {
-                if (!current || current.key !== col.key) return { key: col.key, order: "asc" };
-                if (current.order === "asc") return { key: col.key, order: "desc" };
-                return null;
-              });
-            },
-            "aria-label": "Sort",
-            title: `Sort by ${String(col.title)}`,
-            children: /* @__PURE__ */ jsxs53("svg", { viewBox: "0 0 20 20", fill: "none", className: cn("inline-block", sortIconClass), children: [
-              /* @__PURE__ */ jsx63(
-                "path",
-                {
-                  d: "M7 8l3-3 3 3",
-                  stroke: "currentColor",
-                  strokeWidth: "1.5",
-                  strokeLinecap: "round",
-                  strokeLinejoin: "round",
-                  opacity: sort?.key === col.key && sort.order === "asc" ? 1 : 0.4
-                }
-              ),
-              /* @__PURE__ */ jsx63(
-                "path",
-                {
-                  d: "M7 12l3 3 3-3",
-                  stroke: "currentColor",
-                  strokeWidth: "1.5",
-                  strokeLinecap: "round",
-                  strokeLinejoin: "round",
-                  opacity: sort?.key === col.key && sort.order === "desc" ? 1 : 0.4
-                }
-              )
-            ] })
+            placement: "top",
+            content: /* @__PURE__ */ jsx63("span", { className: "text-xs font-medium", children: `Sort by ${String(col.title)}` }),
+            children: /* @__PURE__ */ jsx63(
+              "button",
+              {
+                className: cn(
+                  "p-1 rounded-lg transition-all duration-200 hover:bg-accent",
+                  sort?.key === col.key ? "opacity-100 bg-accent" : "opacity-60 hover:opacity-100"
+                ),
+                onClick: () => {
+                  setCurPage(1);
+                  setSort((current) => {
+                    if (!current || current.key !== col.key) return { key: col.key, order: "asc" };
+                    if (current.order === "asc") return { key: col.key, order: "desc" };
+                    return null;
+                  });
+                },
+                "aria-label": "Sort",
+                children: /* @__PURE__ */ jsxs53("svg", { viewBox: "0 0 20 20", fill: "none", className: cn("inline-block", sortIconClass), children: [
+                  /* @__PURE__ */ jsx63(
+                    "path",
+                    {
+                      d: "M7 8l3-3 3 3",
+                      stroke: "currentColor",
+                      strokeWidth: "1.5",
+                      strokeLinecap: "round",
+                      strokeLinejoin: "round",
+                      opacity: sort?.key === col.key && sort.order === "asc" ? 1 : 0.4
+                    }
+                  ),
+                  /* @__PURE__ */ jsx63(
+                    "path",
+                    {
+                      d: "M7 12l3 3 3-3",
+                      stroke: "currentColor",
+                      strokeWidth: "1.5",
+                      strokeLinecap: "round",
+                      strokeLinejoin: "round",
+                      opacity: sort?.key === col.key && sort.order === "desc" ? 1 : 0.4
+                    }
+                  )
+                ] })
+              }
+            )
           }
         )
       ] });
@@ -20384,18 +20390,24 @@ function DataTableHeader({
         Popover,
         {
           placement: "bottom-start",
-          trigger: /* @__PURE__ */ jsx63(
-            "button",
+          trigger: /* @__PURE__ */ jsx63("span", { className: "inline-flex", children: /* @__PURE__ */ jsx63(
+            Tooltip,
             {
-              className: cn(
-                "p-1.5 rounded-lg transition-all duration-200 hover:bg-accent",
-                filters[col.key] ? "bg-accent text-primary" : "text-muted-foreground"
-              ),
-              "aria-label": "Filter",
-              title: `Filter by ${String(col.title)}`,
-              children: /* @__PURE__ */ jsx63(FilterIcon, { className: "w-4 h-4" })
+              placement: "top",
+              content: /* @__PURE__ */ jsx63("span", { className: "text-xs font-medium", children: `Filter by ${String(col.title)}` }),
+              children: /* @__PURE__ */ jsx63(
+                "button",
+                {
+                  className: cn(
+                    "p-1.5 rounded-lg transition-all duration-200 hover:bg-accent",
+                    filters[col.key] ? "bg-accent text-primary" : "text-muted-foreground"
+                  ),
+                  "aria-label": "Filter",
+                  children: /* @__PURE__ */ jsx63(FilterIcon, { className: "w-4 h-4" })
+                }
+              )
             }
-          ),
+          ) }),
           children: /* @__PURE__ */ jsxs53("div", { className: "p-3 w-64 space-y-3", children: [
             /* @__PURE__ */ jsxs53("div", { className: "flex items-center justify-between", children: [
               /* @__PURE__ */ jsx63("div", { className: "text-sm font-medium", children: col.title }),
@@ -29119,6 +29131,7 @@ function TableControls({ editor, containerRef }) {
   const [layout, setLayout] = React74.useState(null);
   const [dragPreview, setDragPreview] = React74.useState(null);
   const [hoverState, setHoverState] = React74.useState(DEFAULT_HOVER_STATE);
+  const [openMenuKey, setOpenMenuKey] = React74.useState(null);
   const layoutRef = React74.useRef(null);
   const dragStateRef = React74.useRef(null);
   React74.useEffect(() => {
@@ -29160,11 +29173,19 @@ function TableControls({ editor, containerRef }) {
     const surfaceRect = surface.getBoundingClientRect();
     const relativeX = event.clientX - surfaceRect.left + surface.scrollLeft;
     const relativeY = event.clientY - surfaceRect.top + surface.scrollTop;
-    const rowHandleIndex = activeLayout.rowHandles.find((rowHandle) => relativeX >= activeLayout.tableLeft - ROW_HANDLE_HOVER_WIDTH && relativeX <= activeLayout.tableLeft && Math.abs(relativeY - rowHandle.center) <= HANDLE_HOVER_RADIUS)?.index ?? null;
-    const columnHandleIndex = activeLayout.columnHandles.find((columnHandle) => relativeY >= activeLayout.tableTop - COLUMN_HANDLE_HOVER_HEIGHT && relativeY <= activeLayout.tableTop && Math.abs(relativeX - columnHandle.center) <= HANDLE_HOVER_RADIUS)?.index ?? null;
-    const menuVisible = relativeX >= activeLayout.tableLeft - MENU_HOVER_PADDING && relativeX <= activeLayout.tableLeft + 42 && relativeY >= activeLayout.tableTop - COLUMN_HANDLE_HOVER_HEIGHT && relativeY <= activeLayout.tableTop + MENU_HOVER_PADDING;
-    const addColumnVisible = relativeX >= activeLayout.tableLeft + activeLayout.tableWidth && relativeX <= activeLayout.tableLeft + activeLayout.tableWidth + ADD_COLUMN_HOVER_WIDTH && relativeY >= activeLayout.tableTop && relativeY <= activeLayout.tableTop + activeLayout.tableHeight;
-    const addRowVisible = relativeY >= activeLayout.tableTop + activeLayout.tableHeight && relativeY <= activeLayout.tableTop + activeLayout.tableHeight + ADD_ROW_HOVER_HEIGHT && relativeX >= activeLayout.tableLeft && relativeX <= activeLayout.tableLeft + activeLayout.tableWidth;
+    const targetElement = resolveElement(event.target);
+    const directRowHandle = targetElement?.closest?.("[data-row-handle-index]");
+    const directColumnHandle = targetElement?.closest?.("[data-column-handle-index]");
+    const directTableMenu = targetElement?.closest?.("[data-table-control='table-menu']");
+    const directAddColumn = targetElement?.closest?.("[data-table-control='add-column']");
+    const directAddRow = targetElement?.closest?.("[data-table-control='add-row']");
+    const directRowHandleIndex = directRowHandle instanceof HTMLElement ? Number.parseInt(directRowHandle.dataset.rowHandleIndex ?? "", 10) : Number.NaN;
+    const directColumnHandleIndex = directColumnHandle instanceof HTMLElement ? Number.parseInt(directColumnHandle.dataset.columnHandleIndex ?? "", 10) : Number.NaN;
+    const rowHandleIndex = Number.isFinite(directRowHandleIndex) ? directRowHandleIndex : activeLayout.rowHandles.find((rowHandle) => relativeX >= activeLayout.tableLeft - ROW_HANDLE_HOVER_WIDTH && relativeX <= activeLayout.tableLeft && Math.abs(relativeY - rowHandle.center) <= HANDLE_HOVER_RADIUS)?.index ?? null;
+    const columnHandleIndex = Number.isFinite(directColumnHandleIndex) ? directColumnHandleIndex : activeLayout.columnHandles.find((columnHandle) => relativeY >= activeLayout.tableTop - COLUMN_HANDLE_HOVER_HEIGHT && relativeY <= activeLayout.tableTop && Math.abs(relativeX - columnHandle.center) <= HANDLE_HOVER_RADIUS)?.index ?? null;
+    const menuVisible = Boolean(directTableMenu) || relativeX >= activeLayout.tableLeft - MENU_HOVER_PADDING && relativeX <= activeLayout.tableLeft + 42 && relativeY >= activeLayout.tableTop - COLUMN_HANDLE_HOVER_HEIGHT && relativeY <= activeLayout.tableTop + MENU_HOVER_PADDING;
+    const addColumnVisible = Boolean(directAddColumn) || relativeX >= activeLayout.tableLeft + activeLayout.tableWidth && relativeX <= activeLayout.tableLeft + activeLayout.tableWidth + ADD_COLUMN_HOVER_WIDTH && relativeY >= activeLayout.tableTop && relativeY <= activeLayout.tableTop + activeLayout.tableHeight;
+    const addRowVisible = Boolean(directAddRow) || relativeY >= activeLayout.tableTop + activeLayout.tableHeight && relativeY <= activeLayout.tableTop + activeLayout.tableHeight + ADD_ROW_HOVER_HEIGHT && relativeX >= activeLayout.tableLeft && relativeX <= activeLayout.tableLeft + activeLayout.tableWidth;
     setHoverState((prev) => {
       if (prev.menuVisible === menuVisible && prev.addColumnVisible === addColumnVisible && prev.addRowVisible === addRowVisible && prev.rowHandleIndex === rowHandleIndex && prev.columnHandleIndex === columnHandleIndex) {
         return prev;
@@ -29202,6 +29223,7 @@ function TableControls({ editor, containerRef }) {
     proseMirror.addEventListener("mouseover", handleMouseOver);
     proseMirror.addEventListener("mouseleave", handleMouseLeave);
     proseMirror.addEventListener("focusin", handleFocusIn);
+    surface.addEventListener("mouseover", handleSurfaceMouseMove);
     surface.addEventListener("mousemove", handleSurfaceMouseMove);
     surface.addEventListener("scroll", refreshCurrentLayout, { passive: true });
     window.addEventListener("resize", refreshCurrentLayout);
@@ -29212,6 +29234,7 @@ function TableControls({ editor, containerRef }) {
       proseMirror.removeEventListener("mouseover", handleMouseOver);
       proseMirror.removeEventListener("mouseleave", handleMouseLeave);
       proseMirror.removeEventListener("focusin", handleFocusIn);
+      surface.removeEventListener("mouseover", handleSurfaceMouseMove);
       surface.removeEventListener("mousemove", handleSurfaceMouseMove);
       surface.removeEventListener("scroll", refreshCurrentLayout);
       window.removeEventListener("resize", refreshCurrentLayout);
@@ -29309,6 +29332,9 @@ function TableControls({ editor, containerRef }) {
   }, [runAtCornerCell, syncFromSelection]);
   const canExpandTable = Boolean(layout);
   const controlsVisible = dragPreview !== null;
+  const tableMenuOpen = openMenuKey === "table";
+  const getRowMenuKey = React74.useCallback((index) => `row:${index}`, []);
+  const getColumnMenuKey = React74.useCallback((index) => `column:${index}`, []);
   React74.useEffect(() => {
     const handleMouseMove = (event) => {
       const dragState = dragStateRef.current;
@@ -29521,12 +29547,14 @@ function TableControls({ editor, containerRef }) {
   const dragStatusText = dragPreview?.kind === "row" ? `${t("tableMenu.dragRow")} ${dragPreview.originIndex + 1} -> ${dragPreview.targetIndex + 1}` : dragPreview?.kind === "column" ? `${t("tableMenu.dragColumn")} ${dragPreview.originIndex + 1} -> ${dragPreview.targetIndex + 1}` : dragPreview?.kind === "add-row" ? `+${dragPreview.previewRows}R` : dragPreview?.kind === "add-column" ? `+${dragPreview.previewCols}C` : null;
   return /* @__PURE__ */ jsxs71(Fragment27, { children: [
     layout.rowHandles.map((rowHandle) => {
-      const visible = controlsVisible || hoverState.rowHandleIndex === rowHandle.index;
+      const menuKey = getRowMenuKey(rowHandle.index);
+      const visible = controlsVisible || hoverState.rowHandleIndex === rowHandle.index || openMenuKey === menuKey;
       if (!visible) return null;
       return /* @__PURE__ */ jsx81(
         "div",
         {
           className: "absolute z-30",
+          "data-row-handle-index": rowHandle.index,
           style: {
             top: Math.max(8, rowHandle.center - 12),
             left: rowHandleLeft
@@ -29535,6 +29563,10 @@ function TableControls({ editor, containerRef }) {
             DropdownMenu,
             {
               placement: "right",
+              isOpen: openMenuKey === menuKey,
+              onOpenChange: (open) => {
+                setOpenMenuKey((prev) => open ? menuKey : prev === menuKey ? null : prev);
+              },
               items: getRowHandleMenuItems(rowHandle),
               trigger: /* @__PURE__ */ jsx81(
                 "button",
@@ -29545,6 +29577,7 @@ function TableControls({ editor, containerRef }) {
                   onMouseDown: (event) => {
                     event.preventDefault();
                     event.stopPropagation();
+                    setOpenMenuKey(null);
                     dragStateRef.current = {
                       kind: "row",
                       originIndex: rowHandle.index,
@@ -29575,12 +29608,14 @@ function TableControls({ editor, containerRef }) {
       );
     }),
     layout.columnHandles.map((columnHandle) => {
-      const visible = controlsVisible || hoverState.columnHandleIndex === columnHandle.index;
+      const menuKey = getColumnMenuKey(columnHandle.index);
+      const visible = controlsVisible || hoverState.columnHandleIndex === columnHandle.index || openMenuKey === menuKey;
       if (!visible) return null;
       return /* @__PURE__ */ jsx81(
         "div",
         {
           className: "absolute z-30",
+          "data-column-handle-index": columnHandle.index,
           style: {
             top: columnHandleTop,
             left: Math.max(8, columnHandle.center - 12)
@@ -29589,6 +29624,10 @@ function TableControls({ editor, containerRef }) {
             DropdownMenu,
             {
               placement: "bottom-start",
+              isOpen: openMenuKey === menuKey,
+              onOpenChange: (open) => {
+                setOpenMenuKey((prev) => open ? menuKey : prev === menuKey ? null : prev);
+              },
               items: getColumnHandleMenuItems(columnHandle),
               trigger: /* @__PURE__ */ jsx81(
                 "button",
@@ -29599,6 +29638,7 @@ function TableControls({ editor, containerRef }) {
                   onMouseDown: (event) => {
                     event.preventDefault();
                     event.stopPropagation();
+                    setOpenMenuKey(null);
                     dragStateRef.current = {
                       kind: "column",
                       originIndex: columnHandle.index,
@@ -29628,10 +29668,11 @@ function TableControls({ editor, containerRef }) {
         `column-handle-${columnHandle.index}`
       );
     }),
-    (controlsVisible || hoverState.menuVisible) && /* @__PURE__ */ jsx81(
+    (controlsVisible || hoverState.menuVisible || tableMenuOpen) && /* @__PURE__ */ jsx81(
       "div",
       {
         className: "absolute z-30",
+        "data-table-control": "table-menu",
         style: {
           top: menuTop,
           left: menuLeft
@@ -29640,6 +29681,10 @@ function TableControls({ editor, containerRef }) {
           DropdownMenu,
           {
             placement: "bottom-start",
+            isOpen: tableMenuOpen,
+            onOpenChange: (open) => {
+              setOpenMenuKey((prev) => open ? "table" : prev === "table" ? null : prev);
+            },
             items: menuItems,
             trigger: /* @__PURE__ */ jsx81(
               "button",
@@ -29664,11 +29709,13 @@ function TableControls({ editor, containerRef }) {
       "button",
       {
         type: "button",
+        "data-table-control": "add-column",
         "aria-label": t("tableMenu.quickAddColumnAfter"),
         title: t("tableMenu.quickAddColumnAfter"),
         onMouseDown: (event) => {
           event.preventDefault();
           event.stopPropagation();
+          setOpenMenuKey(null);
           if (!canExpandTable) return;
           dragStateRef.current = { kind: "add-column", previewCols: 1 };
           setDragPreview({ kind: "add-column", previewCols: 1 });
@@ -29693,11 +29740,13 @@ function TableControls({ editor, containerRef }) {
       "button",
       {
         type: "button",
+        "data-table-control": "add-row",
         "aria-label": t("tableMenu.quickAddRowAfter"),
         title: t("tableMenu.quickAddRowAfter"),
         onMouseDown: (event) => {
           event.preventDefault();
           event.stopPropagation();
+          setOpenMenuKey(null);
           if (!canExpandTable) return;
           dragStateRef.current = { kind: "add-row", previewRows: 1 };
           setDragPreview({ kind: "add-row", previewRows: 1 });
@@ -30089,8 +30138,13 @@ var UEditor = React75.forwardRef(({
           "[&_.selectedCell]:after:pointer-events-none",
           "[&_.column-resize-handle]:pointer-events-auto",
           "[&_.column-resize-handle]:cursor-col-resize",
+          "[&_.column-resize-handle]:absolute",
+          "[&_.column-resize-handle]:top-[-1px]",
+          "[&_.column-resize-handle]:bottom-[-1px]",
+          "[&_.column-resize-handle]:right-[-5px]",
+          "[&_.column-resize-handle]:z-10",
           "[&_.column-resize-handle]:bg-primary/65",
-          "[&_.column-resize-handle]:w-2",
+          "[&_.column-resize-handle]:w-2.5",
           "[&_.column-resize-handle]:rounded-full",
           "[&_.column-resize-handle]:opacity-0",
           "[&_.column-resize-handle]:shadow-sm",