pace-table-lib 1.0.33 → 1.0.35

package/dist/pace-table-lib.umd.js

@@ -17477,7 +17477,7 @@
       newNonFixedColCellWidth,
       fixedColWidth
     } = React.useMemo(() => {
-      let colCellH = 20;
+      let colCellH = Table2.RowHeight;
       let rowCellH = Table2.RowHeight;
       let nonFixColCellW = Table2.TableWidth;
       let fixedColCellW = Table2.FixHeaderWidth;
@@ -17488,12 +17488,14 @@
         rowCellH = newRowHeight;
       }
       if (isFitTableOn) {
-        const sharedWidth = Math.floor(tableWidth / columnCount);
-        const sharedHeight = Math.floor(tableHeight / rowCount);
-        colCellH = sharedHeight;
-        rowCellH = sharedHeight;
-        nonFixColCellW = sharedWidth;
-        fixedColCellW = sharedWidth;
+        const baseColWidth = Math.floor(tableWidth / columnCount);
+        const extraWidth = tableWidth - baseColWidth * columnCount;
+        nonFixColCellW = baseColWidth;
+        fixedColCellW = baseColWidth + extraWidth;
+        const baseRowHeight = Math.floor(tableHeight / rowCount);
+        const extraHeight = tableHeight - baseRowHeight * rowCount;
+        rowCellH = baseRowHeight;
+        colCellH = baseRowHeight + extraHeight;
       }
       return {
         colCellHeight: Number(colCellH),
@@ -18417,7 +18419,7 @@
       if (isFirstRow) {
         if (isColHeaderVisible) {
           style["--borderT"] = insideHBorder;
-        } else if (!isColHeaderVisible && headerAtStart) {
+        } else if (!isColHeaderVisible && headerAtStart && isColTotalOn) {
           style["--borderT"] = insideHBorder;
         } else {
           style["--borderT"] = outsideBorder;
@@ -18464,13 +18466,27 @@
         const dataAreaTop = fixedRowCount2 * cellHeight;
         const finalBottom = dataAreaTop + finalTotalRows * cellHeight;
         const isLastRow = Math.abs(cellBottom - finalBottom) < 1;
+        let borderForTop = null;
+        if (isColHeaderVisible) {
+          if (isColTotalOn2 && headerAtStart) {
+            borderForTop = null;
+          } else {
+            borderForTop = insideHBorder;
+          }
+        } else {
+          if (isColTotalOn2 && headerAtStart) {
+            borderForTop = insideHBorder;
+          } else {
+            borderForTop = outsideBorder;
+          }
+        }
         const newStyle = {
           ...style,
           // OUTER BORDER — always applied
           ["--borderL"]: isFirstCol ? outsideBorder : null,
           ["--borderR"]: insideVBorder,
           ["--borderB"]: isLastRow ? outsideBorder : insideHBorder,
-          ["--borderT"]: isFirstRow && !isColTotalOn2 && !headerAtStart ? insideHBorder : null
+          ["--borderT"]: isFirstRow ? borderForTop : null
         };
         if (cell.isSparkLine) {
           newStyle.borderLeft = INNER;
@@ -18493,18 +18509,16 @@
         return count;
       }
       const visibleHeaderCols = computeVisibleHeaderCols();
-      const lastHeaderColAbs = fixedColCount2 + visibleHeaderCols - 1;
+      const lastHeaderColAbs = visibleHeaderCols - 1;
       const lastHeaderRow = fixedRowCount2 - 1;
-      const processed = headers.map((cell) => {
+      const processed = headers.map((cell, cellIndex) => {
         const style = { ...cell.style ?? cell };
         const leftPx = style.left ?? 0;
         const topPx = style.top ?? 0;
-        const widthPx = style.width || cellWidth;
         const heightPx = style.height || cellHeight;
-        const colIndexAbs = Math.round(leftPx / cellWidth);
-        const colSpan = Math.max(1, Math.round(widthPx / cellWidth));
+        const colIndexAbs = Math.round((leftPx - fixedColCount2 * fixedColWidth) / cellWidth);
         const isFirstCol = colIndexAbs === fixedColCount2;
-        const isLastCol = colIndexAbs + colSpan - 1 === lastHeaderColAbs;
+        const isLastCol = colIndexAbs === lastHeaderColAbs;
         const rowIndex = Math.round(topPx / cellHeight);
         const rowSpan = Math.max(1, Math.round(heightPx / cellHeight));
         const isFirstRow = rowIndex === 0;