Feat/barchart updates

docs/input/widgets/barchart.md

@@ -80,3 +80,13 @@ AnsiConsole.Write(new BarChart()
  .AddItem(new Fruit("Mango", 3))
  .AddItems(items));
 ```
+
+### Addd items with bar and label style
+
+```csharp
+AnsiConsole.Write(new BarChart()
+ .Width(60)
+ .Label("[green bold underline]Number of fruits[/]")
+ .CenterLabel()
+ .AddItem("Apple", 12, Color.Red, Color.Red);
+```

src/Spectre.Console/Extensions/BarChartExtensions.cs

@@ -12,15 +12,16 @@ public static class BarChartExtensions
  /// <param name="label">The item label.</param>
  /// <param name="value">The item value.</param>
  /// <param name="color">The item color.</param>
+ /// <param name="labelStyle">The label style.</param>
  /// <returns>The same instance so that multiple calls can be chained.</returns>
- public static BarChart AddItem(this BarChart chart, string label, double value, Color? color = null)
+ public static BarChart AddItem(this BarChart chart, string label, double value, Color? color = null, Style? labelStyle = null)
  {
  if (chart is null)
  {
  throw new ArgumentNullException(nameof(chart));
  }
 
- chart.Data.Add(new BarChartItem(label, value, color));
+ chart.Data.Add(new BarChartItem(label, value, color, labelStyle));
  return chart;
  }
 
@@ -49,7 +50,7 @@ public static BarChart AddItem<T>(this BarChart chart, T item)
  new BarChartItem(
  item.Label,
  item.Value,
- item.Color));
+ item.Color, item.LabelStyle));
  }
 
  return chart;

src/Spectre.Console/Widgets/Charts/BarChart.cs

@@ -83,7 +83,7 @@ protected override IEnumerable<Segment> Render(RenderOptions options, int maxWid
  foreach (var item in Data)
  {
  grid.AddRow(
- new Markup(item.Label),
+ item.LabelStyle != null ? new Text(item.Label, item.LabelStyle) : new Markup(item.Label),
  new ProgressBar()
  {
  Value = item.Value,

src/Spectre.Console/Widgets/Charts/BarChartItem.cs

@@ -20,16 +20,23 @@ public sealed class BarChartItem : IBarChartItem
  /// </summary>
  public Color? Color { get; }
 
+ /// <summary>
+ /// Gets color of the label associated with the bar.
+ /// </summary>
+ public Style? LabelStyle { get; }
+
  /// <summary>
  /// Initializes a new instance of the <see cref="BarChartItem"/> class.
  /// </summary>
  /// <param name="label">The item label.</param>
  /// <param name="value">The item value.</param>
  /// <param name="color">The item color.</param>
- public BarChartItem(string label, double value, Color? color = null)
+ /// <param name="labelStyle">The label color.</param>
+ public BarChartItem(string label, double value, Color? color = null, Style? labelStyle = null)
  {
  Label = label ?? throw new ArgumentNullException(nameof(label));
  Value = value;
  Color = color;
+ LabelStyle = labelStyle;
  }
 }

src/Spectre.Console/Widgets/Charts/IBarChartItem.cs

@@ -19,4 +19,9 @@ public interface IBarChartItem
  /// Gets the item color.
  /// </summary>
  Color? Color { get; }
+
+ /// <summary>
+ /// Gets the label color.
+ /// </summary>
+ Style? LabelStyle { get; }
 }

src/Spectre.Console/Widgets/ProgressBar.cs

@@ -21,6 +21,7 @@
  public Style FinishedStyle { get; set; } = Color.Green;
  public Style RemainingStyle { get; set; } = Color.Grey;
  public Style IndeterminateStyle { get; set; } = DefaultPulseStyle;
+ public Func<double, CultureInfo, string>? ValueFormatter { get; set; }
 
  internal static Style DefaultPulseStyle { get; } = new Style(foreground: Color.DodgerBlue1, background: Color.Grey23);
 

test/Spectre.Console.Tests/Expectations/Widgets/BarChart/Style.Output.verified.txt

@@ -0,0 +1,4 @@
+ Number of fruits 
+ Apple ████████ 12 
+Orange █████████████████████████████████████████████████ 54
+Banana ████████████████████████████ 33 

test/Spectre.Console.Tests/Unit/Widgets/BarChartTests.cs

@@ -61,4 +61,23 @@ public async Task Should_Render_Correctly_3()
  // Then
  await Verifier.Verify(console.Output);
  }
+
+ [Fact]
+ [Expectation("Style")]
+ public async Task Should_Render_Correctly_WithStyle()
+ {
+ // Given
+ var console = new TestConsole().EmitAnsiSequences();
+
+ // When
+ console.Write(new BarChart()
+ .Width(60)
+ .Label("Number of fruits")
+ .AddItem("Apple", 12, Color.Red, Color.Red)
+ .AddItem("Orange", 54, Color.Orange1, Color.Orange1)
+ .AddItem("Banana", 33, Color.Yellow, Color.Yellow));
+
+ // Then
+ await Verifier.Verify(console.Output);
+ }
 }