@canvas-components/list-table 0.3.8 → 0.3.10

package/dist/index.js

@@ -2846,8 +2846,8 @@ function resolveContentTextDecoration(content) {
 function resolveContentTextIndent(content) {
   return content.style?.textIndent ?? 0;
 }
-function resolveContentTextAlign(content) {
-  return content.style?.textAlign ?? "left";
+function resolveContentTextAlign(content, fallback = "left") {
+  return content.style?.textAlign ?? fallback;
 }
 function resolveContentLayoutWidth(content, intrinsicWidth) {
   return Math.max(content.style?.width ?? intrinsicWidth, intrinsicWidth);
@@ -5880,7 +5880,7 @@ function drawBodyTagContent(params) {
     fontFamily: resolveContentFontFamily(content, theme)
   });
   ctx.textAlign = "left";
-  ctx.textBaseline = "middle";
+  ctx.textBaseline = "alphabetic";
   const bounds = measureTextBounds(ctx, content.text);
   const textBoxWidth = Math.max(width - paddingInline * 2, 0);
   const textX = resolveAlignedTextX({
@@ -5888,9 +5888,14 @@ function drawBodyTagContent(params) {
     boxWidth: textBoxWidth,
     textWidth: bounds.width,
     textIndent,
-    textAlign: resolveContentTextAlign(content)
+    textAlign: resolveContentTextAlign(content, "center")
   });
   const centerY = rect.y + rect.height / 2;
+  const textY = resolveCenteredTextBaselineY({
+    centerY,
+    ascent: bounds.ascent,
+    descent: bounds.descent
+  });
   drawSelectableTextSelectionBackground({
     ctx,
     text: content.text,
@@ -5900,11 +5905,11 @@ function drawBodyTagContent(params) {
     fragmentKey,
     textSelection,
     textOriginX: textX,
-    textTop: centerY - bounds.ascent,
+    textTop: textY - bounds.ascent,
     textHeight: bounds.height,
     color: theme.textSelectionBackgroundColor ?? "#99c2ff"
   });
-  ctx.fillText(content.text, textX, centerY);
+  ctx.fillText(content.text, textX, textY);
   const textFont = ctx.font;
   drawTextDecoration({
     ctx,
@@ -5926,7 +5931,7 @@ function drawBodyTagContent(params) {
     contentIndex,
     fragmentKey,
     textOriginX: textX,
-    textTop: centerY - bounds.ascent,
+    textTop: textY - bounds.ascent,
     textWidth: bounds.width,
     textHeight: bounds.height,
     fixed: column.fixed,
@@ -5969,7 +5974,7 @@ function applyTagTextStyle(ctx, content, theme) {
     fontFamily: resolveContentFontFamily(content, theme)
   });
   ctx.textAlign = "left";
-  ctx.textBaseline = "middle";
+  ctx.textBaseline = "alphabetic";
 }
 function resolveTagPalette(content) {
   if (content.style?.backgroundColor || content.style?.color || content.backgroundColor || content.borderColor || content.textColor) {
@@ -6789,7 +6794,7 @@ function drawBodyCellContents(params) {
       rect: lineRect,
       visibleRect: lineVisibleRect,
       lineWidth: line.width,
-      align: column.align
+      align: resolveBodyContentLineAlign(line, column.align)
     });
     line.items.forEach((item, itemIndex) => {
       if (itemIndex > 0) {
@@ -7916,6 +7921,12 @@ function resolveLineStartX(rect, lineWidth, align) {
   }
   return rect.x;
 }
+function resolveBodyContentLineAlign(line, columnAlign) {
+  if (columnAlign != null) {
+    return columnAlign;
+  }
+  return line.items.length > 0 && line.items.every((item) => item.content.type === "tag") ? "center" : columnAlign;
+}
 function resolveStickyLineStartX(params) {
   const { rect, visibleRect, lineWidth, align } = params;
   const preferredX = resolveLineStartX(rect, lineWidth, align);
@@ -18373,8 +18384,9 @@ async function getColumnConfig(key) {
 // src/services/column-config-service.ts
 function applyStoredColumnConfig(columns, storedColumns) {
   if (!storedColumns) {
-    return;
+    return false;
   }
+  let columnWidthsChanged = false;
   const applyToColumns = (cols) => {
     for (const col of cols) {
       if (!col.key) {
@@ -18382,6 +18394,9 @@ function applyStoredColumnConfig(columns, storedColumns) {
       }
       const stored = storedColumns[col.key];
       if (stored) {
+        if ((col.width ?? 160) !== stored.width) {
+          columnWidthsChanged = true;
+        }
         col.width = stored.width;
         col.hidden = !!stored.hidden;
         if ("align" in stored) {
@@ -18426,6 +18441,7 @@ function applyStoredColumnConfig(columns, storedColumns) {
     }
   };
   applyToColumns(columns);
+  return columnWidthsChanged;
 }
 function buildStoredColumnConfig(columns, sortState, filterState, zoom, summaryRowHeight, density) {
   const result = {};
@@ -18545,7 +18561,7 @@ async function loadListTableStoredConfig(params) {
   if (!stored) {
     return null;
   }
-  applyStoredColumnConfig(columns, stored.columns);
+  const columnWidthsChanged = applyStoredColumnConfig(columns, stored.columns);
   return {
     sortState: stored.sort?.key ? {
       key: stored.sort.key,
@@ -18554,7 +18570,8 @@ async function loadListTableStoredConfig(params) {
     filterState: stored.filters ? stored.filters : null,
     zoom: typeof stored.zoom === "number" && Number.isFinite(stored.zoom) && stored.zoom > 0 ? stored.zoom : null,
     summaryRowHeight: typeof stored.summaryRowHeight === "number" && Number.isFinite(stored.summaryRowHeight) && stored.summaryRowHeight >= 0 ? stored.summaryRowHeight : null,
-    density: stored.density === 26 || stored.density === 32 || stored.density === 48 || stored.density === 56 || stored.density === "auto" ? stored.density : null
+    density: stored.density === 26 || stored.density === 32 || stored.density === 48 || stored.density === 56 || stored.density === "auto" ? stored.density : null,
+    columnWidthsChanged
   };
 }
 
@@ -18587,6 +18604,12 @@ var ListTablePersistenceController = class {
       this.options.canvasHost.setContentZoom(nextZoom);
     }
     let currentOptions = this.options.getOptions();
+    if (stored.columnWidthsChanged && currentOptions.stretchColumns !== false) {
+      currentOptions = {
+        ...currentOptions,
+        stretchColumns: false
+      };
+    }
     if (stored.density != null) {
       const densitySizes = resolveDensitySizes(
         stored.density === "auto" ? "auto" : stored.density === 26 ? "ultra-compact" : stored.density === 32 ? "compact" : stored.density === 56 ? "comfortable" : "middle"
@@ -20498,6 +20521,10 @@ function buildListTableRenderSnapshot(params) {
   if (leafColumns.length === 0) {
     return null;
   }
+  const columnMetrics = resolveColumnMetrics({
+    columns: leafColumns,
+    tableWidth: width
+  });
   const headerInfo = buildHeaderTree(normalizedColumns, leafColumns);
   const sourceQueryRows = {
     baseRows: baseRowsOverride ?? getBaseDisplayRows({
@@ -20539,8 +20566,11 @@ function buildListTableRenderSnapshot(params) {
     (col) => col.summary != null || col.summaryTitle != null
   );
   const hasSummary = queryRows.displayRows.length > 0 && options.summaryRowHeight !== 0 && (options.summaryRowHeight != null || hasConfiguredSummary);
+  const hasHorizontalScrollbar = options.scrollbar?.visible !== false && columnMetrics.centerContentWidth - columnMetrics.availableCenterWidth > 1;
+  const horizontalScrollbarReserve = hasSummary && hasHorizontalScrollbar ? scrollbarThickness + Math.max(options.scrollbar?.horizontalBottom ?? 0, 0) : 0;
+  const contentHeight = Math.max(height - horizontalScrollbarReserve, 0);
   const initialBodyLayout = resolveBodyLayout({
-    height,
+    height: contentHeight,
     headerHeight,
     summaryRowHeight,
     hasSummary,
@@ -20670,7 +20700,7 @@ function buildListTableRenderSnapshot(params) {
       }
     },
     bodyLayout: resolveBodyLayout({
-      height,
+      height: contentHeight,
       headerHeight,
       summaryRowHeight,
       hasSummary,
@@ -20692,7 +20722,7 @@ function buildListTableRenderSnapshot(params) {
     visibleRows: filteredVisibleRows,
     frozenState: frozenRows,
     getRowKey: (row) => row.kind === "data" ? row.rowKey : null,
-    height,
+    height: contentHeight,
     headerHeight,
     summaryRowHeight,
     hasSummary,
@@ -20705,7 +20735,7 @@ function buildListTableRenderSnapshot(params) {
     bodyState.frozenRows.scroll.rowIndexMap = plainRowWindow.rowIndexMap;
     bodyState.frozenRows.scroll.rowOffsetMap = plainRowWindow.rowOffsetMap;
     bodyState.bodyLayout = resolveBodyLayout({
-      height,
+      height: contentHeight,
       headerHeight,
       summaryRowHeight,
       hasSummary,
@@ -20729,7 +20759,7 @@ function buildListTableRenderSnapshot(params) {
     bodyState.frozenRows.scroll.rowIndexMap = plainRowWindow.rowIndexMap;
     bodyState.frozenRows.scroll.rowOffsetMap = plainRowWindow.rowOffsetMap;
     bodyState.bodyLayout = resolveBodyLayout({
-      height,
+      height: contentHeight,
       headerHeight,
       summaryRowHeight,
       hasSummary,
@@ -20740,10 +20770,6 @@ function buildListTableRenderSnapshot(params) {
       scrollRowCount: plainRowWindow.totalRowCount
     });
   }
-  let columnMetrics = resolveColumnMetrics({
-    columns: leafColumns,
-    tableWidth: width
-  });
   let viewportResult = computeViewport({
     width,
     height,