@canvas-components/list-table 0.3.16 → 0.3.17

package/dist/index.js

@@ -1,4 +1,4 @@
-import { stringifyDataIndex, getValueByDataIndex, clamp, copyTextSync, copyText, exportTableToXlsx, resolveCanvasScrollbarAxis, formatPreciseNumber, addPreciseNumbers, comparePreciseNumbers, isSameDataIndex, dividePreciseNumber, exportTableToTxt, exportTableToCsv, downloadJsonFile, mapRowsToExportRecords, copyJson, copyRows, parseNumberValue, formatNumberValue, formatPercentValue, formatScientificValue, formatChineseNumber, parseChineseNumber, normalizeDecimalPlaces, roundPreciseNumber, isDateTimeFormatPattern, formatDateTimeValue, formatCustomNumberPattern, isPointInRect as isPointInRect$1 } from '@canvas-components/utils';
+import { stringifyDataIndex, getValueByDataIndex, clamp, resolveCanvasScrollbarAxis, copyTextSync, copyText, exportTableToXlsx, formatPreciseNumber, addPreciseNumbers, comparePreciseNumbers, isSameDataIndex, dividePreciseNumber, exportTableToTxt, exportTableToCsv, downloadJsonFile, mapRowsToExportRecords, copyJson, copyRows, parseNumberValue, formatNumberValue, formatPercentValue, formatScientificValue, formatChineseNumber, parseChineseNumber, normalizeDecimalPlaces, roundPreciseNumber, isDateTimeFormatPattern, formatDateTimeValue, formatCustomNumberPattern, isPointInRect as isPointInRect$1 } from '@canvas-components/utils';
 import { drawBarcodeToCanvas } from '@canvas-components/barcode';
 import { drawCanvasChartToCanvas, getCanvasChartRenderer, resolveCanvasChartTooltipText } from '@canvas-components/chart';
 import { drawQrCodeToCanvas } from '@canvas-components/qrcode';
@@ -664,15 +664,19 @@ function stretchColumnWidths(columns, containerWidth) {
   }
   const extra = containerWidth - totalWidth;
   const stretchableWidth = computeColumnWidths(stretchableColumns);
-  const ratio = stretchableWidth > 0 ? extra / stretchableWidth : 0;
-  for (const column of stretchableColumns) {
-    column.width = Math.round(column.width * (1 + ratio));
-  }
-  const adjustedTotal = computeColumnWidths(columns);
-  const remain = containerWidth - adjustedTotal;
-  if (remain > 0) {
-    stretchableColumns[stretchableColumns.length - 1].width += remain;
-  }
+  let accumulatedWidth = 0;
+  let allocatedExtra = 0;
+  stretchableColumns.forEach((column, index) => {
+    accumulatedWidth += column.width;
+    const targetExtra = index === stretchableColumns.length - 1 ? extra : Math.min(
+      extra,
+      Math.floor(
+        extra * (stretchableWidth > 0 ? accumulatedWidth / stretchableWidth : (index + 1) / stretchableColumns.length)
+      )
+    );
+    column.width += targetExtra - allocatedExtra;
+    allocatedExtra = targetExtra;
+  });
 }
 function shrinkColumnWidthsToFit(columns, containerWidth) {
   let remaining = Math.max(
@@ -30505,9 +30509,10 @@ var ListTableRenderController = class {
     const availableHeight = this.options.getContainerClientHeight() > 0 ? this.options.getContainerClientHeight() : hostSize.height;
     const zoom = this.resolveZoom();
     const layoutWidth = hostSize.width / zoom;
-    const layoutAvailableHeight = availableHeight / zoom;
-    const currentSnapshot = this.currentRenderSnapshot;
-    const measureSnapshot = currentSnapshot && currentSnapshot.width === layoutWidth && currentSnapshot.groupingBarHeight === (this.options.getGroupBarVisible?.() ? currentSnapshot.rowHeight : 0) && currentSnapshot.groupingColumns.map((column) => column.key).join("
") === (this.options.getGroupColumnKeys?.() ?? []).join("
") ? currentSnapshot : this.buildSnapshot(layoutWidth, layoutAvailableHeight, false);
+    const measureSnapshot = this.buildSnapshot(
+      layoutWidth,
+      hostSize.height / zoom
+    );
     if (!measureSnapshot) {
       this.options.setFittedHeight(null);
       return;
@@ -30526,10 +30531,13 @@ var ListTableRenderController = class {
       summaryHeight: measureSnapshot.bodyLayout.summaryHeight
     });
     const paginationElement = this.options.getPaginationElement();
+    const scrollbar = this.options.getOptions().scrollbar;
+    const horizontal = resolveCanvasScrollbarAxis(scrollbar, "horizontal");
+    const horizontalReserve = horizontal.visible && measureSnapshot.columnMetrics.centerContentWidth - measureSnapshot.columnMetrics.availableCenterWidth > 1 ? horizontal.thickness + Math.max(scrollbar?.horizontalBottom ?? 0, 0) : 0;
     const paginationHeight = paginationElement && paginationElement.style.display !== "none" ? paginationElement.offsetHeight : 0;
     const fittedHeight = resolveFittedTableHeight({
       availableHeight,
-      contentHeight: contentHeight * zoom + paginationHeight
+      contentHeight: (contentHeight + horizontalReserve) * zoom + paginationHeight
     });
     this.options.setFittedHeight(
       fittedHeight == null ? null : fittedHeight + TABLE_CONTENT_BORDER_SIZE