tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-11-01 01:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add fix to avoid exception on Rows with no children

Browse Source
This commit is contained in:
Jeppe Roi Kristensen
2023-06-12 21:03:13 +02:00
committed by Patrik Svensson
parent d484e832f5
commit e0ded712e8
4 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Spectre.Console/Widgets/Rows.cs
View File

@@ -37,10 +37,15 @@ public sealed class Rows : Renderable, IExpandable
}
else
{
var measurements = _children.Select(c => c.Measure(options, maxWidth));
return new Measurement(
measurements.Min(c => c.Min),
measurements.Min(c => c.Max));
var measurements = _children.Select(c => c.Measure(options, maxWidth)).ToArray();
if (measurements.Length > 0)
{
return new Measurement(
measurements.Min(c => c.Min),
measurements.Min(c => c.Max));
}
return new Measurement(0, 0);
}
}

6
test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Empty.Output.verified.txt Normal file
View File

@@ -0,0 +1,6 @@
┌─────────────┬─────┐
│ Foo │ Bar │
├─────────────┼─────┤
│ HELLO WORLD │ │
│ │ Qux │
└─────────────┴─────┘

3
test/Spectre.Console.Tests/Spectre.Console.Tests.csproj
View File

@@ -12,6 +12,9 @@
<EmbeddedResource Include="Data\starwars.flf" />
<None Remove="Data\poison.flf" />
<EmbeddedResource Include="Data\poison.flf" />
<None Update="Expectations\Widgets\Rows\Render_Empty.Output.verified.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>

19
test/Spectre.Console.Tests/Unit/Widgets/RowsTests.cs
View File

@@ -50,6 +50,25 @@ public sealed class RowsTests
return Verifier.Verify(console.Output);
}
[Fact]
[Expectation("Render_Empty")]
public Task Should_Not_Throw_Exception_On_Empty_Rows()
{
// Given
var console = new TestConsole().Width(60);
var table = new Table()
.AddColumns("Foo", "Bar")
.AddRow("HELLO WORLD")
.AddRow(
new Rows(), new Text("Qux"));
// When
console.Write(table);
// Then
return Verifier.Verify(console.Output);
}
[Fact]
[Expectation("Render_Expanded_And_Nested")]
public Task Should_Render_Rows_Correctly_Inside_Other_Widget_When_Expanded()