@underverse-ui/underverse 1.0.71 → 1.0.73

package/dist/index.cjs

@@ -20506,46 +20506,52 @@ function DataTableHeader({
       const titleContent = /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)("div", { className: "flex items-center gap-1", children: [
         /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("span", { className: cn("font-medium whitespace-nowrap select-text", headerTitleClass), children: col.title }),
         col.sortable && /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
-          "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__ */ (0, import_jsx_runtime63.jsxs)("svg", { viewBox: "0 0 20 20", fill: "none", className: cn("inline-block", sortIconClass), children: [
-              /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
-                "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__ */ (0, import_jsx_runtime63.jsx)(
-                "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__ */ (0, import_jsx_runtime63.jsx)("span", { className: "text-xs font-medium", children: `Sort by ${String(col.title)}` }),
+            children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+              "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__ */ (0, import_jsx_runtime63.jsxs)("svg", { viewBox: "0 0 20 20", fill: "none", className: cn("inline-block", sortIconClass), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+                    "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__ */ (0, import_jsx_runtime63.jsx)(
+                    "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
+                    }
+                  )
+                ] })
+              }
+            )
           }
         )
       ] });
@@ -20553,18 +20559,24 @@ function DataTableHeader({
         Popover,
         {
           placement: "bottom-start",
-          trigger: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
-            "button",
+          trigger: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("span", { className: "inline-flex", children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+            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__ */ (0, import_jsx_runtime63.jsx)(import_lucide_react35.Filter, { className: "w-4 h-4" })
+              placement: "top",
+              content: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("span", { className: "text-xs font-medium", children: `Filter by ${String(col.title)}` }),
+              children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+                "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__ */ (0, import_jsx_runtime63.jsx)(import_lucide_react35.Filter, { className: "w-4 h-4" })
+                }
+              )
             }
-          ),
+          ) }),
           children: /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)("div", { className: "p-3 w-64 space-y-3", children: [
             /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)("div", { className: "flex items-center justify-between", children: [
               /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("div", { className: "text-sm font-medium", children: col.title }),
@@ -29039,6 +29051,19 @@ var import_lucide_react47 = require("lucide-react");
 var import_jsx_runtime82 = require("react/jsx-runtime");
 var FALLBACK_TABLE_ROW_HEIGHT = 44;
 var FALLBACK_TABLE_COLUMN_WIDTH = 160;
+var MENU_HOVER_PADDING = 18;
+var ROW_HANDLE_HOVER_WIDTH = 28;
+var COLUMN_HANDLE_HOVER_HEIGHT = 28;
+var ADD_COLUMN_HOVER_WIDTH = 24;
+var ADD_ROW_HOVER_HEIGHT = 24;
+var HANDLE_HOVER_RADIUS = 14;
+var DEFAULT_HOVER_STATE = {
+  menuVisible: false,
+  addColumnVisible: false,
+  addRowVisible: false,
+  rowHandleIndex: null,
+  columnHandleIndex: null
+};
 function resolveElement(target) {
   if (target instanceof Element) return target;
   if (target instanceof Node) return target.parentElement;
@@ -29164,6 +29189,12 @@ function buildLayout(editor, surface, cell) {
   };
 }
 function getSelectedCell(editor) {
+  const browserSelection = window.getSelection();
+  const anchorElement = resolveElement(browserSelection?.anchorNode ?? null);
+  const anchorCell = anchorElement?.closest?.("th,td");
+  if (anchorCell instanceof HTMLTableCellElement) {
+    return anchorCell;
+  }
   const domAtPos = editor.view.domAtPos(editor.state.selection.from);
   return getCellFromTarget(domAtPos.node);
 }
@@ -29192,6 +29223,8 @@ function TableControls({ editor, containerRef }) {
   const t = useSmartTranslations("UEditor");
   const [layout, setLayout] = import_react52.default.useState(null);
   const [dragPreview, setDragPreview] = import_react52.default.useState(null);
+  const [hoverState, setHoverState] = import_react52.default.useState(DEFAULT_HOVER_STATE);
+  const [openMenuKey, setOpenMenuKey] = import_react52.default.useState(null);
   const layoutRef = import_react52.default.useRef(null);
   const dragStateRef = import_react52.default.useRef(null);
   import_react52.default.useEffect(() => {
@@ -29223,17 +29256,58 @@ function TableControls({ editor, containerRef }) {
     setDragPreview(null);
     document.body.style.cursor = "";
   }, []);
+  const updateHoverState = import_react52.default.useCallback((event) => {
+    const activeLayout = layoutRef.current;
+    const surface = containerRef.current;
+    if (!activeLayout || !surface || dragStateRef.current) {
+      setHoverState(DEFAULT_HOVER_STATE);
+      return;
+    }
+    const surfaceRect = surface.getBoundingClientRect();
+    const relativeX = event.clientX - surfaceRect.left + surface.scrollLeft;
+    const relativeY = event.clientY - surfaceRect.top + surface.scrollTop;
+    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;
+      }
+      return {
+        menuVisible,
+        addColumnVisible,
+        addRowVisible,
+        rowHandleIndex,
+        columnHandleIndex
+      };
+    });
+  }, [containerRef]);
   import_react52.default.useEffect(() => {
     const proseMirror = editor.view.dom;
     const surface = containerRef.current;
     if (!surface) return void 0;
     const handleMouseOver = (event) => {
       if (dragStateRef.current) return;
-      syncFromCell(getCellFromTarget(event.target));
+      const cell = getCellFromTarget(event.target);
+      if (!cell) return;
+      syncFromCell(cell);
+    };
+    const handleSurfaceMouseMove = (event) => {
+      updateHoverState(event);
     };
     const handleMouseLeave = () => {
       if (dragStateRef.current) return;
-      syncFromSelection();
+      setHoverState(DEFAULT_HOVER_STATE);
     };
     const handleFocusIn = () => {
       if (dragStateRef.current) return;
@@ -29242,6 +29316,8 @@ 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);
     editor.on("selectionUpdate", syncFromSelection);
@@ -29251,12 +29327,14 @@ 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);
       editor.off("selectionUpdate", syncFromSelection);
       editor.off("update", refreshCurrentLayout);
     };
-  }, [clearDrag, containerRef, editor, refreshCurrentLayout, syncFromCell, syncFromSelection]);
+  }, [clearDrag, containerRef, editor, refreshCurrentLayout, syncFromCell, syncFromSelection, updateHoverState]);
   const runAtCellPos = import_react52.default.useCallback((cellPos, command, options) => {
     if (cellPos == null) return false;
     focusCell(editor, cellPos);
@@ -29346,6 +29424,10 @@ function TableControls({ editor, containerRef }) {
     return true;
   }, [runAtCornerCell, syncFromSelection]);
   const canExpandTable = Boolean(layout);
+  const controlsVisible = dragPreview !== null;
+  const tableMenuOpen = openMenuKey === "table";
+  const getRowMenuKey = import_react52.default.useCallback((index) => `row:${index}`, []);
+  const getColumnMenuKey = import_react52.default.useCallback((index) => `column:${index}`, []);
   import_react52.default.useEffect(() => {
     const handleMouseMove = (event) => {
       const dragState = dragStateRef.current;
@@ -29557,115 +29639,176 @@ function TableControls({ editor, containerRef }) {
   const expandPreviewHeight = dragPreview?.kind === "add-row" ? layout.tableHeight + dragPreview.previewRows * layout.avgRowHeight : layout.tableHeight;
   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__ */ (0, import_jsx_runtime82.jsxs)(import_jsx_runtime82.Fragment, { children: [
-    layout.rowHandles.map((rowHandle) => /* @__PURE__ */ (0, import_jsx_runtime82.jsx)("div", { className: "absolute z-30", style: { top: Math.max(8, rowHandle.center - 12), left: rowHandleLeft }, children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-      DropdownMenu,
-      {
-        placement: "right",
-        items: getRowHandleMenuItems(rowHandle),
-        trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-          "button",
-          {
-            type: "button",
-            "aria-label": `${t("tableMenu.dragRow")} ${rowHandle.index + 1}`,
-            title: `${t("tableMenu.dragRow")} ${rowHandle.index + 1}`,
-            onMouseDown: (event) => {
-              event.preventDefault();
-              event.stopPropagation();
-              dragStateRef.current = {
-                kind: "row",
-                originIndex: rowHandle.index,
-                targetIndex: rowHandle.index,
-                anchorPos: rowHandle.cellPos
-              };
-              setDragPreview({
-                kind: "row",
-                originIndex: rowHandle.index,
-                targetIndex: rowHandle.index,
-                targetStart: rowHandle.start,
-                targetSize: rowHandle.size
-              });
-              document.body.style.cursor = "grabbing";
-            },
-            className: cn(
-              "inline-flex h-6 w-6 items-center justify-center rounded-full",
-              "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
-              "transition-colors hover:bg-accent hover:text-foreground"
-            ),
-            children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.GripVertical, { className: "h-3.5 w-3.5" })
-          }
-        )
-      }
-    ) }, `row-handle-${rowHandle.index}`)),
-    layout.columnHandles.map((columnHandle) => /* @__PURE__ */ (0, import_jsx_runtime82.jsx)("div", { className: "absolute z-30", style: { top: columnHandleTop, left: Math.max(8, columnHandle.center - 12) }, children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-      DropdownMenu,
+    layout.rowHandles.map((rowHandle) => {
+      const menuKey = getRowMenuKey(rowHandle.index);
+      const visible = controlsVisible || hoverState.rowHandleIndex === rowHandle.index || openMenuKey === menuKey;
+      if (!visible) return null;
+      return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+        "div",
+        {
+          className: "absolute z-30",
+          "data-row-handle-index": rowHandle.index,
+          style: {
+            top: Math.max(8, rowHandle.center - 12),
+            left: rowHandleLeft
+          },
+          children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+            DropdownMenu,
+            {
+              placement: "right",
+              isOpen: openMenuKey === menuKey,
+              onOpenChange: (open) => {
+                setOpenMenuKey((prev) => open ? menuKey : prev === menuKey ? null : prev);
+              },
+              items: getRowHandleMenuItems(rowHandle),
+              trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+                "button",
+                {
+                  type: "button",
+                  "aria-label": `${t("tableMenu.dragRow")} ${rowHandle.index + 1}`,
+                  title: `${t("tableMenu.dragRow")} ${rowHandle.index + 1}`,
+                  onMouseDown: (event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    setOpenMenuKey(null);
+                    dragStateRef.current = {
+                      kind: "row",
+                      originIndex: rowHandle.index,
+                      targetIndex: rowHandle.index,
+                      anchorPos: rowHandle.cellPos
+                    };
+                    setDragPreview({
+                      kind: "row",
+                      originIndex: rowHandle.index,
+                      targetIndex: rowHandle.index,
+                      targetStart: rowHandle.start,
+                      targetSize: rowHandle.size
+                    });
+                    document.body.style.cursor = "grabbing";
+                  },
+                  className: cn(
+                    "inline-flex h-6 w-6 items-center justify-center rounded-full",
+                    "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
+                    "transition-[opacity,transform,colors] duration-150 hover:bg-accent hover:text-foreground"
+                  ),
+                  children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.GripVertical, { className: "h-3.5 w-3.5" })
+                }
+              )
+            }
+          )
+        },
+        `row-handle-${rowHandle.index}`
+      );
+    }),
+    layout.columnHandles.map((columnHandle) => {
+      const menuKey = getColumnMenuKey(columnHandle.index);
+      const visible = controlsVisible || hoverState.columnHandleIndex === columnHandle.index || openMenuKey === menuKey;
+      if (!visible) return null;
+      return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+        "div",
+        {
+          className: "absolute z-30",
+          "data-column-handle-index": columnHandle.index,
+          style: {
+            top: columnHandleTop,
+            left: Math.max(8, columnHandle.center - 12)
+          },
+          children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+            DropdownMenu,
+            {
+              placement: "bottom-start",
+              isOpen: openMenuKey === menuKey,
+              onOpenChange: (open) => {
+                setOpenMenuKey((prev) => open ? menuKey : prev === menuKey ? null : prev);
+              },
+              items: getColumnHandleMenuItems(columnHandle),
+              trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+                "button",
+                {
+                  type: "button",
+                  "aria-label": `${t("tableMenu.dragColumn")} ${columnHandle.index + 1}`,
+                  title: `${t("tableMenu.dragColumn")} ${columnHandle.index + 1}`,
+                  onMouseDown: (event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    setOpenMenuKey(null);
+                    dragStateRef.current = {
+                      kind: "column",
+                      originIndex: columnHandle.index,
+                      targetIndex: columnHandle.index,
+                      anchorPos: columnHandle.cellPos
+                    };
+                    setDragPreview({
+                      kind: "column",
+                      originIndex: columnHandle.index,
+                      targetIndex: columnHandle.index,
+                      targetStart: columnHandle.start,
+                      targetSize: columnHandle.size
+                    });
+                    document.body.style.cursor = "grabbing";
+                  },
+                  className: cn(
+                    "inline-flex h-6 w-6 items-center justify-center rounded-full",
+                    "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
+                    "transition-[opacity,transform,colors] duration-150 hover:bg-accent hover:text-foreground"
+                  ),
+                  children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.GripHorizontal, { className: "h-3.5 w-3.5" })
+                }
+              )
+            }
+          )
+        },
+        `column-handle-${columnHandle.index}`
+      );
+    }),
+    (controlsVisible || hoverState.menuVisible || tableMenuOpen) && /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+      "div",
       {
-        placement: "bottom-start",
-        items: getColumnHandleMenuItems(columnHandle),
-        trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-          "button",
+        className: "absolute z-30",
+        "data-table-control": "table-menu",
+        style: {
+          top: menuTop,
+          left: menuLeft
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+          DropdownMenu,
           {
-            type: "button",
-            "aria-label": `${t("tableMenu.dragColumn")} ${columnHandle.index + 1}`,
-            title: `${t("tableMenu.dragColumn")} ${columnHandle.index + 1}`,
-            onMouseDown: (event) => {
-              event.preventDefault();
-              event.stopPropagation();
-              dragStateRef.current = {
-                kind: "column",
-                originIndex: columnHandle.index,
-                targetIndex: columnHandle.index,
-                anchorPos: columnHandle.cellPos
-              };
-              setDragPreview({
-                kind: "column",
-                originIndex: columnHandle.index,
-                targetIndex: columnHandle.index,
-                targetStart: columnHandle.start,
-                targetSize: columnHandle.size
-              });
-              document.body.style.cursor = "grabbing";
+            placement: "bottom-start",
+            isOpen: tableMenuOpen,
+            onOpenChange: (open) => {
+              setOpenMenuKey((prev) => open ? "table" : prev === "table" ? null : prev);
             },
-            className: cn(
-              "inline-flex h-6 w-6 items-center justify-center rounded-full",
-              "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
-              "transition-colors hover:bg-accent hover:text-foreground"
-            ),
-            children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.GripHorizontal, { className: "h-3.5 w-3.5" })
-          }
-        )
-      }
-    ) }, `column-handle-${columnHandle.index}`)),
-    /* @__PURE__ */ (0, import_jsx_runtime82.jsx)("div", { className: "pointer-events-none absolute z-30", style: { top: menuTop, left: menuLeft }, children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-      DropdownMenu,
-      {
-        placement: "bottom-start",
-        items: menuItems,
-        trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-          "button",
-          {
-            type: "button",
-            "aria-label": t("tableMenu.openControls"),
-            title: t("tableMenu.openControls"),
-            onMouseDown: (event) => event.preventDefault(),
-            className: cn(
-              "pointer-events-auto inline-flex h-7 w-7 items-center justify-center rounded-full",
-              "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
-              "transition-colors hover:bg-accent hover:text-foreground"
-            ),
-            children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.MoreHorizontal, { className: "h-4 w-4" })
+            items: menuItems,
+            trigger: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+              "button",
+              {
+                type: "button",
+                "aria-label": t("tableMenu.openControls"),
+                title: t("tableMenu.openControls"),
+                onMouseDown: (event) => event.preventDefault(),
+                className: cn(
+                  "pointer-events-auto inline-flex h-7 w-7 items-center justify-center rounded-full",
+                  "border border-border/70 bg-background/95 text-muted-foreground shadow-sm backdrop-blur",
+                  "transition-[opacity,transform,colors] duration-150 hover:bg-accent hover:text-foreground"
+                ),
+                children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_lucide_react47.MoreHorizontal, { className: "h-4 w-4" })
+              }
+            )
           }
         )
       }
-    ) }),
-    /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+    ),
+    (controlsVisible || hoverState.addColumnVisible) && /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
       "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 });
@@ -29675,21 +29818,28 @@ function TableControls({ editor, containerRef }) {
         className: cn(
           "absolute z-30 inline-flex items-center justify-center rounded-md",
           "border border-border/70 bg-muted/40 text-muted-foreground shadow-sm backdrop-blur",
-          "transition-colors hover:bg-accent hover:text-foreground disabled:opacity-50 disabled:cursor-not-allowed"
+          "transition-[opacity,transform,colors] duration-150 hover:bg-accent hover:text-foreground disabled:opacity-50 disabled:cursor-not-allowed"
         ),
-        style: { top: columnRailTop, left: columnRailLeft, width: 18, height: layout.tableHeight },
+        style: {
+          top: columnRailTop,
+          left: columnRailLeft,
+          width: 18,
+          height: layout.tableHeight
+        },
         children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)("span", { className: "text-sm font-medium leading-none", children: "+" })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+    (controlsVisible || hoverState.addRowVisible) && /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
       "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 });
@@ -29699,9 +29849,14 @@ function TableControls({ editor, containerRef }) {
         className: cn(
           "absolute z-30 inline-flex items-center justify-center rounded-md",
           "border border-border/70 bg-muted/40 text-muted-foreground shadow-sm backdrop-blur",
-          "transition-colors hover:bg-accent hover:text-foreground disabled:opacity-50 disabled:cursor-not-allowed"
+          "transition-[opacity,transform,colors] duration-150 hover:bg-accent hover:text-foreground disabled:opacity-50 disabled:cursor-not-allowed"
         ),
-        style: { top: rowRailTop, left: rowRailLeft, width: layout.tableWidth, height: 16 },
+        style: {
+          top: rowRailTop,
+          left: rowRailLeft,
+          width: layout.tableWidth,
+          height: 16
+        },
         children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)("span", { className: "text-sm font-medium leading-none", children: "+" })
       }
     ),
@@ -29836,6 +29991,19 @@ function resolveEventElement(target) {
   if (target instanceof Node) return target.parentElement;
   return null;
 }
+function getSelectionTableCell(view) {
+  const browserSelection = window.getSelection();
+  const anchorElement = resolveEventElement(browserSelection?.anchorNode ?? null);
+  const anchorCell = anchorElement?.closest?.("th,td");
+  if (anchorCell instanceof HTMLElement) {
+    return anchorCell;
+  }
+  const { from } = view.state.selection;
+  const domAtPos = view.domAtPos(from);
+  const element = resolveEventElement(domAtPos.node);
+  const cell = element?.closest?.("th,td");
+  return cell instanceof HTMLElement ? cell : null;
+}
 function isRowResizeHotspot(cell, clientX, clientY) {
   const rect = cell.getBoundingClientRect();
   const nearBottom = rect.bottom - clientY <= TABLE_RESIZE_HIT_ZONE;
@@ -29862,6 +30030,16 @@ function getRelativeBoundaryMetrics(surface, table, row, cell) {
     columnRight: cellRect.right - surfaceRect.left + surface.scrollLeft
   };
 }
+function getRelativeCellMetrics(surface, cell) {
+  const surfaceRect = surface.getBoundingClientRect();
+  const cellRect = cell.getBoundingClientRect();
+  return {
+    left: cellRect.left - surfaceRect.left + surface.scrollLeft,
+    top: cellRect.top - surfaceRect.top + surface.scrollTop,
+    width: cellRect.width,
+    height: cellRect.height
+  };
+}
 var UEditor = import_react53.default.forwardRef(({
   content = "",
   onChange,
@@ -29889,6 +30067,9 @@ var UEditor = import_react53.default.forwardRef(({
   const editorContentRef = (0, import_react53.useRef)(null);
   const tableColumnGuideRef = (0, import_react53.useRef)(null);
   const tableRowGuideRef = (0, import_react53.useRef)(null);
+  const activeTableCellHighlightRef = (0, import_react53.useRef)(null);
+  const hoveredTableCellRef = (0, import_react53.useRef)(null);
+  const activeTableCellRef = (0, import_react53.useRef)(null);
   const rowResizeStateRef = (0, import_react53.useRef)(null);
   const setEditorResizeCursor = import_react53.default.useCallback((cursor) => {
     const proseMirror = editorContentRef.current?.querySelector(".ProseMirror");
@@ -29915,6 +30096,36 @@ var UEditor = import_react53.default.forwardRef(({
     hideColumnGuide();
     hideRowGuide();
   }, [hideColumnGuide, hideRowGuide, setEditorResizeCursor]);
+  const updateActiveCellHighlight = import_react53.default.useCallback((cell) => {
+    const surface = editorContentRef.current;
+    const highlight = activeTableCellHighlightRef.current;
+    if (!highlight) return;
+    if (!surface || !cell) {
+      highlight.style.display = "none";
+      return;
+    }
+    const metrics = getRelativeCellMetrics(surface, cell);
+    highlight.style.display = "block";
+    highlight.style.left = `${metrics.left}px`;
+    highlight.style.top = `${metrics.top}px`;
+    highlight.style.width = `${metrics.width}px`;
+    highlight.style.height = `${metrics.height}px`;
+  }, []);
+  const setActiveTableCell = import_react53.default.useCallback((cell) => {
+    if (activeTableCellRef.current === cell) return;
+    activeTableCellRef.current = cell;
+    updateActiveCellHighlight(activeTableCellRef.current);
+  }, [updateActiveCellHighlight]);
+  const clearActiveTableCell = import_react53.default.useCallback(() => {
+    activeTableCellRef.current = null;
+    updateActiveCellHighlight(null);
+  }, [updateActiveCellHighlight]);
+  const setHoveredTableCell = import_react53.default.useCallback((cell) => {
+    hoveredTableCellRef.current = cell;
+  }, []);
+  const clearHoveredTableCell = import_react53.default.useCallback(() => {
+    hoveredTableCellRef.current = null;
+  }, []);
   const showColumnGuide = import_react53.default.useCallback((table, row, cell) => {
     const surface = editorContentRef.current;
     const guide = tableColumnGuideRef.current;
@@ -30020,8 +30231,13 @@ var UEditor = import_react53.default.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",
@@ -30096,6 +30312,10 @@ var UEditor = import_react53.default.forwardRef(({
       onJsonChange?.(editor2.getJSON());
     }
   });
+  const syncActiveTableCellFromSelection = import_react53.default.useCallback(() => {
+    if (!editor) return;
+    setActiveTableCell(getSelectionTableCell(editor.view));
+  }, [editor, setActiveTableCell]);
   (0, import_react53.useImperativeHandle)(
     ref,
     () => ({
@@ -30128,9 +30348,27 @@ var UEditor = import_react53.default.forwardRef(({
   (0, import_react53.useEffect)(() => {
     if (!editor) return void 0;
     const proseMirror = editor.view.dom;
+    const surface = editorContentRef.current;
+    let selectionSyncTimeoutId = 0;
+    const scheduleActiveCellSync = (fallbackCell = null) => {
+      requestAnimationFrame(() => {
+        setActiveTableCell(getSelectionTableCell(editor.view) ?? fallbackCell);
+      });
+      window.clearTimeout(selectionSyncTimeoutId);
+      selectionSyncTimeoutId = window.setTimeout(() => {
+        setActiveTableCell(getSelectionTableCell(editor.view) ?? fallbackCell);
+      }, 0);
+    };
+    const handleSelectionChange = () => {
+      scheduleActiveCellSync();
+    };
+    const handleActiveCellLayoutChange = () => {
+      updateActiveCellHighlight(activeTableCellRef.current);
+    };
     const handleEditorMouseMove = (event) => {
       const activeRowResize = rowResizeStateRef.current;
       if (activeRowResize) {
+        setHoveredTableCell(activeRowResize.cellElement);
         showRowGuide(activeRowResize.tableElement, activeRowResize.rowElement, activeRowResize.cellElement);
         return;
       }
@@ -30141,12 +30379,15 @@ var UEditor = import_react53.default.forwardRef(({
       }
       const cell = target.closest("th,td");
       if (!(cell instanceof HTMLElement)) {
+        clearHoveredTableCell();
         clearAllTableResizeHover();
         return;
       }
+      setHoveredTableCell(cell);
       const row = cell.closest("tr");
       const table = cell.closest("table");
       if (!(row instanceof HTMLTableRowElement) || !(table instanceof HTMLTableElement)) {
+        clearHoveredTableCell();
         clearAllTableResizeHover();
         return;
       }
@@ -30165,6 +30406,7 @@ var UEditor = import_react53.default.forwardRef(({
       clearAllTableResizeHover();
     };
     const handleEditorMouseLeave = () => {
+      clearHoveredTableCell();
       if (!rowResizeStateRef.current) {
         clearAllTableResizeHover();
       }
@@ -30172,15 +30414,24 @@ var UEditor = import_react53.default.forwardRef(({
     const handleEditorMouseDown = (event) => {
       if (event.button !== 0) return;
       const target = resolveEventElement(event.target);
-      if (!(target instanceof Element)) return;
+      if (!(target instanceof Element)) {
+        clearActiveTableCell();
+        return;
+      }
       const cell = target.closest("th,td");
-      if (!(cell instanceof HTMLTableCellElement)) return;
+      if (!(cell instanceof HTMLTableCellElement)) {
+        clearActiveTableCell();
+        return;
+      }
+      setActiveTableCell(cell);
+      scheduleActiveCellSync(cell);
       const row = cell.closest("tr");
       const table = cell.closest("table");
       if (!(row instanceof HTMLTableRowElement) || !(table instanceof HTMLTableElement)) return;
       if (!isRowResizeHotspot(cell, event.clientX, event.clientY)) {
         return;
       }
+      setHoveredTableCell(cell);
       const rowInfo = findTableRowNodeInfo(editor.view, row);
       if (!rowInfo) return;
       rowResizeStateRef.current = {
@@ -30241,6 +30492,7 @@ var UEditor = import_react53.default.forwardRef(({
       clearPreviewRowHeight(state.rowElement);
       rowResizeStateRef.current = null;
       document.body.style.cursor = "";
+      clearHoveredTableCell();
       clearAllTableResizeHover();
     };
     const handleWindowBlur = () => {
@@ -30249,30 +30501,53 @@ var UEditor = import_react53.default.forwardRef(({
       clearPreviewRowHeight(state.rowElement);
       rowResizeStateRef.current = null;
       document.body.style.cursor = "";
+      clearHoveredTableCell();
       clearAllTableResizeHover();
     };
     proseMirror.addEventListener("mousemove", handleEditorMouseMove);
     proseMirror.addEventListener("mouseleave", handleEditorMouseLeave);
     proseMirror.addEventListener("mousedown", handleEditorMouseDown);
+    proseMirror.addEventListener("click", handleSelectionChange);
+    proseMirror.addEventListener("mouseup", handleSelectionChange);
+    proseMirror.addEventListener("keyup", handleSelectionChange);
+    proseMirror.addEventListener("focusin", handleSelectionChange);
+    document.addEventListener("selectionchange", handleSelectionChange);
+    surface?.addEventListener("scroll", handleActiveCellLayoutChange, { passive: true });
+    window.addEventListener("resize", handleActiveCellLayoutChange);
     window.addEventListener("mousemove", handlePointerMove);
     document.addEventListener("pointermove", handlePointerMove);
     window.addEventListener("mouseup", handlePointerUp);
     document.addEventListener("pointerup", handlePointerUp);
     window.addEventListener("blur", handleWindowBlur);
+    editor.on("selectionUpdate", syncActiveTableCellFromSelection);
+    editor.on("focus", syncActiveTableCellFromSelection);
+    syncActiveTableCellFromSelection();
     return () => {
       proseMirror.removeEventListener("mousemove", handleEditorMouseMove);
       proseMirror.removeEventListener("mouseleave", handleEditorMouseLeave);
       proseMirror.removeEventListener("mousedown", handleEditorMouseDown);
+      proseMirror.removeEventListener("click", handleSelectionChange);
+      proseMirror.removeEventListener("mouseup", handleSelectionChange);
+      proseMirror.removeEventListener("keyup", handleSelectionChange);
+      proseMirror.removeEventListener("focusin", handleSelectionChange);
+      document.removeEventListener("selectionchange", handleSelectionChange);
+      surface?.removeEventListener("scroll", handleActiveCellLayoutChange);
+      window.removeEventListener("resize", handleActiveCellLayoutChange);
       window.removeEventListener("mousemove", handlePointerMove);
       document.removeEventListener("pointermove", handlePointerMove);
       window.removeEventListener("mouseup", handlePointerUp);
       document.removeEventListener("pointerup", handlePointerUp);
       window.removeEventListener("blur", handleWindowBlur);
+      editor.off("selectionUpdate", syncActiveTableCellFromSelection);
+      editor.off("focus", syncActiveTableCellFromSelection);
+      window.clearTimeout(selectionSyncTimeoutId);
       document.body.style.cursor = "";
+      clearActiveTableCell();
+      clearHoveredTableCell();
       clearAllTableResizeHover();
       rowResizeStateRef.current = null;
     };
-  }, [clearAllTableResizeHover, editor, hideColumnGuide, hideRowGuide, showColumnGuide, showRowGuide]);
+  }, [clearActiveTableCell, clearAllTableResizeHover, clearHoveredTableCell, editor, hideColumnGuide, hideRowGuide, setHoveredTableCell, showColumnGuide, showRowGuide, syncActiveTableCellFromSelection, updateActiveCellHighlight]);
   if (!editor) {
     return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
       "div",
@@ -30324,6 +30599,14 @@ var UEditor = import_react53.default.forwardRef(({
                   className: "pointer-events-none absolute z-20 bg-primary opacity-0 transition-opacity duration-100"
                 }
               ),
+              /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
+                "span",
+                {
+                  ref: activeTableCellHighlightRef,
+                  "aria-hidden": "true",
+                  className: "pointer-events-none hidden absolute z-20 rounded-[2px] border-2 border-[#2383e2] bg-[#2383e2]/[0.06] transition-[left,top,width,height] duration-100"
+                }
+              ),
               editable && /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(TableControls, { editor, containerRef: editorContentRef }),
               /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
                 import_react54.EditorContent,