Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/Spectre.Console.Tests/Unit/Widgets/Table/TableTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,32 @@ public Task Should_Expand_Table_To_Available_Space_If_Specified()
return Verifier.Verify(console.Output);
}

[Fact]
public void Should_Not_Expand_Fixed_Width_Columns()
{
// Given
var console = new TestConsole().Width(40);
var table = new Table()
.Expand()
.HideHeaders()
.HideFooters();

table.AddColumn(new TableColumn("Time").Width(12));
table.AddColumn("Message");
table.AddRow("12:00", "Hello");

// When
console.Write(table);

// Then
var line = console.Lines.Single(l => l.Contains("12:00"));
var firstSeparator = line.IndexOf('│');
var secondSeparator = line.IndexOf('│', firstSeparator + 1);

var firstColumnWidth = secondSeparator - firstSeparator - 1;
firstColumnWidth.ShouldBe(14);
}

[Fact]
[Expectation("Render_Multiline")]
public Task Should_Render_Table_With_Multiple_Rows_In_Cell_Correctly()
Expand Down
9 changes: 7 additions & 2 deletions src/Spectre.Console/Widgets/Table/TableMeasurer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,13 @@ public List<int> CalculateColumnWidths(int maxWidth)

if (tableWidth < maxWidth && Expand)
{
var padWidths = Ratio.Distribute(maxWidth - tableWidth, widths);
widths = widths.Zip(padWidths, (a, b) => (a, b)).Select(f => f.a + f.b).ToList();
var flexibleColumns = Columns.Select(column => column.Width == null).ToList();
if (flexibleColumns.Any(isFlexible => isFlexible))
{
var ratios = widths.Select((width, index) => flexibleColumns[index] ? Math.Max(width, 1) : 0).ToList();
var padWidths = Ratio.Distribute(maxWidth - tableWidth, ratios);
widths = widths.Zip(padWidths, (a, b) => (a, b)).Select(f => f.a + f.b).ToList();
}
}

return widths;
Expand Down