twico-ui 1.17.0 → 1.17.2

package/dist/index.mjs

@@ -10038,6 +10038,7 @@ function Datatable({
     [cols, editMode, batchEditKey]
     // eslint-disable-line react-hooks/exhaustive-deps
   );
+  const hasBatchEditor = showBatchEdit && batchEditableCols.length > 0;
   const [batchEdit, setBatchEdit] = React51__default.useState(null);
   const [batchEditPos, openBatchEdit, closeBatchEdit] = useFloating();
   function openBatchEditor(el) {
@@ -10051,7 +10052,7 @@ function Datatable({
       closeBatchEdit();
     };
     const onDown = (e) => {
-      if (!e.target.closest(".twc-dt__pop") && !e.target.closest(".twc-dt__batch")) close();
+      if (!e.target.closest(".twc-dt__pop") && !e.target.closest(".twc-dt__batch") && !e.target.closest(".twc-pop")) close();
     };
     const onKey = (e) => {
       if (e.key === "Escape") close();
@@ -10306,6 +10307,8 @@ function Datatable({
             const editable = isColEditable(c);
             const isEditing = editing && editing.key === k && editing.field === c.field;
             const cellActive = selectionMode === "cell" && activeCell && activeCell.key === k && activeCell.field === c.field;
+            const display = c.valueFormatter ? c.valueFormatter(val, row) : val;
+            const cellTitle = !isActions && !c.renderCell && !isEditing && (typeof display === "string" || typeof display === "number") ? String(display) : void 0;
             return /* @__PURE__ */ jsxs(
               "td",
               {
@@ -10324,14 +10327,14 @@ function Datatable({
                 "data-pin": st.pin,
                 "data-pin-edge": st.edge,
                 style: { width: widthOf(c), ...st.style },
-                title: isActions || c.renderCell || editable ? void 0 : String(val ?? ""),
+                title: cellTitle,
                 onClick: selectionMode === "cell" ? (e) => handleCellClick(e, k, row, c) : void 0,
                 onFocus: () => setFocus((f) => f.r === ri && f.c === ci ? f : { r: ri, c: ci }),
                 onDoubleClick: editable ? () => beginEdit(k, c, row) : void 0,
                 children: [
                   !checkboxSelection && reorderable && ci === 0 && !isEditing ? /* @__PURE__ */ jsxs("span", { style: { display: "inline-flex", alignItems: "center", gap: 6, maxWidth: "100%" }, children: [
                     rowHandle(k, midIdx, row),
-                    /* @__PURE__ */ jsx("span", { style: { overflow: "hidden", textOverflow: "ellipsis" }, children: isActions ? renderActions(c, row) : c.renderCell ? c.renderCell(val, row) : c.valueFormatter ? c.valueFormatter(val, row) : val })
+                    /* @__PURE__ */ jsx("span", { style: { overflow: "hidden", textOverflow: "ellipsis" }, children: isActions ? renderActions(c, row) : c.renderCell ? c.renderCell(val, row) : display })
                   ] }) : isEditing ? c.renderEditCell ? (
                     // #236: full escape hatch — the host drops in its own editor (searchable/creatable/
                     // async Combobox, …) and drives the lifecycle via commit/cancel. Wrapped in
@@ -10350,7 +10353,7 @@ function Datatable({
                       onCancel: cancelEdit,
                       onKeyDown: onEditKey
                     }
-                  ) : isActions ? renderActions(c, row) : c.renderCell ? c.renderCell(val, row) : c.valueFormatter ? c.valueFormatter(val, row) : val,
+                  ) : isActions ? renderActions(c, row) : c.renderCell ? c.renderCell(val, row) : display,
                   editable && !isEditing ? /* @__PURE__ */ jsx("span", { className: "twc-dt__edit-hint", "aria-hidden": "true", children: /* @__PURE__ */ jsx(Svg, { d: I.pencil }) }) : null
                 ]
               },
@@ -10464,14 +10467,14 @@ function Datatable({
   return /* @__PURE__ */ jsxs("div", { className: `twc-dt ${className}`, ref: rootRef, "data-density": density, "data-resizing": resizing || void 0, ...rest, children: [
     __twcStyles,
     /* @__PURE__ */ jsxs("div", { className: "twc-dt__toolbar", "data-compact": compact || void 0, children: [
-      batchActions.length && selected.size > 0 ? /* @__PURE__ */ jsxs("div", { className: "twc-dt__batch", children: [
+      (batchActions.length || hasBatchEditor) && selected.size > 0 ? /* @__PURE__ */ jsxs("div", { className: "twc-dt__batch", children: [
         /* @__PURE__ */ jsx("button", { type: "button", className: "twc-dt__batch-x", onClick: clearSelection, "aria-label": "Clear selection", children: /* @__PURE__ */ jsx(Svg, { d: I.x }) }),
         /* @__PURE__ */ jsxs("span", { className: "twc-dt__batch-count", children: [
           selected.size,
           " selected"
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "twc-dt__batch-actions", children: [
-          showBatchEdit && batchEditableCols.length ? /* @__PURE__ */ jsxs("button", { type: "button", className: "twc-dt__batch-btn", onClick: (e) => openBatchEditor(e.currentTarget), children: [
+          hasBatchEditor ? /* @__PURE__ */ jsxs("button", { type: "button", className: "twc-dt__batch-btn", onClick: (e) => openBatchEditor(e.currentTarget), children: [
             /* @__PURE__ */ jsx(Svg, { d: I.pencil }),
             "Edit"
           ] }) : null,
@@ -10766,6 +10769,7 @@ function Datatable({
                           className: "twc-dt__th-label",
                           role: c.sortable ? "button" : void 0,
                           tabIndex: c.sortable ? 0 : void 0,
+                          title: typeof c.headerName === "string" ? c.headerName : void 0,
                           "aria-label": c.sortable ? `${c.headerName}, sort` : void 0,
                           draggable: reorderable || void 0,
                           onDragStart: reorderable ? (e) => {
@@ -10897,8 +10901,8 @@ function Datatable({
           const nf = (n) => n.toLocaleString();
           if (totalRows === 0) return "No rows";
           const shown = paged.length;
-          const start = paginated ? pageVal * sizeVal + 1 : 1;
-          const end = paginated ? start + shown - 1 : shown;
+          const start = paginated ? Math.min(pageVal * sizeVal + 1, totalRows) : 1;
+          const end = paginated ? Math.min(start + shown - 1, totalRows) : shown;
           return /* @__PURE__ */ jsxs(Fragment, { children: [
             paginated ? /* @__PURE__ */ jsxs(Fragment, { children: [
               "Showing ",