@canvas-components/list-table 0.3.1 → 0.3.2

package/dist/index.d.cts

@@ -378,7 +378,9 @@ type ListTableSparklineSize = "small" | "medium" | number | [number, number] | {
 type ListTableChartType = "sparkline" | (string & {});
 type ListTableChartSize = ListTableSparklineSize;
 type ListTableRateSize = "small" | "medium" | "large" | number;
-type ListTableSymbolType = "star" | "sun" | "moon";
+type ListTableRateSymbolType = "star" | "sun" | "moon";
+/** 单元格内置图标名称。 */
+type ListTableSymbolType = ListTableRateSymbolType | "check" | "close";
 type ListTableButtonType = "primary" | "default" | "dashed" | "text" | "link";
 type ListTableButtonSize = "small" | "middle" | "medium" | "large";
 /**
@@ -582,7 +584,7 @@ interface ListTableRateCellContent<RecordType = any> extends ListTableBaseCellCo
     count?: number;
     allowHalf?: boolean;
     /** 评分图形，默认星星。 */
-    shape?: ListTableSymbolType;
+    shape?: ListTableRateSymbolType;
     size?: ListTableRateSize;
     color?: string;
     backgroundColor?: string;
@@ -1870,4 +1872,4 @@ interface ListTableValidationTarget {
     columnKey: string;
 }
 
-export { type CreateCellEditorSessionParams, type DebugHitTestResult, type FilterPanelConfig, type FilterPanelOptionItem, type FilterPanelTexts, type FixedPopupConfig, type HeaderContextMenuColumnItem, type HeaderContextMenuConfig, type HeaderContextMenuDensity, ListTable, type ListTableAutoMergeRule, type ListTableBarcodeCellContent, type ListTableBarcodeFormat, type ListTableButtonCellContent, type ListTableButtonPopconfirmOptions, type ListTableButtonSize, type ListTableButtonType, type ListTableCarouselScrollOptions, type ListTableCellContent, type ListTableCellContentClickContext, type ListTableCellEditorSession, type ListTableCellSpan, type ListTableCellStyle, type ListTableChartCellContent, type ListTableChartSize, type ListTableChartType, type ListTableColorCellContent, type ListTableColumn, type ListTableContextMenuFeature, type ListTableContextMenuOptions, type ListTableCustomChartCellContent, type ListTableDangerConfirmRequest, type ListTableDataFormat, type ListTableDataFormatOptions, type ListTableDataFormatType, type ListTableDebugOptions, type ListTableDebugSnapshot, type ListTableDensity, type ListTableEditAutoCompleteEnter, type ListTableEditFilterOption, type ListTableEditOption, type ListTableEditValueType, type ListTableEditable, type ListTableEditorAutoCompleteEnter, type ListTableEditorConfig, type ListTableEditorFactory, type ListTableEditorFilterOption, type ListTableEditorNavigateDirection, type ListTableEditorOption, type ListTableEditorRect, type ListTableEditorRequest, type ListTableEditorTheme, type ListTableEditorValueType, type ListTableExportXlsxOptions, type ListTableFilterCondition$1 as ListTableFilterCondition, type ListTableFilterConditionOperator, type ListTableFilterConditionRelation, type ListTableFilterMatchMode, type ListTableFilterOption, type ListTableFilterOptionValue, type ListTableFilterPanelAdapter, type ListTableFilterState, type ListTableFilterType, type ListTableFilterValue$1 as ListTableFilterValue, type ListTableFixedPopupAdapter, type ListTableFormItemProps, type ListTableFormItemPropsConfig, type ListTableFormRule, type ListTableFormRules, type ListTableGroupingOptions, type ListTableHeaderContextMenuAdapter, type ListTableHighlightMode, type ListTableHorizontalAlign, type ListTableIconCellContent, type ListTableImageCellContent, type ListTableImageObjectFit, type ListTableImagePreviewRequest, type ListTableLoadingAdapter, type ListTableLoadingRequest, type ListTableMergeCellOptions, type ListTableNestedTableCellContent, type ListTableNestedTableColumn, type ListTableOptions, type ListTablePaginationAdapter, type ListTablePaginationOptions, type ListTablePerformanceMetric, type ListTableProgressCellContent, type ListTableProgressShape, type ListTableProgressSize, type ListTableQrCodeCellContent, type ListTableQrCodeLevel, type ListTableQueryChange, type ListTableQueryChangeExtra, type ListTableQueryFilters, type ListTableQueryOptions, type ListTableQueryPagination, type ListTableQuerySorter, type ListTableRateCellContent, type ListTableRateSize, type ListTableRowDragMode, type ListTableRowDragOptions, type ListTableRowDragPayload, type ListTableRowDragSourceInfo, type ListTableRowDragZone, type ListTableRowEventProps, type ListTableRowSelectionChangeInfo, type ListTableRowSelectionOptions, type ListTableRowSelectorOptions, type ListTableScrollToOptions, type ListTableScrollbarOptions, type ListTableSearchRequest, type ListTableSelectionState, type ListTableSortItem, type ListTableSortState, type ListTableSparklineChartCellContent, type ListTableSparklineSize, type ListTableSummaryConfig, type ListTableSummaryRoundingMode, type ListTableSummaryType, type ListTableSymbolType, type ListTableTagCellContent, type ListTableTheme, type ListTableTooltipAdapter, type ListTableTooltipRequest, type ListTableUiOptions, type ListTableValidationError, type ListTableValidationErrorField, type ListTableValidationFailure, type ListTableValidationTarget, type PaginationConfig, type RenderCellDescriptor };
+export { type CreateCellEditorSessionParams, type DebugHitTestResult, type FilterPanelConfig, type FilterPanelOptionItem, type FilterPanelTexts, type FixedPopupConfig, type HeaderContextMenuColumnItem, type HeaderContextMenuConfig, type HeaderContextMenuDensity, ListTable, type ListTableAutoMergeRule, type ListTableBarcodeCellContent, type ListTableBarcodeFormat, type ListTableButtonCellContent, type ListTableButtonPopconfirmOptions, type ListTableButtonSize, type ListTableButtonType, type ListTableCarouselScrollOptions, type ListTableCellContent, type ListTableCellContentClickContext, type ListTableCellEditorSession, type ListTableCellSpan, type ListTableCellStyle, type ListTableChartCellContent, type ListTableChartSize, type ListTableChartType, type ListTableColorCellContent, type ListTableColumn, type ListTableContextMenuFeature, type ListTableContextMenuOptions, type ListTableCustomChartCellContent, type ListTableDangerConfirmRequest, type ListTableDataFormat, type ListTableDataFormatOptions, type ListTableDataFormatType, type ListTableDebugOptions, type ListTableDebugSnapshot, type ListTableDensity, type ListTableEditAutoCompleteEnter, type ListTableEditFilterOption, type ListTableEditOption, type ListTableEditValueType, type ListTableEditable, type ListTableEditorAutoCompleteEnter, type ListTableEditorConfig, type ListTableEditorFactory, type ListTableEditorFilterOption, type ListTableEditorNavigateDirection, type ListTableEditorOption, type ListTableEditorRect, type ListTableEditorRequest, type ListTableEditorTheme, type ListTableEditorValueType, type ListTableExportXlsxOptions, type ListTableFilterCondition$1 as ListTableFilterCondition, type ListTableFilterConditionOperator, type ListTableFilterConditionRelation, type ListTableFilterMatchMode, type ListTableFilterOption, type ListTableFilterOptionValue, type ListTableFilterPanelAdapter, type ListTableFilterState, type ListTableFilterType, type ListTableFilterValue$1 as ListTableFilterValue, type ListTableFixedPopupAdapter, type ListTableFormItemProps, type ListTableFormItemPropsConfig, type ListTableFormRule, type ListTableFormRules, type ListTableGroupingOptions, type ListTableHeaderContextMenuAdapter, type ListTableHighlightMode, type ListTableHorizontalAlign, type ListTableIconCellContent, type ListTableImageCellContent, type ListTableImageObjectFit, type ListTableImagePreviewRequest, type ListTableLoadingAdapter, type ListTableLoadingRequest, type ListTableMergeCellOptions, type ListTableNestedTableCellContent, type ListTableNestedTableColumn, type ListTableOptions, type ListTablePaginationAdapter, type ListTablePaginationOptions, type ListTablePerformanceMetric, type ListTableProgressCellContent, type ListTableProgressShape, type ListTableProgressSize, type ListTableQrCodeCellContent, type ListTableQrCodeLevel, type ListTableQueryChange, type ListTableQueryChangeExtra, type ListTableQueryFilters, type ListTableQueryOptions, type ListTableQueryPagination, type ListTableQuerySorter, type ListTableRateCellContent, type ListTableRateSize, type ListTableRateSymbolType, type ListTableRowDragMode, type ListTableRowDragOptions, type ListTableRowDragPayload, type ListTableRowDragSourceInfo, type ListTableRowDragZone, type ListTableRowEventProps, type ListTableRowSelectionChangeInfo, type ListTableRowSelectionOptions, type ListTableRowSelectorOptions, type ListTableScrollToOptions, type ListTableScrollbarOptions, type ListTableSearchRequest, type ListTableSelectionState, type ListTableSortItem, type ListTableSortState, type ListTableSparklineChartCellContent, type ListTableSparklineSize, type ListTableSummaryConfig, type ListTableSummaryRoundingMode, type ListTableSummaryType, type ListTableSymbolType, type ListTableTagCellContent, type ListTableTheme, type ListTableTooltipAdapter, type ListTableTooltipRequest, type ListTableUiOptions, type ListTableValidationError, type ListTableValidationErrorField, type ListTableValidationFailure, type ListTableValidationTarget, type PaginationConfig, type RenderCellDescriptor };

package/dist/index.d.ts

@@ -378,7 +378,9 @@ type ListTableSparklineSize = "small" | "medium" | number | [number, number] | {
 type ListTableChartType = "sparkline" | (string & {});
 type ListTableChartSize = ListTableSparklineSize;
 type ListTableRateSize = "small" | "medium" | "large" | number;
-type ListTableSymbolType = "star" | "sun" | "moon";
+type ListTableRateSymbolType = "star" | "sun" | "moon";
+/** 单元格内置图标名称。 */
+type ListTableSymbolType = ListTableRateSymbolType | "check" | "close";
 type ListTableButtonType = "primary" | "default" | "dashed" | "text" | "link";
 type ListTableButtonSize = "small" | "middle" | "medium" | "large";
 /**
@@ -582,7 +584,7 @@ interface ListTableRateCellContent<RecordType = any> extends ListTableBaseCellCo
     count?: number;
     allowHalf?: boolean;
     /** 评分图形，默认星星。 */
-    shape?: ListTableSymbolType;
+    shape?: ListTableRateSymbolType;
     size?: ListTableRateSize;
     color?: string;
     backgroundColor?: string;
@@ -1870,4 +1872,4 @@ interface ListTableValidationTarget {
     columnKey: string;
 }
 
-export { type CreateCellEditorSessionParams, type DebugHitTestResult, type FilterPanelConfig, type FilterPanelOptionItem, type FilterPanelTexts, type FixedPopupConfig, type HeaderContextMenuColumnItem, type HeaderContextMenuConfig, type HeaderContextMenuDensity, ListTable, type ListTableAutoMergeRule, type ListTableBarcodeCellContent, type ListTableBarcodeFormat, type ListTableButtonCellContent, type ListTableButtonPopconfirmOptions, type ListTableButtonSize, type ListTableButtonType, type ListTableCarouselScrollOptions, type ListTableCellContent, type ListTableCellContentClickContext, type ListTableCellEditorSession, type ListTableCellSpan, type ListTableCellStyle, type ListTableChartCellContent, type ListTableChartSize, type ListTableChartType, type ListTableColorCellContent, type ListTableColumn, type ListTableContextMenuFeature, type ListTableContextMenuOptions, type ListTableCustomChartCellContent, type ListTableDangerConfirmRequest, type ListTableDataFormat, type ListTableDataFormatOptions, type ListTableDataFormatType, type ListTableDebugOptions, type ListTableDebugSnapshot, type ListTableDensity, type ListTableEditAutoCompleteEnter, type ListTableEditFilterOption, type ListTableEditOption, type ListTableEditValueType, type ListTableEditable, type ListTableEditorAutoCompleteEnter, type ListTableEditorConfig, type ListTableEditorFactory, type ListTableEditorFilterOption, type ListTableEditorNavigateDirection, type ListTableEditorOption, type ListTableEditorRect, type ListTableEditorRequest, type ListTableEditorTheme, type ListTableEditorValueType, type ListTableExportXlsxOptions, type ListTableFilterCondition$1 as ListTableFilterCondition, type ListTableFilterConditionOperator, type ListTableFilterConditionRelation, type ListTableFilterMatchMode, type ListTableFilterOption, type ListTableFilterOptionValue, type ListTableFilterPanelAdapter, type ListTableFilterState, type ListTableFilterType, type ListTableFilterValue$1 as ListTableFilterValue, type ListTableFixedPopupAdapter, type ListTableFormItemProps, type ListTableFormItemPropsConfig, type ListTableFormRule, type ListTableFormRules, type ListTableGroupingOptions, type ListTableHeaderContextMenuAdapter, type ListTableHighlightMode, type ListTableHorizontalAlign, type ListTableIconCellContent, type ListTableImageCellContent, type ListTableImageObjectFit, type ListTableImagePreviewRequest, type ListTableLoadingAdapter, type ListTableLoadingRequest, type ListTableMergeCellOptions, type ListTableNestedTableCellContent, type ListTableNestedTableColumn, type ListTableOptions, type ListTablePaginationAdapter, type ListTablePaginationOptions, type ListTablePerformanceMetric, type ListTableProgressCellContent, type ListTableProgressShape, type ListTableProgressSize, type ListTableQrCodeCellContent, type ListTableQrCodeLevel, type ListTableQueryChange, type ListTableQueryChangeExtra, type ListTableQueryFilters, type ListTableQueryOptions, type ListTableQueryPagination, type ListTableQuerySorter, type ListTableRateCellContent, type ListTableRateSize, type ListTableRowDragMode, type ListTableRowDragOptions, type ListTableRowDragPayload, type ListTableRowDragSourceInfo, type ListTableRowDragZone, type ListTableRowEventProps, type ListTableRowSelectionChangeInfo, type ListTableRowSelectionOptions, type ListTableRowSelectorOptions, type ListTableScrollToOptions, type ListTableScrollbarOptions, type ListTableSearchRequest, type ListTableSelectionState, type ListTableSortItem, type ListTableSortState, type ListTableSparklineChartCellContent, type ListTableSparklineSize, type ListTableSummaryConfig, type ListTableSummaryRoundingMode, type ListTableSummaryType, type ListTableSymbolType, type ListTableTagCellContent, type ListTableTheme, type ListTableTooltipAdapter, type ListTableTooltipRequest, type ListTableUiOptions, type ListTableValidationError, type ListTableValidationErrorField, type ListTableValidationFailure, type ListTableValidationTarget, type PaginationConfig, type RenderCellDescriptor };
+export { type CreateCellEditorSessionParams, type DebugHitTestResult, type FilterPanelConfig, type FilterPanelOptionItem, type FilterPanelTexts, type FixedPopupConfig, type HeaderContextMenuColumnItem, type HeaderContextMenuConfig, type HeaderContextMenuDensity, ListTable, type ListTableAutoMergeRule, type ListTableBarcodeCellContent, type ListTableBarcodeFormat, type ListTableButtonCellContent, type ListTableButtonPopconfirmOptions, type ListTableButtonSize, type ListTableButtonType, type ListTableCarouselScrollOptions, type ListTableCellContent, type ListTableCellContentClickContext, type ListTableCellEditorSession, type ListTableCellSpan, type ListTableCellStyle, type ListTableChartCellContent, type ListTableChartSize, type ListTableChartType, type ListTableColorCellContent, type ListTableColumn, type ListTableContextMenuFeature, type ListTableContextMenuOptions, type ListTableCustomChartCellContent, type ListTableDangerConfirmRequest, type ListTableDataFormat, type ListTableDataFormatOptions, type ListTableDataFormatType, type ListTableDebugOptions, type ListTableDebugSnapshot, type ListTableDensity, type ListTableEditAutoCompleteEnter, type ListTableEditFilterOption, type ListTableEditOption, type ListTableEditValueType, type ListTableEditable, type ListTableEditorAutoCompleteEnter, type ListTableEditorConfig, type ListTableEditorFactory, type ListTableEditorFilterOption, type ListTableEditorNavigateDirection, type ListTableEditorOption, type ListTableEditorRect, type ListTableEditorRequest, type ListTableEditorTheme, type ListTableEditorValueType, type ListTableExportXlsxOptions, type ListTableFilterCondition$1 as ListTableFilterCondition, type ListTableFilterConditionOperator, type ListTableFilterConditionRelation, type ListTableFilterMatchMode, type ListTableFilterOption, type ListTableFilterOptionValue, type ListTableFilterPanelAdapter, type ListTableFilterState, type ListTableFilterType, type ListTableFilterValue$1 as ListTableFilterValue, type ListTableFixedPopupAdapter, type ListTableFormItemProps, type ListTableFormItemPropsConfig, type ListTableFormRule, type ListTableFormRules, type ListTableGroupingOptions, type ListTableHeaderContextMenuAdapter, type ListTableHighlightMode, type ListTableHorizontalAlign, type ListTableIconCellContent, type ListTableImageCellContent, type ListTableImageObjectFit, type ListTableImagePreviewRequest, type ListTableLoadingAdapter, type ListTableLoadingRequest, type ListTableMergeCellOptions, type ListTableNestedTableCellContent, type ListTableNestedTableColumn, type ListTableOptions, type ListTablePaginationAdapter, type ListTablePaginationOptions, type ListTablePerformanceMetric, type ListTableProgressCellContent, type ListTableProgressShape, type ListTableProgressSize, type ListTableQrCodeCellContent, type ListTableQrCodeLevel, type ListTableQueryChange, type ListTableQueryChangeExtra, type ListTableQueryFilters, type ListTableQueryOptions, type ListTableQueryPagination, type ListTableQuerySorter, type ListTableRateCellContent, type ListTableRateSize, type ListTableRateSymbolType, type ListTableRowDragMode, type ListTableRowDragOptions, type ListTableRowDragPayload, type ListTableRowDragSourceInfo, type ListTableRowDragZone, type ListTableRowEventProps, type ListTableRowSelectionChangeInfo, type ListTableRowSelectionOptions, type ListTableRowSelectorOptions, type ListTableScrollToOptions, type ListTableScrollbarOptions, type ListTableSearchRequest, type ListTableSelectionState, type ListTableSortItem, type ListTableSortState, type ListTableSparklineChartCellContent, type ListTableSparklineSize, type ListTableSummaryConfig, type ListTableSummaryRoundingMode, type ListTableSummaryType, type ListTableSymbolType, type ListTableTagCellContent, type ListTableTheme, type ListTableTooltipAdapter, type ListTableTooltipRequest, type ListTableUiOptions, type ListTableValidationError, type ListTableValidationErrorField, type ListTableValidationFailure, type ListTableValidationTarget, type PaginationConfig, type RenderCellDescriptor };

package/dist/index.js

@@ -3926,11 +3926,25 @@ function drawImagePlaceholder(ctx, x, y, width, height, backgroundColor = PLACEH
 var SYMBOL_COLOR_MAP = {
   star: "#fadb14",
   sun: "#faad14",
-  moon: "#597ef7"
+  moon: "#597ef7",
+  check: "#52c41a",
+  close: "#ff4d4f"
 };
 function drawCellSymbol(ctx, params) {
   const { type, x, y, size, activeColor, inactiveColor } = params;
   const fillRatio = Math.min(Math.max(params.fillRatio, 0), 1);
+  if (type === "check" || type === "close") {
+    drawStatusSymbol(ctx, {
+      type,
+      x,
+      y,
+      size,
+      activeColor,
+      inactiveColor,
+      fillRatio
+    });
+    return;
+  }
   appendCellSymbolPath(ctx, type, x, y, size);
   ctx.fillStyle = inactiveColor;
   ctx.fill("evenodd");
@@ -3948,6 +3962,10 @@ function resolveCellSymbolColor(type) {
   return SYMBOL_COLOR_MAP[type];
 }
 function appendCellSymbolPath(ctx, type, x, y, size) {
+  if (type === "check" || type === "close") {
+    appendStatusSymbolPath(ctx, type, x, y, size);
+    return;
+  }
   if (type === "moon") {
     appendMoonPath(ctx, x, y, size);
     return;
@@ -3968,6 +3986,38 @@ function appendCellSymbolPath(ctx, type, x, y, size) {
   }
   ctx.closePath();
 }
+function drawStatusSymbol(ctx, params) {
+  const { type, x, y, size, activeColor, inactiveColor, fillRatio } = params;
+  ctx.save();
+  ctx.lineCap = "round";
+  ctx.lineJoin = "round";
+  ctx.lineWidth = Math.max(size * 0.12, 1.5);
+  appendStatusSymbolPath(ctx, type, x, y, size);
+  ctx.strokeStyle = inactiveColor;
+  ctx.stroke();
+  if (fillRatio > 0) {
+    ctx.beginPath();
+    ctx.rect(x, y, size * fillRatio, size);
+    ctx.clip();
+    appendStatusSymbolPath(ctx, type, x, y, size);
+    ctx.strokeStyle = activeColor;
+    ctx.stroke();
+  }
+  ctx.restore();
+}
+function appendStatusSymbolPath(ctx, type, x, y, size) {
+  ctx.beginPath();
+  if (type === "check") {
+    ctx.moveTo(x + size * 0.16, y + size * 0.52);
+    ctx.lineTo(x + size * 0.4, y + size * 0.76);
+    ctx.lineTo(x + size * 0.84, y + size * 0.26);
+    return;
+  }
+  ctx.moveTo(x + size * 0.22, y + size * 0.22);
+  ctx.lineTo(x + size * 0.78, y + size * 0.78);
+  ctx.moveTo(x + size * 0.78, y + size * 0.22);
+  ctx.lineTo(x + size * 0.22, y + size * 0.78);
+}
 function appendMoonPath(ctx, x, y, size) {
   ctx.beginPath();
   ctx.moveTo(x + size * 0.64, y + size * 0.04);
@@ -6237,6 +6287,7 @@ function resolveColumnFormItemProps(column, context) {
 // src/rendering/cell-content/cell-content-renderer.ts
 var CONTENT_HORIZONTAL_PADDING = 12;
 var CONTENT_GAP = 8;
+var LINK_CONTENT_GAP = 4;
 var CONTENT_VERTICAL_PADDING = 6;
 function resolveBodyCellContents(params) {
   return resolveRawBodyCellContents(params).filter(
@@ -6671,8 +6722,8 @@ function drawBodyCellContents(params) {
       align: column.align
     });
     line.items.forEach((item, itemIndex) => {
-      if (itemIndex > 0 && item.gapBefore) {
-        cursorX += CONTENT_GAP;
+      if (itemIndex > 0) {
+        cursorX += item.gapBefore;
       }
       const itemDescriptors = [];
       drawExpandedBodyContent({
@@ -6767,7 +6818,7 @@ function measureBodyCellContentsWidth(params) {
       currentLineWidth = 0;
       return;
     }
-    const gapWidth = currentLineWidth > 0 && item.gapBefore ? CONTENT_GAP : 0;
+    const gapWidth = currentLineWidth > 0 ? item.gapBefore : 0;
     currentLineWidth += gapWidth + contentWidth;
   });
   return Math.ceil(
@@ -6798,10 +6849,11 @@ function expandBodyContents(contents) {
   const textOnly = contents.every((content) => content.type === "text");
   const expanded = [];
   contents.forEach((content, contentIndex) => {
+    const previousContent = contents[contentIndex - 1];
     expanded.push({
       content,
       contentIndex,
-      gapBefore: expanded.length > 0 && !textOnly
+      gapBefore: expanded.length === 0 || textOnly ? 0 : previousContent?.type === "link" && content.type === "link" ? LINK_CONTENT_GAP : CONTENT_GAP
     });
     if ((content.type === "checkbox" || content.type === "radio") && content.label) {
       const textLabelContent = {
@@ -6814,7 +6866,7 @@ function expandBodyContents(contents) {
       expanded.push({
         content: textLabelContent,
         contentIndex,
-        gapBefore: true
+        gapBefore: CONTENT_GAP
       });
     }
   });
@@ -6855,7 +6907,7 @@ function buildSingleLineLayout(ctx, contents, availableWidth, theme) {
       }
       break;
     }
-    const gapWidth = line.items.length > 0 && item.gapBefore ? CONTENT_GAP : 0;
+    const gapWidth = line.items.length > 0 ? item.gapBefore : 0;
     const remainingWidth = availableWidth - line.width - gapWidth;
     if (remainingWidth <= 0) {
       truncated = true;
@@ -6923,7 +6975,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
             items: [
               {
                 ...currentItem,
-                gapBefore: false,
+                gapBefore: 0,
                 width: fullWidth2
               }
             ],
@@ -6954,7 +7006,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
             {
               ...currentItem,
               content: fittedContent2,
-              gapBefore: false,
+              gapBefore: 0,
               width: fittedWidth
             }
           ],
@@ -6976,11 +7028,11 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
         currentItem = {
           ...currentItem,
           content: setBreakableContentText(currentItem.content, remainingText2),
-          gapBefore: false
+          gapBefore: 0
         };
         continue;
       }
-      const gapWidth = currentLine.items.length > 0 && currentItem.gapBefore ? CONTENT_GAP : 0;
+      const gapWidth = currentLine.items.length > 0 ? currentItem.gapBefore : 0;
       const remainingWidth = availableWidth - currentLine.width - gapWidth;
       if (remainingWidth <= 0) {
         if (lines.length + 1 >= maxLines) {
@@ -6994,7 +7046,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
         currentLine = { items: [], width: 0 };
         currentItem = {
           ...currentItem,
-          gapBefore: false
+          gapBefore: 0
         };
         continue;
       }
@@ -7014,7 +7066,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
           currentLine = { items: [], width: 0 };
           currentItem = {
             ...currentItem,
-            gapBefore: false
+            gapBefore: 0
           };
           continue;
         }
@@ -7054,7 +7106,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
         currentLine = { items: [], width: 0 };
         currentItem = {
           ...currentItem,
-          gapBefore: false
+          gapBefore: 0
         };
         continue;
       }
@@ -7082,7 +7134,7 @@ function buildWrappedLineLayout(ctx, contents, availableWidth, maxLines, theme)
       currentItem = {
         ...currentItem,
         content: setBreakableContentText(currentItem.content, remainingText),
-        gapBefore: false
+        gapBefore: 0
       };
     }
     if (truncated) {
@@ -7595,10 +7647,10 @@ function applyTrailingEllipsis(ctx, line, theme, availableWidth) {
       continue;
     }
     const widthBefore = line.items.slice(0, index).reduce((sum, current, currentIndex) => {
-      const gapWidth2 = currentIndex > 0 && current.gapBefore ? CONTENT_GAP : 0;
+      const gapWidth2 = currentIndex > 0 ? current.gapBefore : 0;
       return sum + gapWidth2 + current.width;
     }, 0);
-    const gapWidth = index > 0 && item.gapBefore ? CONTENT_GAP : 0;
+    const gapWidth = index > 0 ? item.gapBefore : 0;
     const nextContent = truncateExpandedContent(
       ctx,
       item.content,
@@ -20125,7 +20177,7 @@ function buildListTableRenderSnapshot(params) {
     options.scrollbar?.thickness ?? DEFAULT_SCROLLBAR_THICKNESS,
     6
   );
-  let width = hostWidth;
+  let width = Math.max(hostWidth - scrollbarThickness, 0);
   let height = hostHeight;
   const sourceNormalizedColumns = normalizeColumns(
     getResolvedColumns(options, selectedRowKeys)
@@ -20400,54 +20452,6 @@ function buildListTableRenderSnapshot(params) {
     fixedWidthRight: columnMetrics.fixedWidthRight,
     scroll
   });
-  for (let index = 0; index < 2 && scrollbarThickness > 0; index += 1) {
-    const nextWidth = Math.max(
-      hostWidth - (viewportResult.viewport.maxScrollTop > 0 ? scrollbarThickness : 0),
-      0
-    );
-    const nextHeight = Math.max(
-      hostHeight - (viewportResult.viewport.maxScrollLeft > 0 ? scrollbarThickness : 0),
-      0
-    );
-    if (nextWidth === width && nextHeight === height) {
-      break;
-    }
-    width = nextWidth;
-    height = nextHeight;
-    bodyState = resolveCurrentBodyState();
-    if (plainRowWindow) {
-      bodyState.frozenRows.scroll.windowed = true;
-      bodyState.frozenRows.scroll.dataRowIndexAligned = true;
-      bodyState.frozenRows.scroll.rowIndexMap = plainRowWindow.rowIndexMap;
-      bodyState.frozenRows.scroll.rowOffsetMap = plainRowWindow.rowOffsetMap;
-      bodyState.bodyLayout = resolveBodyLayout({
-        height,
-        headerHeight,
-        summaryRowHeight,
-        hasSummary,
-        rowHeight,
-        totalBodyHeight: plainRowWindow.totalBodyHeight,
-        topFrozenRowCount: 0,
-        bottomFrozenRowCount: 0,
-        scrollRowCount: plainRowWindow.totalRowCount
-      });
-    }
-    columnMetrics = resolveColumnMetrics({
-      columns: leafColumns,
-      tableWidth: width
-    });
-    viewportResult = computeViewport({
-      width,
-      height,
-      headerHeight,
-      bodyHeight: bodyState.bodyLayout.scrollBodyHeight,
-      totalWidth: columnMetrics.totalWidth,
-      totalBodyHeight: bodyState.bodyLayout.totalBodyHeight,
-      fixedWidthLeft: columnMetrics.fixedWidthLeft,
-      fixedWidthRight: columnMetrics.fixedWidthRight,
-      scroll
-    });
-  }
   scrollPageSize = resolveScrollPageSize({
     options,
     pageSize: query.pagination.pageSize,